kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-06 04:45:30 +00:00
Code Issues Projects Releases Wiki Activity

update to fix truncated ip

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14060 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-06-30 20:11:22 +00:00
parent 191ed5ff4a
commit e5eb577f8e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_nat.c
View File

@ -40,14 +40,15 @@
#include "../libs/libnatpmp/natpmp.h" #include "../libs/libnatpmp/natpmp.h"
#define MULTICAST_BUFFSIZE 65536 #define MULTICAST_BUFFSIZE 65536
#define IP_LEN 16
typedef struct { typedef struct {
switch_nat_type_t nat_type; switch_nat_type_t nat_type;
struct UPNPUrls urls; struct UPNPUrls urls;
struct IGDdatas data; struct IGDdatas data;
char *descURL; char *descURL;
char pub_addr[16]; char pub_addr[IP_LEN];
char pvt_addr[16]; char pvt_addr[IP_LEN];
} nat_globals_t; } nat_globals_t;
static nat_globals_t nat_globals; static nat_globals_t nat_globals;
@ -158,7 +159,7 @@ static int get_pmp_pubaddr(char *pub_addr)
pubaddr = inet_ntoa(response.pnu.publicaddress.addr); 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; nat_globals.nat_type = SWITCH_NAT_TYPE_PMP;
closenatpmp(&natpmp); closenatpmp(&natpmp);
@ -440,7 +441,7 @@ static switch_status_t switch_nat_add_mapping_pmp(switch_port_t port, switch_nat
static switch_status_t switch_nat_add_mapping_upnp(switch_port_t port, switch_nat_ip_proto_t proto) 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; switch_status_t status = SWITCH_STATUS_FALSE;
char port_str[16]; char port_str[IP_LEN];
int r = UPNPCOMMAND_UNKNOWN_ERROR; int r = UPNPCOMMAND_UNKNOWN_ERROR;
sprintf(port_str, "%d", port); sprintf(port_str, "%d", port);
@ -504,7 +505,7 @@ static switch_status_t switch_nat_del_mapping_pmp(switch_port_t port, switch_nat
static switch_status_t switch_nat_del_mapping_upnp(switch_port_t port, switch_nat_ip_proto_t proto) 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; switch_status_t status = SWITCH_STATUS_FALSE;
char port_str[16]; char port_str[IP_LEN];
int r = UPNPCOMMAND_UNKNOWN_ERROR; int r = UPNPCOMMAND_UNKNOWN_ERROR;
sprintf(port_str, "%d", port); sprintf(port_str, "%d", port);