Merge from master

[l2tpns.git] / plugin.h

diff --git a/plugin.h b/plugin.h
index 0f2ed0f..d6cac99 100644 (file)
--- a/plugin.h
+++ b/plugin.h
@@ -1,120 +1,111 @@
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
 

-#define PLUGIN_API_VERSION     1
+#define PLUGIN_API_VERSION     7

 #define MAX_PLUGIN_TYPES       30
 
 enum
 {
 #define MAX_PLUGIN_TYPES       30
 
 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_BECOME_MASTER,
-       PLUGIN_NEW_SESSION_MASTER,
+    PLUGIN_PRE_AUTH = 1,
+    PLUGIN_POST_AUTH,
+    PLUGIN_TIMER,
+    PLUGIN_NEW_SESSION,
+    PLUGIN_KILL_SESSION,
+    PLUGIN_CONTROL,
+    PLUGIN_RADIUS_RESPONSE,
+    PLUGIN_RADIUS_RESET,
+    PLUGIN_RADIUS_ACCOUNT,
+    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, const char *title, const char *data, int maxsize);
-       char *(*inet_toa)(unsigned long addr);
-       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);
+    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);
+    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 const *reason, int result, int error, int term_cause);
+    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
 {

-       tunnelt *t;
-       sessiont *s;
-       char *username;
-       char *password;
-       int protocol;
-       int continue_auth;
+    tunnelt *t;
+    sessiont *s;
+    char *username;
+    char *password;
+    int protocol;
+    int continue_auth;

 };
 
 struct param_post_auth
 {
 };
 
 struct param_post_auth
 {

-       tunnelt *t;
-       sessiont *s;
-       char *username;
-       short auth_allowed;
-       int protocol;
+    tunnelt *t;
+    sessiont *s;
+    char *username;
+    short auth_allowed;
+    int protocol;

 };
 
 };
 

-struct param_packet_rx
-{
-       tunnelt *t;
-       sessiont *s;
-       char *buf;
-       int len;
-};
-
-struct param_packet_tx
+struct param_timer

 {
 {

-       tunnelt *t;
-       sessiont *s;
-       char *buf;
-       int len;
+    time_t time_now;

 };
 
 };
 

-struct param_timer
+struct param_new_session

 {
 {

-       time_t time_now;
+    tunnelt *t;
+    sessiont *s;

 };
 
 };
 

-struct param_config
+struct param_kill_session

 {
 {

-       char *key;
-       char *value;
+    tunnelt *t;
+    sessiont *s;

 };
 
 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_radius_response

 {
 {

-       tunnelt *t;
-       sessiont *s;
+    tunnelt *t;
+    sessiont *s;
+    char *key;
+    char *value;

 };
 
 };
 

-struct param_kill_session
+struct param_radius_reset

 {
 {

-       tunnelt *t;
-       sessiont *s;
+    tunnelt *t;
+    sessiont *s;

 };
 
 };
 

-struct param_radius_response
+struct param_radius_account

 {
 {

-       tunnelt *t;
-       sessiont *s;
-       char *key;
-       char *value;
+    tunnelt *t;
+    sessiont *s;
+    uint8_t **packet;

 };
 
 #endif /* __PLUGIN_H__ */
 };
 
 #endif /* __PLUGIN_H__ */