Use lhttpc instead of httpc

* Aviod a crash in http_transport:close/2, happening when setting socket_opts in httpc in OTP 20.1.
The fix for the bug is included in OTP 21 - https://bugs.erlang.org/browse/ERL-605.

* Avoid crash report when httpc_handler_sup is killing its children after unsuccessful httpc:request/1 function call.
It happens in some router softwares, with miniupnpd daemon installed, but UPnP/NAT-PMP functionality turned off.
Then, during natupnp_v1/natupnp_v2 discovery, location is returned, but is it not responding (hence httpc:request/1 crash).

Author: zp-sd

rebar.config

@@ -9,7 +9,8 @@
     rand_compat,
     {inet_cidr, "1.0.1", {pkg, erl_cidr}},
     {inet_ext, "0.4.0"},
-    {intercept, "1.0.0"}
+    {intercept, "1.0.0"},
+    {lhttpc, "1.6.2"}
 ]}.
 
 

rebar.lock

@@ -2,11 +2,13 @@
 [{<<"inet_cidr">>,{pkg,<<"erl_cidr">>,<<"1.0.1">>},0},
  {<<"inet_ext">>,{pkg,<<"inet_ext">>,<<"0.4.0">>},0},
  {<<"intercept">>,{pkg,<<"intercept">>,<<"1.0.0">>},0},
+ {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.6.2">>},0},
  {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},0}]}.
 [
 {pkg_hash,[
  {<<"inet_cidr">>, <<"9EA93F2B885820C1C3ADEC24E7AB5B04AAD829FBF7B3F8F41F1ACD4550D8BF97">>},
  {<<"inet_ext">>, <<"EF51FE5EA13DB6B40CBA48E66D9117BBD31E5A4347FA432B83D0C0547C7AB522">>},
  {<<"intercept">>, <<"1F6C725E6FC070720643BD4D97EE53B1209365C80E520E1F5A1ACB36712A7EB5">>},
+ {<<"lhttpc">>, <<"044F16F0018C7AA7E945E9E9406C7F6035E0B8BC08BF77B00C78CE260E1071E3">>},
  {<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>}]}
 ].

src/nat.app.src

@@ -3,7 +3,7 @@
 	{vsn, "0.3.1"},
 	{modules, []},
 	{registered, []},
-	{applications, [kernel,stdlib,inet_cidr,inet_ext,inets,xmerl,rand_compat]},
+	{applications, [kernel,stdlib,inet_cidr,inet_ext,inets,xmerl,rand_compat,lhttpc]},
   {maintainers, ["Benoit Chesneau"]},
   {licenses, ["MIT"]},
   {links, [{"Github", "https://github.com/benoitc/erlang-nat"}]},

src/nat_lib.erl

@@ -24,20 +24,18 @@ soap_request(Url, Function, Msg0, Options) ->
     Action = "\"urn:schemas-upnp-org:service:WANIPConnection:1#"
              ++ Function ++ "\"",
 
-    Headers = [{"Content-Length", integer_to_list(length(Msg))},
+    Headers = [{"Content-Type", "text/xml; charset=\"utf-8\""},
+               {"Content-Length", integer_to_list(length(Msg))},
                {"User-Agent", "Darwin/10.0.0, UPnP/1.0, MiniUPnPc/1.3"},
                {"SOAPAction", Action},
                {"Connection", "close"},
                {"Cache-Control", "no-cache"},
                {"Pragma", "no-cache"}],
 
-
-    Req = {Url, Headers, "text/xml; charset=\"utf-8\"", Msg},
-
-    case httpc:request(post, Req, [], Options) of
-        {ok, {{_, 200, _}, _, Body}} ->
-            {ok, Body};
-        OK = {ok, {{_, Status, _}, _, _}} ->
+    case lhttpc:request(Url, post, Headers, Msg, 5000, Options) of
+        {ok, {{200, _}, _, Body}} ->
+            {ok, binary_to_list(Body)};
+        OK = {ok, {{Status, _}, _, _}} ->
             error_logger:info_msg("UPNP SOAP error: ~p~n", [OK]),
             {error, integer_to_list(Status)};
         Error ->

src/natupnp_v1.erl

@@ -164,7 +164,7 @@ add_port_mapping1(#nat_upnp{ip=Ip, service_url=Url}, Protocol, InternalPort,
     "</NewLeaseDuration></u:AddPortMapping>",
     {ok, IAddr} = inet:parse_address(Ip),
     Start = nat_lib:timestamp(),
-    case nat_lib:soap_request(Url, "AddPortMapping", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "AddPortMapping", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, _} ->
             Now = nat_lib:timestamp(),
             MappingLifetime = Lifetime - (Now - Start),
@@ -187,7 +187,7 @@ delete_port_mapping(#nat_upnp{ip=Ip, service_url=Url}, Protocol0, _InternalPort,
     "<NewProtocol>" ++ Protocol ++ "</NewProtocol>"
     "</u:DeletePortMapping>",
     {ok, IAddr} = inet:parse_address(Ip),
-    case nat_lib:soap_request(Url, "DeletePortMapping", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "DeletePortMapping", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, _} -> ok;
         Error -> Error
     end.
@@ -207,7 +207,7 @@ get_port_mapping(#nat_upnp{ip=Ip, service_url=Url}, Protocol0, ExternalPort) ->
     "<NewProtocol>" ++ Protocol ++ "</NewProtocol>"
     "</u:GetSpecificPortMappingEntry>",
     {ok, IAddr} = inet:parse_address(Ip),
-    case nat_lib:soap_request(Url, "GetSpecificPortMappingEntry", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "GetSpecificPortMappingEntry", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, Body} ->
             {Xml, _} = xmerl_scan:string(Body, [{space, normalize}]),
             [Infos | _] = xmerl_xpath:string("//s:Envelope/s:Body/"
@@ -281,17 +281,17 @@ get_location(Raw) ->
     end.
 
 get_service_url(RootUrl) ->
-    case httpc:request(RootUrl) of
-        {ok, {{_, 200, _}, _, Body}} ->
-            {Xml, _} = xmerl_scan:string(Body, [{space, normalize}]),
+    case lhttpc:request(RootUrl, get, [], 5000) of
+        {ok, {{200, _}, _, Body}} ->
+            {Xml, _} = xmerl_scan:string(binary_to_list(Body), [{space, normalize}]),
             [Device | _] = xmerl_xpath:string("//device", Xml),
             case device_type(Device) of
                 "urn:schemas-upnp-org:device:InternetGatewayDevice:1" ->
                     get_wan_device(Device, RootUrl);
                 _ ->
                     {error,  no_gateway_device}
             end;
-        {ok, {{_, StatusCode, _}, _, _}} ->
+        {ok, {{StatusCode, _}, _, _}} ->
             {error, integer_to_list(StatusCode)};
         Error ->
             Error

src/natupnp_v2.erl

@@ -170,7 +170,7 @@ add_port_mapping1(#nat_upnp{ip=Ip, service_url=Url}, Protocol, InternalPort,
     "</NewLeaseDuration></u:AddPortMapping>",
     {ok, IAddr} = inet:parse_address(Ip),
     Start = nat_lib:timestamp(),
-    case nat_lib:soap_request(Url, "AddAnyPortMapping", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "AddAnyPortMapping", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, Body} ->
             {Xml, _} = xmerl_scan:string(Body, [{space, normalize}]),
 
@@ -203,7 +203,7 @@ delete_port_mapping(#nat_upnp{ip=Ip, service_url=Url}, Protocol0, _InternalPort,
     "<NewProtocol>" ++ Protocol ++ "</NewProtocol>"
     "</u:DeletePortMapping>",
     {ok, IAddr} = inet:parse_address(Ip),
-    case nat_lib:soap_request(Url, "DeletePortMapping", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "DeletePortMapping", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, _} -> ok;
         Error -> Error
     end.
@@ -224,7 +224,7 @@ get_port_mapping(#nat_upnp{ip=Ip, service_url=Url}, Protocol0, ExternalPort) ->
     "<NewProtocol>" ++ Protocol ++ "</NewProtocol>"
     "</u:GetSpecificPortMappingEntry>",
     {ok, IAddr} = inet:parse_address(Ip),
-    case nat_lib:soap_request(Url, "GetSpecificPortMappingEntry", Msg, [{socket_opts, [{ip, IAddr}]}]) of
+    case nat_lib:soap_request(Url, "GetSpecificPortMappingEntry", Msg, [{connect_options, [{ip, IAddr}]}]) of
         {ok, Body} ->
             {Xml, _} = xmerl_scan:string(Body, [{space, normalize}]),
             [Infos | _] = xmerl_xpath:string("//s:Envelope/s:Body/"
@@ -299,17 +299,17 @@ get_location(Raw) ->
     end.
 
 get_service_url(RootUrl) ->
-    case httpc:request(RootUrl) of
-        {ok, {{_, 200, _}, _, Body}} ->
-            {Xml, _} = xmerl_scan:string(Body, [{space, normalize}]),
+    case lhttpc:request(RootUrl, get, [], 5000) of
+        {ok, {{200, _}, _, Body}} ->
+            {Xml, _} = xmerl_scan:string(binary_to_list(Body), [{space, normalize}]),
             [Device | _] = xmerl_xpath:string("//device", Xml),
             case device_type(Device) of
                 "urn:schemas-upnp-org:device:InternetGatewayDevice:2" ->
                     get_wan_device(Device, RootUrl);
                 _ ->
                     {error,  no_gateway_device}
             end;
-        {ok, {{_, StatusCode, _}, _, _}} ->
+        {ok, {{StatusCode, _}, _, _}} ->
             {error, integer_to_list(StatusCode)};
         Error ->
             Error