Revision
14295
Author
mrene
Date
2009-07-18 14:20:21 -0500 (Sat, 18 Jul 2009)

Log Message

fix logic issue and refactor some event function calls

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_nat.c (14294 => 14295)


--- freeswitch/trunk/src/switch_nat.c	2009-07-18 19:08:07 UTC (rev 14294)
+++ freeswitch/trunk/src/switch_nat.c	2009-07-18 19:20:21 UTC (rev 14295)
@@ -530,17 +530,16 @@
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	switch_event_t *event = NULL;
-	char key[1024] = "";
-
+	
 	switch (nat_globals.nat_type) {
 	case SWITCH_NAT_TYPE_PMP:
 		status = switch_nat_add_mapping_pmp(port, proto, external_port);
 		break;
 	case SWITCH_NAT_TYPE_UPNP:
-		if ((status = switch_nat_add_mapping_upnp(port, proto)) && status == SWITCH_STATUS_SUCCESS) {
+		if ((status = switch_nat_add_mapping_upnp(port, proto)) == SWITCH_STATUS_SUCCESS) {
 			if (external_port) {
 				*external_port = port;
-			}	
+			}
 		}
 		break;
 	default:
@@ -550,10 +549,8 @@
 	if (publish && status == SWITCH_STATUS_SUCCESS) {
 		switch_event_create(&event, SWITCH_EVENT_NAT);	
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "op", "add");
-		switch_snprintf(key, sizeof(key), "%d", port);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "port", key);
-		switch_snprintf(key, sizeof(key), "%d", proto);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", key);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "port", "%d", port);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "%d", proto);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sticky", (sticky ? "true" : "false"));
 		switch_event_fire(&event);
 	}
@@ -570,7 +567,6 @@
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	switch_event_t *event = NULL;
-	char key[1024] = "";
 
 	switch (nat_globals.nat_type) {
 	case SWITCH_NAT_TYPE_PMP:
@@ -586,10 +582,8 @@
 	if (status == SWITCH_STATUS_SUCCESS) {
 		switch_event_create(&event, SWITCH_EVENT_NAT);	
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "op", "del");
-		switch_snprintf(key, sizeof(key), "%d", port);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "port", key);
-		switch_snprintf(key, sizeof(key), "%d", proto);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", key);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "port", "%d", port);
+		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "%d", proto);
 		switch_event_fire(&event);
 	}