May 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r13523 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Sat May 30 05:24:38 2009 New Revision: 13523 Log: more clean up 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 Sat May 30 05:24:38 2009 @@ -53,12 +53,12 @@ static int init_upnp (void) { - struct UPNPDev * devlist; - struct UPNPDev * dev; + struct UPNPDev *devlist; + struct UPNPDev *dev; char * descXML; int descXMLsize = 0; - const char * multicastif = 0; - const char * minissdpdpath = 0; + const char *multicastif = 0; + const char *minissdpdpath = 0; int r = -2; memset(&nat_globals.urls, 0, sizeof(struct UPNPUrls)); @@ -157,7 +157,7 @@ switch_core_set_variable("nat_private_addr", nat_globals.pvt_addr); switch_core_set_variable("nat_type", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No NAT Detected!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No PMP or uPNP NAT device detected!\n"); } }

1 0

[Freeswitch-svn] [commit] r13522 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Sat May 30 05:01:21 2009 New Revision: 13522 Log: speed up discovery and clean up code a tiny bit 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 Sat May 30 05:01:21 2009 @@ -57,19 +57,20 @@ struct UPNPDev * dev; char * descXML; int descXMLsize = 0; - const char * multicastif = 0; - const char * minissdpdpath = 0; + const char * multicastif = 0; + const char * minissdpdpath = 0; int r = -2; memset(&nat_globals.urls, 0, sizeof(struct UPNPUrls)); memset(&nat_globals.data, 0, sizeof(struct IGDdatas)); - devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); + devlist = upnpDiscover(1000, multicastif, minissdpdpath, 0); if (devlist) { dev = devlist; while (dev) { - if (strstr (dev->st, "InternetGatewayDevice")) + if (strstr (dev->st, "InternetGatewayDevice")) { break; + } dev = dev->pNext; } if (!dev) {

1 0

[Freeswitch-svn] [commit] r13521 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Sat May 30 00:24:52 2009 New Revision: 13521 Log: can't process this in general, should be used during the enrollment process Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat May 30 00:24:52 2009 @@ -468,7 +468,7 @@ switch_event_fire(&fsevent); } break; - +#if 0 case ZRTP_EVENT_NO_ZRTP_QUICK: { if (rtp_session->zrtp_ctx != NULL) { @@ -476,7 +476,7 @@ } } break; - +#endif case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n");

1 0

[Freeswitch-svn] [commit] r13520 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Sat May 30 00:01:28 2009 New Revision: 13520 Log: adding quick option Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat May 30 00:01:28 2009 @@ -469,6 +469,14 @@ } break; + case ZRTP_EVENT_NO_ZRTP_QUICK: + { + if (rtp_session->zrtp_ctx != NULL) { + zrtp_stream_stop(rtp_session->zrtp_ctx); + } + } + break; + case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n");

1 0

[Freeswitch-svn] [commit] r13519 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Fri May 29 22:44:14 2009 New Revision: 13519 Log: don't throw error on this event now Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri May 29 22:44:14 2009 @@ -494,6 +494,8 @@ case nua_i_info: sofia_handle_sip_i_info(nua, profile, nh, session, sip, tags); break; + case nua_r_update: + break; case nua_r_refer: break; case nua_i_refer:

1 0

[Freeswitch-svn] [commit] r13518 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Fri May 29 22:24:10 2009 New Revision: 13518 Log: Adding the descriptor to the mapping request so when you list them you know its FreeSWITCH that did it 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 22:24:10 2009 @@ -203,9 +203,11 @@ sprintf(port_str, "%d", port); if (proto == SWITCH_NAT_TCP) { - r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str, nat_globals.pvt_addr, 0, "TCP", 0); + r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str, + nat_globals.pvt_addr, "FreeSWITCH", "TCP", 0); } else if(proto == SWITCH_NAT_UDP) { - r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str, nat_globals.pvt_addr, 0, "UDP", 0); + r = UPNP_AddPortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, port_str, + nat_globals.pvt_addr, "FreeSWITCH", "UDP", 0); } if (r == UPNPCOMMAND_SUCCESS) {

1 0

[Freeswitch-svn] [commit] r13517 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Fri May 29 20:03:55 2009 New Revision: 13517 Log: more 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 20:03:55 2009 @@ -181,13 +181,15 @@ select(FD_SETSIZE, &fds, NULL, NULL, &timeout); r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); } while(r == NATPMP_TRYAGAIN); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mapped public port %hu protocol %s to localport %hu\n", - response.pnu.newportmapping.mappedpublicport, - response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : - (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), - response.pnu.newportmapping.privateport); - status = SWITCH_STATUS_SUCCESS; + + if (r == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mapped public port %hu protocol %s to localport %hu\n", + response.pnu.newportmapping.mappedpublicport, + response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : + (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), + response.pnu.newportmapping.privateport); + status = SWITCH_STATUS_SUCCESS; + } return status; } @@ -211,6 +213,7 @@ (proto == SWITCH_NAT_TCP) ? "TCP" : (proto == SWITCH_NAT_UDP ? "UDP" : "UNKNOWN"), port_str); status = SWITCH_STATUS_SUCCESS; } + return status; } @@ -235,13 +238,15 @@ select(FD_SETSIZE, &fds, NULL, NULL, &timeout); r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); } while(r == NATPMP_TRYAGAIN); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unmapped public port %hu protocol %s to localport %hu\n", - response.pnu.newportmapping.mappedpublicport, - response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : - (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), - response.pnu.newportmapping.privateport); - status = SWITCH_STATUS_SUCCESS; + + if (r == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unmapped public port %hu protocol %s to localport %hu\n", + response.pnu.newportmapping.mappedpublicport, + response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : + (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), + response.pnu.newportmapping.privateport); + status = SWITCH_STATUS_SUCCESS; + } return status; }

1 0

[Freeswitch-svn] [commit] r13516 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

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; }

1 0

[Freeswitch-svn] [commit] r13515 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Fri May 29 19:50:30 2009 New Revision: 13515 Log: tweaks to nat code 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:50:30 2009 @@ -187,7 +187,8 @@ response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), response.pnu.newportmapping.privateport); - + status = SWITCH_STATUS_SUCCESS; + return status; } @@ -240,6 +241,7 @@ response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), response.pnu.newportmapping.privateport); + status = SWITCH_STATUS_SUCCESS; return status; } @@ -248,7 +250,6 @@ { switch_status_t status = SWITCH_STATUS_FALSE; char port_str[16]; - int r = -1; sprintf(port_str, "%d", port); @@ -258,11 +259,10 @@ UPNP_DeletePortMapping(nat_globals.urls.controlURL, nat_globals.data.servicetype, port_str, "UDP", 0); } - if (r == 0) { - 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; - } + 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; }

1 0

[Freeswitch-svn] [commit] r13514 - freeswitch/trunk/src/include
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Fri May 29 19:30:45 2009 New Revision: 13514 Log: might wanna delete a mapping Modified: freeswitch/trunk/src/include/switch_nat.h Modified: freeswitch/trunk/src/include/switch_nat.h ============================================================================== --- freeswitch/trunk/src/include/switch_nat.h (original) +++ freeswitch/trunk/src/include/switch_nat.h Fri May 29 19:30:45 2009 @@ -62,7 +62,7 @@ SWITCH_DECLARE(void) switch_nat_shutdown(void); SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto); -SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto); +SWITCH_DECLARE(switch_status_t) switch_nat_del_mapping(switch_port_t port, switch_nat_ip_proto_t proto); SWITCH_END_EXTERN_C

1 0