Add support for Acct-Type,Session-Type and PostAuth-Type

diff --git a/raddb/dictionary b/raddb/dictionary
index 5b9a57e..93dc07b 100644 (file)
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -221,6 +221,8 @@ ATTRIBUTE   Add-Suffix              1009    string
 ATTRIBUTE      Expiration              1010    date
 ATTRIBUTE      Autz-Type               1011    integer
 ATTRIBUTE      Acct-Type               1011    integer
+ATTRIBUTE      Session-Type            1012    integer
+ATTRIBUTE      PostAuth-Type           1013    integer
 
 #
 #      Integer Translations
@@ -396,6 +398,16 @@ VALUE              Autz-Type               Local                   0
 #      And accounting
 #
 VALUE          Acct-Type               Local                   0
+
+#
+#      And Session handling
+#
+VALUE          Session-Type            Local                   0
+
+#
+#      And Post-Auth
+VALUE          PostAuth-Type           Local                   0
+
 #
 #      Experimental Non-Protocol Integer Translations for Cistron-Radiusd
 #

diff --git a/share/dictionary b/share/dictionary
index 5b9a57e..93dc07b 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -221,6 +221,8 @@ ATTRIBUTE   Add-Suffix              1009    string
 ATTRIBUTE      Expiration              1010    date
 ATTRIBUTE      Autz-Type               1011    integer
 ATTRIBUTE      Acct-Type               1011    integer
+ATTRIBUTE      Session-Type            1012    integer
+ATTRIBUTE      PostAuth-Type           1013    integer
 
 #
 #      Integer Translations
@@ -396,6 +398,16 @@ VALUE              Autz-Type               Local                   0
 #      And accounting
 #
 VALUE          Acct-Type               Local                   0
+
+#
+#      And Session handling
+#
+VALUE          Session-Type            Local                   0
+
+#
+#      And Post-Auth
+VALUE          PostAuth-Type           Local                   0
+
 #
 #      Experimental Non-Protocol Integer Translations for Cistron-Radiusd
 #

diff --git a/src/include/modules.h b/src/include/modules.h
index b530bb3..12fab66 100644 (file)
--- a/src/include/modules.h
+++ b/src/include/modules.h
@@ -56,13 +56,12 @@ int detach_modules(void);
 int module_authorize(int type, REQUEST *request);
 int module_authenticate(int type, REQUEST *request);
 int module_preacct(REQUEST *request);
-int module_accounting(REQUEST *request);
-int module_checksimul(REQUEST *request, int maxsimul);
+int module_accounting(int type, REQUEST *request);
+int module_checksimul(int type, REQUEST *request, int maxsimul);
 int module_pre_proxy(REQUEST *request);
 int module_post_proxy(REQUEST *request);
-int module_post_auth(REQUEST *request);
 int module_pre_proxy(REQUEST *request);
 int module_post_proxy(REQUEST *request);
-int module_post_auth(REQUEST *request);
+int module_post_auth(int type, REQUEST *request);
 
 #endif /* RADIUS_MODULES_H */

diff --git a/src/include/radius.h b/src/include/radius.h
index 92adca1..e9abad8 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -118,6 +118,8 @@
 #define PW_EXPIRATION                  1010
 #define PW_AUTZTYPE                    1011
 #define PW_ACCTTYPE                    1011
+#define PW_SESSTYPE                    1012
+#define PW_POSTAUTHTYPE                        1013
 #define PW_USER_CATEGORY               1029
 #define PW_GROUP_NAME                  1030
 #define PW_HUNTGROUP_NAME              1031

diff --git a/src/main/acct.c b/src/main/acct.c
index 9b3b838..346a7ae 100644 (file)
--- a/src/main/acct.c
+++ b/src/main/acct.c
@@ -50,6 +50,7 @@ int rad_accounting(REQUEST *request)
                int             exec_wait;
                VALUE_PAIR      *vp;
                int             rcode;
+               int             acct_type = 0;
 
                reply = module_preacct(request);
                if (reply != RLM_MODULE_NOOP &&
@@ -62,7 +63,10 @@ int rad_accounting(REQUEST *request)
                 *      This is to ensure that we log the packet
                 *      immediately, even if the proxy never does.
                 */
-               reply = module_accounting(request);
+               vp = pairfind(request->config_items, PW_ACCTTYPE);
+               if (vp)
+                       acct_type = vp->lvalue;
+               reply = module_accounting(acct_type,request);
                
                /*
                 *      See if we need to execute a program.

diff --git a/src/main/auth.c b/src/main/auth.c
index b2034b8..7190013 100644 (file)
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -416,6 +416,7 @@ int rad_authenticate(REQUEST *request)
        VALUE_PAIR      *module_msg;
        VALUE_PAIR      *tmp = NULL;
        VALUE_PAIR      *autz_type_item = NULL;
+       VALUE_PAIR      *postauth_type_item = NULL;
        int             result, r;
        char            umsg[MAX_STRING_LEN + 1];
        const char      *user_msg = NULL;
@@ -426,6 +427,7 @@ int rad_authenticate(REQUEST *request)
        char            buf[1024], logstr[1024];
        char            autz_retry = 0;
        int             autz_type = 0;
+       int             postauth_type = 0;
 
        password = "";
 
@@ -616,12 +618,19 @@ autz_redo:
 
        if (result >= 0 &&
                        (check_item = pairfind(request->config_items, PW_SIMULTANEOUS_USE)) != NULL) {
+               VALUE_PAIR      *session_type;
+               int             sess_type = 0;
+
+               session_type = pairfind(request->config_items, PW_SESSTYPE);
+               if (session_type)
+                       sess_type = session_type->lvalue;
+
                /*
                 *      User authenticated O.K. Now we have to check
                 *      for the Simultaneous-Use parameter.
                 */
                if (namepair &&
-                   (r = module_checksimul(request, check_item->lvalue)) != 0) {
+                   (r = module_checksimul(sess_type,request, check_item->lvalue)) != 0) {
                        char mpp_ok = 0;
 
                        if (r == 2){
@@ -888,7 +897,10 @@ autz_redo:
         *      Do post-authentication calls. ignoring the return code.
         *      If the post-authentication
         */
-       result = module_post_auth(request);
+       postauth_type_item = pairfind(request->config_items, PW_POSTAUTHTYPE);
+       if (postauth_type_item)
+               postauth_type = postauth_type_item->lvalue;
+       result = module_post_auth(postauth_type, request);
        switch (result) {
          break;
          

diff --git a/src/main/modules.c b/src/main/modules.c
index 5185d9d..74400da 100644 (file)
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -475,6 +475,10 @@ static void load_subcomponent_section(CONF_SECTION *cs, int comp, const char *fi
                dval = dict_valbyname(PW_AUTZTYPE, cf_section_name2(cs));
        } else if (comp == RLM_COMPONENT_ACCT) {
                dval = dict_valbyname(PW_ACCTTYPE, cf_section_name2(cs));
+       } else if (comp == RLM_COMPONENT_SESS) {
+               dval = dict_valbyname(PW_SESSTYPE, cf_section_name2(cs));
+       } else if (comp == RLM_COMPONENT_POST_AUTH) {
+               dval = dict_valbyname(PW_POSTAUTHTYPE, cf_section_name2(cs));
        }
 
        if (dval) {
@@ -571,6 +575,8 @@ static const section_type_value_t section_type_value[] = {
        { "authorize",    "autztype", PW_AUTZTYPE },
        { "authenticate", "authtype", PW_AUTHTYPE },
        { "accounting",   "accttype", PW_ACCTTYPE },
+       { "session",     "sesstype", PW_SESSTYPE },
+       { "post-auth",  "post-authtype", PW_POSTAUTHTYPE },
        { NULL, NULL, 0 }
 };
 
@@ -782,9 +788,9 @@ int module_preacct(REQUEST *request)
 /*
  *     Do accounting for ALL configured sessions
  */
-int module_accounting(REQUEST *request)
+int module_accounting(int acct_type, REQUEST *request)
 {
-       return indexed_modcall(RLM_COMPONENT_ACCT, 0, request);
+       return indexed_modcall(RLM_COMPONENT_ACCT, acct_type, request);
 }
 
 /*
@@ -792,7 +798,7 @@ int module_accounting(REQUEST *request)
  *
  *     Returns: 0 == OK, 1 == double logins, 2 == multilink attempt
  */
-int module_checksimul(REQUEST *request, int maxsimul)
+int module_checksimul(int sess_type, REQUEST *request, int maxsimul)
 {
        int rcode;
 
@@ -806,7 +812,7 @@ int module_checksimul(REQUEST *request, int maxsimul)
        request->simul_max = maxsimul;
        request->simul_mpp = 1;
 
-       rcode = indexed_modcall(RLM_COMPONENT_SESS, 0, request);
+       rcode = indexed_modcall(RLM_COMPONENT_SESS, sess_type, request);
 
        if (rcode != RLM_MODULE_OK) {
                /* FIXME: Good spot for a *rate-limited* warning to the log */
@@ -835,8 +841,8 @@ int module_post_proxy(REQUEST *request)
 /*
  *     Do post-authentication for ALL configured sessions
  */
-int module_post_auth(REQUEST *request)
+int module_post_auth(int postauth_type, REQUEST *request)
 {
-       return indexed_modcall(RLM_COMPONENT_POST_AUTH, 0, request);
+       return indexed_modcall(RLM_COMPONENT_POST_AUTH, postauth_type, request);
 }