Mercurial > hg > waaad

changeset 286:95d5e12ea2bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolved conflicting variable names
author Sebastien Decugis <sdecugis@nict.go.jp>
date Fri, 19 Dec 2008 17:41:20 +0900
parents 0e683f493edb
children a51b0c820c5b
files extensions/app_test/app_test.h extensions/app_test/atst_cli.c extensions/app_test/atst_dict.c extensions/app_test/atst_serv.c
diffstat 4 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/app_test/app_test.h	Fri Dec 19 17:24:10 2008 +0900
+++ b/extensions/app_test/app_test.h	Fri Dec 19 17:41:20 2008 +0900
@@ -88,11 +88,11 @@
 
 
 /* Some global variables for dictionary */
-extern dict_object_t * vendor;
-extern dict_object_t * appli;
-extern dict_object_t * cmd_r;
-extern dict_object_t * cmd_a;
-extern dict_object_t * avp;
+extern dict_object_t * atst_vendor;
+extern dict_object_t * atst_appli;
+extern dict_object_t * atst_cmd_r;
+extern dict_object_t * atst_cmd_a;
+extern dict_object_t * atst_avp;
 
 extern dict_object_t * sess_id;
 extern dict_object_t * origin_host;
--- a/extensions/app_test/atst_cli.c	Fri Dec 19 17:24:10 2008 +0900
+++ b/extensions/app_test/atst_cli.c	Fri Dec 19 17:41:20 2008 +0900
@@ -86,7 +86,7 @@
 		msg_avp_t * src = NULL;
 		msg_avp_data_t * data = NULL;
 		
-		CHECK_VOID( msg_search_avp(*msg, avp, &src) );
+		CHECK_VOID( msg_search_avp(*msg, atst_avp, &src) );
 		if (src) {
 			CHECK_VOID( msg_avp_data( src, &data ) );
 			fprintf(stderr, "%x (%s) ", data->avp_data->i32, (data->avp_data->i32 == mi->randval) ? "Ok" : "PROBLEM");
@@ -179,7 +179,7 @@
 	TRACE_DEBUG(FULL, "Creating a new message for sending.");
 	
 	/* Create the request from template */
-	CHECK_VOID( msg_new( cmd_r, MSGFL_FROM_TEMPLATE | MSGFL_ALLOW_ETEID, &req ) );
+	CHECK_VOID( msg_new( atst_cmd_r, MSGFL_FROM_TEMPLATE | MSGFL_ALLOW_ETEID, &req ) );
 	
 	/* Create a new session */
 	CHECK_VOID( sess_new( &sess, SESSION_NEW_DEFAULT, "app_test" ) );
@@ -268,7 +268,7 @@
 		
 		data.i32 = mi->randval;
 		
-		CHECK_VOID( msg_search_avp(req, avp, &dst) );
+		CHECK_VOID( msg_search_avp(req, atst_avp, &dst) );
 		CHECK_VOID( msg_avp_setvalue( dst, &data) );
 	}
 	
--- a/extensions/app_test/atst_dict.c	Fri Dec 19 17:24:10 2008 +0900
+++ b/extensions/app_test/atst_dict.c	Fri Dec 19 17:41:20 2008 +0900
@@ -37,11 +37,11 @@
 
 #include "app_test.h"
 
-dict_object_t * vendor = NULL;
-dict_object_t * appli = NULL;
-dict_object_t * cmd_r = NULL;
-dict_object_t * cmd_a = NULL;
-dict_object_t * avp = NULL;
+dict_object_t * atst_vendor = NULL;
+dict_object_t * atst_appli = NULL;
+dict_object_t * atst_cmd_r = NULL;
+dict_object_t * atst_cmd_a = NULL;
+dict_object_t * atst_avp = NULL;
 
 dict_object_t * sess_id = NULL;
 dict_object_t * origin_host = NULL;
@@ -59,7 +59,7 @@
 		dict_vendor_data_t data;
 		data.vendor_id = atst_conf->vendor_id;
 		data.vendor_name = "app_test vendor";
-		CHECK(dict_new( DICT_VENDOR, &data, NULL, &vendor));
+		CHECK(dict_new( DICT_VENDOR, &data, NULL, &atst_vendor));
 	}
 	
 	/* Create the Test Application */
@@ -67,7 +67,7 @@
 		dict_application_data_t data;
 		data.application_id = atst_conf->appli_id;
 		data.application_name = "app_test application";
-		CHECK(dict_new( DICT_APPLICATION, &data, vendor, &appli));
+		CHECK(dict_new( DICT_APPLICATION, &data, atst_vendor, &atst_appli));
 	}
 	
 	/* Create the Test-Request & Test-Answer commands */
@@ -77,10 +77,10 @@
 		data.cmd_name = "Test-Request";
 		data.cmd_flag_mask = CMD_FLAG_PROXIABLE | CMD_FLAG_REQUEST;
 		data.cmd_flag_val  = CMD_FLAG_PROXIABLE | CMD_FLAG_REQUEST;
-		CHECK(dict_new( DICT_COMMAND, &data, appli, &cmd_r));
+		CHECK(dict_new( DICT_COMMAND, &data, atst_appli, &atst_cmd_r));
 		data.cmd_name = "Test-Answer";
 		data.cmd_flag_val  = CMD_FLAG_PROXIABLE;
-		CHECK(dict_new( DICT_COMMAND, &data, appli, &cmd_a));
+		CHECK(dict_new( DICT_COMMAND, &data, atst_appli, &atst_cmd_a));
 	}
 	
 	/* Create the Test AVP */
@@ -92,7 +92,7 @@
 		data.avp_flag_mask = AVP_FLAG_VENDOR;
 		data.avp_flag_val = AVP_FLAG_VENDOR;
 		data.avp_basetype = AVP_TYPE_INTEGER32;
-		CHECK(dict_new( DICT_AVP, &data, NULL, &avp));
+		CHECK(dict_new( DICT_AVP, &data, NULL, &atst_avp));
 	}
 	
 	/* Now resolve some other useful AVPs */
@@ -120,37 +120,37 @@
 		data.rule_avp = sess_id;
 		data.rule_position = RULE_FIXED_HEAD;
 		data.rule_order = 1;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
-		CHECK(dict_new( DICT_RULE, &data, cmd_a, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_a, NULL));
 		
 		data.rule_position = RULE_REQUIRED;
 		/* Test-AVP is mandatory */
-		data.rule_avp = avp;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
-		CHECK(dict_new( DICT_RULE, &data, cmd_a, NULL));
+		data.rule_avp = atst_avp;
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_a, NULL));
 		
 		/* idem for Origin Host and Realm */
 		data.rule_avp = origin_host;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
-		CHECK(dict_new( DICT_RULE, &data, cmd_a, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_a, NULL));
 		
 		data.rule_avp = origin_realm;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
-		CHECK(dict_new( DICT_RULE, &data, cmd_a, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_a, NULL));
 		
 		/* And Result-Code is mandatory for answers only */
 		data.rule_avp = res_code;
-		CHECK(dict_new( DICT_RULE, &data, cmd_a, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_a, NULL));
 		
 		/* And Destination-Realm for requests only */
 		data.rule_avp = dest_realm;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
 		
 		/* And Destination-Host optional for requests only */
 		data.rule_position = RULE_OPTIONAL;
 		data.rule_min = 0;
 		data.rule_avp = dest_host;
-		CHECK(dict_new( DICT_RULE, &data, cmd_r, NULL));
+		CHECK(dict_new( DICT_RULE, &data, atst_cmd_r, NULL));
 		
 	}
 	
--- a/extensions/app_test/atst_serv.c	Fri Dec 19 17:24:10 2008 +0900
+++ b/extensions/app_test/atst_serv.c	Fri Dec 19 17:41:20 2008 +0900
@@ -78,8 +78,8 @@
 		msg_avp_t * dst = NULL;
 		msg_avp_data_t * data = NULL;
 		
-		CHECK_NEG( msg_search_avp(msg, avp, &src) );
-		CHECK_NEG( msg_search_avp(ans, avp, &dst) );
+		CHECK_NEG( msg_search_avp(msg, atst_avp, &src) );
+		CHECK_NEG( msg_search_avp(ans, atst_avp, &dst) );
 		CHECK_NEG( msg_avp_data( src, &data ) );
 		CHECK_NEG( msg_avp_setvalue( dst, data->avp_data) );
 	}
@@ -129,8 +129,8 @@
 	TRACE_DEBUG(FULL, "Initializing dispatch callbacks for test");
 	
 	data.flags = 3;
-	data.app_id = appli;
-	data.command = cmd_r;
+	data.app_id = atst_appli;
+	data.command = atst_cmd_r;
 	
 	/* fallback CB if command != Test-Request received */
 	CHECK( disp_register( fb_cb, DISP_REG_APPID, &data, &hdl_fb ) );
"Welcome to our mercurial repository"