merge back 2.0 branch changes

[l2tpns.git] / plugin.h

diff --git a/plugin.h b/plugin.h
index b751a1d..ca0368f 100644 (file)
--- a/plugin.h
+++ b/plugin.h
@@ -1,7 +1,7 @@
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 

-#define PLUGIN_API_VERSION     3
+#define PLUGIN_API_VERSION     4

 #define MAX_PLUGIN_TYPES       30
 
 enum
 #define MAX_PLUGIN_TYPES       30
 
 enum


@@ -21,20 +21,23 @@ enum
 
 #define PLUGIN_RET_ERROR       0
 #define PLUGIN_RET_OK          1
 
 #define PLUGIN_RET_ERROR       0
 #define PLUGIN_RET_OK          1

-#define PLUGIN_RET_STOP                2
+#define PLUGIN_RET_STOP                2 
+#define PLUGIN_RET_NOTMASTER   3

 
 struct pluginfuncs
 {
 
 struct pluginfuncs
 {

-       void (*log)(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...);
+       void (*log)(int level, sessionidt s, tunnelidt t, const char *format, ...);

        void (*log_hex)(int level, const char *title, const char *data, int maxsize);
        void (*log_hex)(int level, const char *title, const char *data, int maxsize);

-       char *(*inet_toa)(unsigned long addr);
+       char *(*fmtaddr)(in_addr_t addr, int n);

        sessionidt (*get_session_by_username)(char *username);
        sessiont *(*get_session_by_id)(sessionidt s);
        sessionidt (*get_id_by_session)(sessiont *s);
        sessionidt (*get_session_by_username)(char *username);
        sessiont *(*get_session_by_id)(sessionidt s);
        sessionidt (*get_id_by_session)(sessiont *s);

-       void (*sessionkill)(sessionidt s, char *reason);
-       u16 (*radiusnew)(sessionidt s);
-       void (*radiussend)(u16 r, u8 state);
+       uint16_t (*radiusnew)(sessionidt s);
+       void (*radiussend)(uint16_t r, uint8_t state);

        void *(*getconfig)(char *key, enum config_typet type);
        void *(*getconfig)(char *key, enum config_typet type);

+       void (*sessionkill)(sessionidt s, char *reason);
+       void (*throttle)(sessionidt s, int rate_in, int rate_out);
+       int (*session_changed)(int sid);

 };
 
 struct param_pre_auth
 };
 
 struct param_pre_auth


@@ -79,8 +82,10 @@ struct param_timer
 
 struct param_control
 {
 
 struct param_control
 {

+       int iam_master;

        int argc;
        char **argv;
        int argc;
        char **argv;

+       // output

        int response;
        char *additional;
 };
        int response;
        char *additional;
 };