Skip to content
Snippets Groups Projects
Commit 00d057c1 authored by sphere's avatar sphere
Browse files

Merge branch 'upnp-status-log-only' into 'next'

Print UPnP status to log file/external console only

See merge request STJr/SRB2!2347
parents 0f6a7784 802a1de1
No related branches found
No related tags found
No related merge requests found
...@@ -304,7 +304,7 @@ init_upnpc_once(struct upnpdata *upnpuserdata) ...@@ -304,7 +304,7 @@ init_upnpc_once(struct upnpdata *upnpuserdata)
memset(&urls, 0, sizeof(struct UPNPUrls)); memset(&urls, 0, sizeof(struct UPNPUrls));
memset(&data, 0, sizeof(struct IGDdatas)); memset(&data, 0, sizeof(struct IGDdatas));
CONS_Printf(M_GetText("Looking for UPnP Internet Gateway Device\n")); I_OutputMsg(M_GetText("Looking for UPnP Internet Gateway Device\n"));
devlist = upnpDiscoverDevices(deviceTypes, 500, NULL, NULL, 0, false, 2, &upnp_error, 0); devlist = upnpDiscoverDevices(deviceTypes, 500, NULL, NULL, 0, false, 2, &upnp_error, 0);
if (devlist) if (devlist)
{ {
...@@ -320,11 +320,11 @@ init_upnpc_once(struct upnpdata *upnpuserdata) ...@@ -320,11 +320,11 @@ init_upnpc_once(struct upnpdata *upnpuserdata)
if (!dev) if (!dev)
dev = devlist; /* defaulting to first device */ dev = devlist; /* defaulting to first device */
CONS_Printf(M_GetText("Found UPnP device:\n desc: %s\n st: %s\n"), I_OutputMsg(M_GetText("Found UPnP device:\n desc: %s\n st: %s\n"),
dev->descURL, dev->st); dev->descURL, dev->st);
UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
CONS_Printf(M_GetText("Local LAN IP address: %s\n"), lanaddr); I_OutputMsg(M_GetText("Local LAN IP address: %s\n"), lanaddr);
descXML = miniwget(dev->descURL, &descXMLsize, scope_id, &status_code); descXML = miniwget(dev->descURL, &descXMLsize, scope_id, &status_code);
if (descXML) if (descXML)
{ {
...@@ -339,7 +339,7 @@ init_upnpc_once(struct upnpdata *upnpuserdata) ...@@ -339,7 +339,7 @@ init_upnpc_once(struct upnpdata *upnpuserdata)
} }
else if (upnp_error == UPNPDISCOVER_SOCKET_ERROR) else if (upnp_error == UPNPDISCOVER_SOCKET_ERROR)
{ {
CONS_Printf(M_GetText("No UPnP devices discovered\n")); I_OutputMsg(M_GetText("No UPnP devices discovered\n"));
} }
upnpuserdata->upnpc_started =1; upnpuserdata->upnpc_started =1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment