bug fix

[l2tpns.git] / plugin.h

diff --git a/plugin.h b/plugin.h
index 28855e1..faf3a5e 100644 (file)
--- a/plugin.h
+++ b/plugin.h
@@ -1,35 +1,45 @@
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 

-#define PLUGIN_API_VERSION     1
+#define PLUGIN_API_VERSION     6

 #define MAX_PLUGIN_TYPES       30
 
 #define MAX_PLUGIN_TYPES       30
 

-#define PLUGIN_PRE_AUTH                1
-#define PLUGIN_POST_AUTH       2
-#define PLUGIN_PACKET_RX       3
-#define PLUGIN_PACKET_TX       4
-#define PLUGIN_TIMER           5
-#define PLUGIN_CONFIG          6
-#define PLUGIN_NEW_SESSION     7
-#define PLUGIN_KILL_SESSION    8
-#define PLUGIN_CONTROL         9
-#define PLUGIN_RADIUS_RESPONSE 10
+enum
+{
+       PLUGIN_PRE_AUTH = 1,
+       PLUGIN_POST_AUTH,
+       PLUGIN_PACKET_RX,
+       PLUGIN_PACKET_TX,
+       PLUGIN_TIMER,
+       PLUGIN_NEW_SESSION,
+       PLUGIN_KILL_SESSION,
+       PLUGIN_CONTROL,
+       PLUGIN_RADIUS_RESPONSE,
+       PLUGIN_RADIUS_RESET,
+       PLUGIN_BECOME_MASTER,
+       PLUGIN_NEW_SESSION_MASTER,
+};

 
 #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_hex)(int level, ipt address, sessionidt s, tunnelidt t, const char *title, const char *data, int maxsize);
-       char *(*inet_toa)(unsigned long addr);
+       void (*log)(int level, sessionidt s, tunnelidt t, const char *format, ...);
+       void (*log_hex)(int level, const char *title, const uint8_t *data, int maxsize);
+       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);

+       uint16_t (*radiusnew)(sessionidt s);
+       void (*radiussend)(uint16_t r, uint8_t state);
+       void *(*getconfig)(char *key, enum config_typet type);
+       void (*sessionshutdown)(sessionidt s, char *reason, int result, int error);

        void (*sessionkill)(sessionidt s, char *reason);
        void (*sessionkill)(sessionidt s, char *reason);

-       u8 (*radiusnew)(sessionidt s);
-       void (*radiussend)(u8 r, u8 state);
+       void (*throttle)(sessionidt s, int rate_in, int rate_out);
+       int (*session_changed)(int sid);

 };
 
 struct param_pre_auth
 };
 
 struct param_pre_auth


@@ -72,25 +82,14 @@ struct param_timer
        time_t time_now;
 };
 
        time_t time_now;
 };
 

-struct param_config
-{
-       char *key;
-       char *value;
-};
-

 struct param_control
 {
 struct param_control
 {

-       char *buf;
-       int l;
-       unsigned int source_ip;
-       unsigned short source_port;
-       char *response;
-       int response_length;
-       int send_response;
-       short type;
-       int id;
-       char *data;
-       int data_length;
+       int iam_master;
+       int argc;
+       char **argv;
+       // output
+       int response;
+       char *additional;

 };
 
 struct param_new_session
 };
 
 struct param_new_session


@@ -113,4 +112,10 @@ struct param_radius_response
        char *value;
 };
 
        char *value;
 };
 

-#endif
+struct param_radius_reset
+{
+       tunnelt *t;
+       sessiont *s;
+};
+
+#endif /* __PLUGIN_H__ */