[Freeswitch-svn] [commit] r13516 - freeswitch/trunk/src
FreeSWITCH SVN
brian at freeswitch.org
Fri May 29 17:56:33 PDT 2009
Author: brian
Date: Fri May 29 19:56:32 2009
New Revision: 13516
Log:
minor tweaks
Modified:
freeswitch/trunk/src/switch_nat.c
Modified: freeswitch/trunk/src/switch_nat.c
==============================================================================
--- freeswitch/trunk/src/switch_nat.c (original)
+++ freeswitch/trunk/src/switch_nat.c Fri May 29 19:56:32 2009
@@ -196,7 +196,7 @@
{
switch_status_t status = SWITCH_STATUS_FALSE;
char port_str[16];
- int r = -1;
+ int r = UPNPCOMMAND_UNKNOWN_ERROR;
sprintf(port_str, "%d", port);
@@ -206,7 +206,7 @@
r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str, nat_globals.pvt_addr, 0, "UDP", 0);
}
- if (r == 0) {
+ if (r == UPNPCOMMAND_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mapped public port %s protocol %s to localport %s\n", port_str,
(proto == SWITCH_NAT_TCP) ? "TCP" : (proto == SWITCH_NAT_UDP ? "UDP" : "UNKNOWN"), port_str);
status = SWITCH_STATUS_SUCCESS;
@@ -250,19 +250,21 @@
{
switch_status_t status = SWITCH_STATUS_FALSE;
char port_str[16];
+ int r = UPNPCOMMAND_UNKNOWN_ERROR;
sprintf(port_str, "%d", port);
if (proto == SWITCH_NAT_TCP) {
- UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "TCP", 0);
+ r = UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "TCP", 0);
} else if(proto == SWITCH_NAT_UDP) {
- UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "UDP", 0);
+ r = UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "UDP", 0);
}
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unmapped public port %s protocol %s to localport %s\n", port_str,
- (proto == SWITCH_NAT_TCP) ? "TCP" : (proto == SWITCH_NAT_UDP ? "UDP" : "UNKNOWN"), port_str);
- status = SWITCH_STATUS_SUCCESS;
-
+ if (r == UPNPCOMMAND_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unmapped public port %s protocol %s to localport %s\n", port_str,
+ (proto == SWITCH_NAT_TCP) ? "TCP" : (proto == SWITCH_NAT_UDP ? "UDP" : "UNKNOWN"), port_str);
+ status = SWITCH_STATUS_SUCCESS;
+ }
return status;
}
More information about the Freeswitch-svn
mailing list