Changeset 112:6a294d977878 in freeDiameter

Timestamp:

Dec 8, 2009, 3:24:34 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Default to add Session-Id in answers

Files:

• extensions/app_test/atst_serv.c (modified) (1 diff)
• freeDiameter/dispatch.c (modified) (1 diff)
• freeDiameter/p_dp.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)
• libfreeDiameter/messages.c (modified) (3 diffs)

extensions/app_test/atst_serv.c

@@ -68 +68 @@
         ans = *msg;
         
-        /* Set the Session-Id AVP */
-        {
-                char * sid;
-                CHECK_FCT( fd_sess_getsid ( sess, &sid ) );
-                CHECK_FCT( fd_msg_avp_new ( atst_sess_id, 0, &avp ) );
-                val.os.data = sid;
-                val.os.len  = strlen(sid);
-                CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) );
-                CHECK_FCT( fd_msg_avp_add( ans, MSG_BRW_FIRST_CHILD, avp ) );
-                
-        }
         /* Set the Test-AVP AVP */
         {

freeDiameter/dispatch.c

@@ -192 +192 @@
                                 
                                 /* Create an answer with the error code and message */
-                                CHECK_FCT_DO( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, &msg, MSGFL_ANSW_ERROR ), goto fatal_error );
+                                CHECK_FCT_DO( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, &msg, 0 ), goto fatal_error );
                                 CHECK_FCT_DO( fd_msg_rescode_set(msg, (char *)ec, (char *)em, NULL, 1 ), goto fatal_error );
                                 

freeDiameter/p_dp.c

@@ -98 +98 @@
                 /* Now reply with a DPA */
                 CHECK_FCT( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, msg, 0 ) );
-                CHECK_FCT( fd_msg_rescode_set( *msg, "DIAMETER_SUCCESS", NULL, NULL, 0 ) );
-                CHECK_FCT( fd_msg_add_origin ( *msg, 0 ) );
+                CHECK_FCT( fd_msg_rescode_set( *msg, "DIAMETER_SUCCESS", NULL, NULL, 1 ) );
                 
                 /* Move to CLOSING state to failover outgoing messages (and avoid failing the DPA...) */

include/freeDiameter/libfreeDiameter.h

@@ -1723 +1723 @@
 #define MSGFL_ALLOC_ETEID       0x01    /* When creating a message, a new end-to-end ID is allocated and set in the message */
 #define MSGFL_ANSW_ERROR        0x02    /* When creating an answer message, set the 'E' bit and use the generic error ABNF instead of command-specific ABNF */
-#define MSGFL_MAX               MSGFL_ANSW_ERROR        /* The biggest valid flag value */
+#define MSGFL_ANSW_NOSID        0x04    /* When creating an answer message, do not add the Session-Id even if present in request */
+#define MSGFL_MAX               MSGFL_ANSW_NOSID        /* The biggest valid flag value */
 
 /**************************************************/

libfreeDiameter/messages.c

@@ -287 +287 @@
         struct dict_object * model = NULL;
         struct msg *qry, *ans;
+        struct session * sess = NULL;
         
         TRACE_ENTRY("%p %x", msg, flags);
@@ -294 +295 @@
         qry = *msg;
         CHECK_PARAMS( CHECK_MSG(qry) && (qry->msg_public.msg_flags & CMD_FLAG_REQUEST) );
+        
+        if (! (flags & MSGFL_ANSW_NOSID)) {
+                /* Get the session of the message */
+                CHECK_FCT_DO( fd_msg_sess_get(dict, qry, &sess, NULL), /* ignore an error */ );
+        }
         
         /* Find the model for the answer */
@@ -316 +322 @@
         ans->msg_public.msg_hbhid = qry->msg_public.msg_hbhid;
         
+        /* Add the Session-Id AVP if session is known */
+        if (sess && dict) {
+                struct dict_object * sess_id_avp;
+                char * sid;
+                struct avp * avp;
+                union avp_value val;
+                
+                CHECK_FCT( fd_dict_search( dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &sess_id_avp, ENOENT) );
+                CHECK_FCT( fd_sess_getsid ( sess, &sid ) );
+                CHECK_FCT( fd_msg_avp_new ( sess_id_avp, 0, &avp ) );
+                val.os.data = sid;
+                val.os.len  = strlen(sid);
+                CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) );
+                CHECK_FCT( fd_msg_avp_add( ans, MSG_BRW_FIRST_CHILD, avp ) );
+        }
+        
         /* associate with query */
-         /* may do  CHECK_FCT(  msg_answ_associate( *msg, (msg_t *)qry )  ); but this is quicker */
         ans->msg_query = qry;