Changeset 271:411314907b43 in freeDiameter for extensions/app_radgw/rgwx_auth.c

Timestamp:

Apr 20, 2010, 7:34:59 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added translation of Accounting messages

File:

• extensions/app_radgw/rgwx_auth.c (modified) (9 diffs)

extensions/app_radgw/rgwx_auth.c

@@ -47 +47 @@
 #define CC_AA                   265     /* AAR */
 #define CC_DIAMETER_EAP         268     /* DER */
-#define CC_DIAMETER_EAP         268     /* DER */
 #define ACV_ART_AUTHORIZE_AUTHENTICATE  3       /* AUTHORIZE_AUTHENTICATE */
 #define ACV_OAP_RADIUS                  1       /* RADIUS */
@@ -56 +55 @@
 /* The state we keep for this plugin */
 struct rgwp_config {
-        struct session_handler * sess_hdl; /* We store RADIUS request authenticator information in the session */
         struct {
                 struct dict_object * ARAP_Password;             /* ARAP-Password */
@@ -120 +118 @@
                 
         } dict; /* cache of the dictionary objects we use */
+        struct session_handler * sess_hdl; /* We store RADIUS request authenticator information in the session */
         char * confstr;
 };
@@ -768 +767 @@
                                                 if (tag > 0x1F) tag = 0;                                                        \
                                                 if (avp_tun[tag] == NULL) {                                                     \
-                                                        CHECK_FCT( fd_msg_avp_new ( cs->dict.Tunneling, 0, &avp_tun[tag] ) );           \
+                                                        CHECK_FCT( fd_msg_avp_new ( cs->dict.Tunneling, 0, &avp_tun[tag] ) );   \
                                                         CHECK_FCT( fd_msg_avp_add (*diam_fw, MSG_BRW_LAST_CHILD, avp_tun[tag]));\
                                                 }                                                                               \
@@ -774 +773 @@
                         
                         /* Convert an attribute to an OctetString AVP and add inside the Tunneling AVP corresponding to the tag */
-                        #define CONV2DIAM_TUN_STR( _dictobj_ ) {                                                        \
+                        #define CONV2DIAM_TUN_STR( _dictobj_ ) {                                                \
                                 uint8_t tag;                                                                    \
                                 CHECK_PARAMS( attr->length >= 3);                                               \
@@ -786 +785 @@
                                 
                         /* Convert an attribute to a scalar AVP and add inside the Tunneling AVP corresponding to the tag */
-                        #define CONV2DIAM_TUN_24B( _dictobj_ ) {                                                        \
+                        #define CONV2DIAM_TUN_24B( _dictobj_ ) {                                                \
                                 uint8_t tag;                                                                    \
                                 CHECK_PARAMS( attr->length == 6);                                               \
@@ -916 +915 @@
 static int auth_diam_ans( struct rgwp_config * cs, struct session * session, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli )
 {
-        struct msg_hdr *mhdr;
         struct avp *avp, *next, *avp_x, *avp_y, *asid, *aoh;
         struct avp_hdr *ahdr, *sid, *oh;
@@ -931 +929 @@
                 CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, session, &req_auth ) );
         }
-        
-        CHECK_FCT( fd_msg_hdr( *diam_ans, &mhdr ) );
         
         /*      
@@ -1466 +1462 @@
                                                                                 break;
                                                                                 
-                                                                        case DIAM_ATTR_TUNNEL_ASSIGNEMENT_ID:
-                                                                                CONV2RAD_TUN_STR(RADIUS_ATTR_TUNNEL_ASSIGNEMENT_ID, ahdr->avp_value->os.data, ahdr->avp_value->os.len, 1);
+                                                                        case DIAM_ATTR_TUNNEL_ASSIGNMENT_ID:
+                                                                                CONV2RAD_TUN_STR(RADIUS_ATTR_TUNNEL_ASSIGNMENT_ID, ahdr->avp_value->os.data, ahdr->avp_value->os.len, 1);
                                                                                 break;