Changeset 127:8ee43cf85a5f in freeDiameter

Timestamp:

Dec 10, 2009, 2:39:55 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added User-Name AVP in test_app extension

Files:

• doc/test_app.conf.sample (modified) (1 diff)
• extensions/test_app/ta_cli.c (modified) (1 diff)
• extensions/test_app/ta_conf.l (modified) (1 diff)
• extensions/test_app/ta_conf.y (modified) (3 diffs)
• extensions/test_app/ta_dict.c (modified) (2 diffs)
• extensions/test_app/test_app.h (modified) (2 diffs)

doc/test_app.conf.sample

@@ -49 +49 @@
 # dest-host = "server.foreign.net";
 
+# The User-Name for the message (may be useful for some routing tests).
+# (default is not providing this AVP).
+# user-name = "user@server.foreign.net";
+
 # The signal that triggers sending the test message
 # Note: Symbolic names are now recognized, you must use integers

extensions/test_app/ta_cli.c

@@ -196 +196 @@
         CHECK_FCT_DO( fd_msg_add_origin ( req, 0 ), goto out  );
         
+        /* Set the User-Name AVP if needed*/
+        if (ta_conf->user_name) {
+                CHECK_FCT_DO( fd_msg_avp_new ( ta_user_name, 0, &avp ), goto out  );
+                val.os.data = (unsigned char *)(ta_conf->user_name);
+                val.os.len  = strlen(ta_conf->user_name);
+                CHECK_FCT_DO( fd_msg_avp_setvalue( avp, &val ), goto out  );
+                CHECK_FCT_DO( fd_msg_avp_add( req, MSG_BRW_LAST_CHILD, avp ), goto out  );
+        }
         
         /* Set the Test-AVP AVP */

extensions/test_app/ta_conf.l

@@ -145 +145 @@
                         }
 
+(?i:"user-name")        {
+                                return USER_NAME;
+                        }
+
 (?i:"Signal")           {
                                 return SIGNAL;

extensions/test_app/ta_conf.y

@@ -124 +124 @@
 %token          DEST_REALM
 %token          DEST_HOST
+%token          USER_NAME
 %token          SIGNAL
 
@@ -147 +148 @@
                         | conffile dstrealm
                         | conffile dsthost
+                        | conffile usrname
                         | conffile signal
                         ;
@@ -194 +196 @@
                         ;
 
+usrname:                USER_NAME '=' QSTRING ';'
+                        {
+                                free(ta_conf->user_name);
+                                ta_conf->user_name = $3;
+                        }
+                        ;
+
 signal:                 SIGNAL '=' INTEGER ';'
                         {

extensions/test_app/ta_dict.c

@@ -49 +49 @@
 struct dict_object * ta_dest_host = NULL;
 struct dict_object * ta_dest_realm = NULL;
+struct dict_object * ta_user_name = NULL;
 struct dict_object * ta_res_code = NULL;
 
@@ -102 +103 @@
         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Host", &ta_dest_host, ENOENT) );
         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Realm", &ta_dest_realm, ENOENT) );
+        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "User-Name", &ta_user_name, ENOENT) );
         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Result-Code", &ta_res_code, ENOENT) );
         

extensions/test_app/test_app.h

@@ -61 +61 @@
         char    *       dest_realm;     /* default local realm */
         char    *       dest_host;      /* default NULL */
+        char    *       user_name;      /* default NULL */
         int             signal;         /* default TEST_APP_DEFAULT_SIGNAL */
 };
@@ -96 +97 @@
 extern struct dict_object * ta_dest_host;
 extern struct dict_object * ta_dest_realm;
+extern struct dict_object * ta_user_name;
 extern struct dict_object * ta_res_code;