Author: brian Date: Tue Jun 30 15:11:22 2009 New Revision: 14060 Log: update to fix truncated ip 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 Tue Jun 30 15:11:22 2009 @@ -40,14 +40,15 @@ #include "../libs/libnatpmp/natpmp.h" #define MULTICAST_BUFFSIZE 65536 +#define IP_LEN 16 typedef struct { switch_nat_type_t nat_type; struct UPNPUrls urls; struct IGDdatas data; char *descURL; - char pub_addr[16]; - char pvt_addr[16]; + char pub_addr[IP_LEN]; + char pvt_addr[IP_LEN]; } nat_globals_t; static nat_globals_t nat_globals; @@ -158,7 +159,7 @@ pubaddr = inet_ntoa(response.pnu.publicaddress.addr); - switch_set_string(nat_globals.pub_addr, pubaddr); + switch_copy_string(pub_addr, pubaddr, IP_LEN); nat_globals.nat_type = SWITCH_NAT_TYPE_PMP; closenatpmp(&natpmp); @@ -440,7 +441,7 @@ static switch_status_t switch_nat_add_mapping_upnp(switch_port_t port, switch_nat_ip_proto_t proto) { switch_status_t status = SWITCH_STATUS_FALSE; - char port_str[16]; + char port_str[IP_LEN]; int r = UPNPCOMMAND_UNKNOWN_ERROR; sprintf(port_str, "%d", port); @@ -504,7 +505,7 @@ static switch_status_t switch_nat_del_mapping_upnp(switch_port_t port, switch_nat_ip_proto_t proto) { switch_status_t status = SWITCH_STATUS_FALSE; - char port_str[16]; + char port_str[IP_LEN]; int r = UPNPCOMMAND_UNKNOWN_ERROR; sprintf(port_str, "%d", port);