support PPP devices with slightly different XML schema

[dch]

see below for gory details.

<?xml version="1.0"?>
<root xmlns="urn:schemas-upnp-org:device-1-0">
    <specVersion>
        <major>1</major>
        <minor>0</minor>
    </specVersion>
    <URLBase>http://10.0.0.138:8000</URLBase>
    <device>
        <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>
        <friendlyName>MediaAccess TG588v (1350CZGKF)</friendlyName>
        <manufacturer>Technicolor</manufacturer>
        <manufacturerURL>http://www.technicolor.com</manufacturerURL>
        <modelDescription>Technicolor Internet Gateway Device</modelDescription>
        <modelName>MediaAccess TG</modelName>
        <modelNumber>588v</modelNumber>
        <modelURL>http://www.technicolor.com</modelURL>
        <serialNumber>1350CZGKF</serialNumber>
        <UDN>uuid:25133bb2-794e-512f-9e1b-1f4711d190b7</UDN>
        <presentationURL>/</presentationURL>
        <serviceList>
            <service>
                <serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>
                <serviceId>urn:upnp-org:serviceId:L3Forwarding1</serviceId>
                <controlURL>/wn59mtddxhi/IGD/upnp/control/igd/layer3f</controlURL>
                <eventSubURL>/wn59mtddxhi/IGD/upnp/event/igd/layer3f</eventSubURL>
                <SCPDURL>/wn59mtddxhi/IGD/upnp/Layer3Forwarding.xml</SCPDURL>
            </service>
        </serviceList>
        <deviceList>
            <device>
                <deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>
                <friendlyName>WANDevice</friendlyName>
                <manufacturer>Technicolor</manufacturer>
                <modelName>MediaAccess TG588v</modelName>
                <serialNumber>9C-97-26-8C-F2-34</serialNumber>
                <UDN>uuid:e75eeee3-2af8-526d-8daf-379bae997abd</UDN>
                <serviceList>
                    <service>
                        <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>
                        <serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>
                        <controlURL>/wn59mtddxhi/IGD/upnp/control/igd/wancic_1</controlURL>
                        <eventSubURL>/wn59mtddxhi/IGD/upnp/event/igd/wancic_1</eventSubURL>
                        <SCPDURL>/wn59mtddxhi/IGD/upnp/WANCommonInterfaceConfig.xml</SCPDURL>
                    </service>
                </serviceList>
                <deviceList>
                    <device>
                        <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>
                        <friendlyName>WANConnectionDevice</friendlyName>
                        <manufacturer>Technicolor</manufacturer>
                        <modelName>MediaAccess TG588v</modelName>
                        <serialNumber>9C-97-26-8C-F2-34</serialNumber>
                        <UDN>uuid:3b0469c4-5d06-5ed6-8626-dc9613ccb17d</UDN>
                        <serviceList>
                            <service>
                                <serviceType>urn:schemas-upnp-org:service:WANDSLLinkConfig:1</serviceType>
                                <serviceId>urn:upnp-org:serviceId:WANDSLLinkC1</serviceId>
                                <controlURL>/wn59mtddxhi/IGD/upnp/control/igd/wandsllc_1_4</controlURL>
                                <eventSubURL>/wn59mtddxhi/IGD/upnp/event/igd/wandsllc_1_4</eventSubURL>
                                <SCPDURL>/wn59mtddxhi/IGD/upnp/WANDSLLinkConfig.xml</SCPDURL>
                            </service>
                            <service>
                                <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
                                <serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>
                                <controlURL>/wn59mtddxhi/IGD/upnp/control/igd/wanpppc_1_4_1</controlURL>
                                <eventSubURL>/wn59mtddxhi/IGD/upnp/event/igd/wanpppc_1_4_1</eventSubURL>
                                <SCPDURL>/wn59mtddxhi/IGD/upnp/WANPPPConnection.xml</SCPDURL>
                            </service>
                        </serviceList>
                    </device>
                </deviceList>
            </device>
        </deviceList>
    </device>
</root>

[benoitc]

hrm why do you start by reading the full response? Sounds like it will break other parsing but I may be mistaken

[dch]

We should probably add some tests for each device type I think.

Main reason for this is that just doing httph_bin as before doesn't work. I did wonder if your devices have a different setup and so my change breaks yours, but I figured at least a simple patch to get started.

The "router" is a typically crappy TGv588 (Thomson) router, this firmware is sadly very common across Europe.

%% binary is Packet from #L59 above
{ok, Context} = nat_upnp:discover().
<<72,84,84,80,47,49,46,49,32,50,48,48,32,79,75,13,10,67,65,67,72,69,45,67,79,78,84,82,79,76,58,109,97,120,45,97,103,101,61,49,56,48,48,13,10,69,88,84,58,13,10,76,79,67,65,84,73,79,78,58,104,116,116,112,58,47,47,49,48,46,48,46,48,46,49,51,56,58,56,48,48,48,47,119,110,53,57,109,116,100,100,120,104,105,47,73,71,68,47,117,112,110,112,47,73,71,68,46,120,109,108,13,10,83,69,82,86,69,82,58,77,101,100,105,97,65,99,99,101,115,115,32,84,71,32,53,56,56,118,32,49,48,46,53,46,52,46,87,32,85,80,110,80,47,49,46,48,32,40,57,67,45,57,55,45,50,54,45,56,67,45,70,50,45,51,52,41,13,10,83,84,58,117,114,110,58,115,99,104,101,109,97,115,45,117,112,110,112,45,111,114,103,58,100,101,118,105,99,101,58,73,110,116,101,114,110,101,116,71,97,116,101,119,97,121,68,101,118,105,99,101,58,49,13,10,85,83,78,58,117,117,105,100,58,50,53,49,51,51,98,98,50,45,55,57,52,101,45,53,49,50,102,45,57,101,49,98,45,49,102,52,55,49,49,100,49,57,48,98,55,58,58,117,114,110,58,115,99,104,101,109,97,115,45,117,112,110,112,45,111,114,103,58,100,101,118,105,99,101,58,73,110,116,101,114,110,101,116,71,97,116,101,119,97,121,68,101,118,105,99,101,58,49,13,10,13,10>>

{ok,{nat_upnp,"http://10.0.0.138:8000/wn59mtddxhi/IGD/upnp/control/igd/wanpppc_1_4_1",
              "10.0.0.1"}}

[benoitc]

Thanks for the patch! I didn't have time yet to test with the hardware here to see if it still work. Btw can you tell me on which device could I test the change above? I will try to find one :)

[dch]

there may well be a better approach than nested case here - any better suggestion?

[benoitc]

So I had a closer look at the issue. There are 2 versions of the IGW UPNP protocol. I will add the support for the second one ASAP. I let this PR open for now to track the issue.