Merge from master

[l2tpns.git] / plugin.h

diff --git a/plugin.h b/plugin.h
index 9a4b67e..d6cac99 100644 (file)
--- a/plugin.h
+++ b/plugin.h
@@ -8,8 +8,6 @@ enum
 {
     PLUGIN_PRE_AUTH = 1,
     PLUGIN_POST_AUTH,
 {
     PLUGIN_PRE_AUTH = 1,
     PLUGIN_POST_AUTH,

-    PLUGIN_PACKET_RX,
-    PLUGIN_PACKET_TX,

     PLUGIN_TIMER,
     PLUGIN_NEW_SESSION,
     PLUGIN_KILL_SESSION,
     PLUGIN_TIMER,
     PLUGIN_NEW_SESSION,
     PLUGIN_KILL_SESSION,


@@ -62,25 +60,21 @@ struct param_post_auth
     int protocol;
 };
 
     int protocol;
 };
 

-struct param_packet_rx
+struct param_timer

 {
 {

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

 };
 
 };
 

-struct param_packet_tx
+struct param_new_session

 {
     tunnelt *t;
     sessiont *s;
 {
     tunnelt *t;
     sessiont *s;

-    char *buf;
-    int len;

 };
 
 };
 

-struct param_timer
+struct param_kill_session

 {
 {

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

 };
 
 struct param_control
 };
 
 struct param_control


@@ -93,18 +87,6 @@ struct param_control
     char *additional;
 };
 
     char *additional;
 };
 

-struct param_new_session
-{
-    tunnelt *t;
-    sessiont *s;
-};
-
-struct param_kill_session
-{
-    tunnelt *t;
-    sessiont *s;
-};
-

 struct param_radius_response
 {
     tunnelt *t;
 struct param_radius_response
 {
     tunnelt *t;