fix cut-n-paste error

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index c73727b..99c685d 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.37 2004-11-25 12:41:35 bodea Exp $
+// $Id: l2tpns.h,v 1.43 2004-12-01 02:52:46 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.0.9"
+#define VERSION        "2.0.11"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535


@@ -124,6 +124,8 @@ struct cli_session_actions {
        u16 snoop_port;
        int throttle_in;
        int throttle_out;
        u16 snoop_port;
        int throttle_in;
        int throttle_out;

+       int filter_in;
+       int filter_out;

 };
 
 #define CLI_SESS_KILL          0x01
 };
 
 #define CLI_SESS_KILL          0x01


@@ -131,6 +133,8 @@ struct cli_session_actions {
 #define CLI_SESS_NOSNOOP       0x04
 #define CLI_SESS_THROTTLE      0x08
 #define CLI_SESS_NOTHROTTLE    0x10
 #define CLI_SESS_NOSNOOP       0x04
 #define CLI_SESS_THROTTLE      0x08
 #define CLI_SESS_NOTHROTTLE    0x10

+#define CLI_SESS_FILTER                0x20
+#define CLI_SESS_NOFILTER      0x40

 
 struct cli_tunnel_actions {
        char action;
 
 struct cli_tunnel_actions {
        char action;


@@ -142,7 +146,7 @@ struct cli_tunnel_actions {
 #define DUMP_MAGIC "L2TPNS#" VERSION "#"
 
 // structures
 #define DUMP_MAGIC "L2TPNS#" VERSION "#"
 
 // structures

-typedef struct routes           // route
+typedef struct                 // route

 {
        ipt ip;
        ipt mask;
 {
        ipt ip;
        ipt mask;


@@ -157,7 +161,7 @@ typedef struct controls         // control message
 }
 controlt;
 
 }
 controlt;
 

-typedef struct sessions
+typedef struct

 {
        sessionidt next;                // next session in linked list
        sessionidt far;                 // far end session ID
 {
        sessionidt next;                // next session in linked list
        sessionidt far;                 // far end session ID


@@ -199,7 +203,9 @@ typedef struct sessions
        ipt snoop_ip;                   // Interception destination IP
        u16 snoop_port;                 // Interception destination port
        u16 sid;                        // near end session id.
        ipt snoop_ip;                   // Interception destination IP
        u16 snoop_port;                 // Interception destination port
        u16 sid;                        // near end session id.

-       char reserved[20];              // Space to expand structure without changing HB_VERSION
+       u8 filter_in;                   // input filter index (to ip_filters[N-1]; 0 if none)
+       u8 filter_out;                  // output filter index
+       char reserved[18];              // Space to expand structure without changing HB_VERSION

 }
 sessiont;
 
 }
 sessiont;
 


@@ -207,7 +213,8 @@ sessiont;
 #define SF_LCP_ACKED   2       // LCP negotiated
 #define SF_CCP_ACKED   4       // CCP negotiated
 
 #define SF_LCP_ACKED   2       // LCP negotiated
 #define SF_CCP_ACKED   4       // CCP negotiated
 

-typedef struct {
+typedef struct
+{

        u32     cin;
        u32     cout;
 } sessioncountt;
        u32     cin;
        u32     cout;
 } sessioncountt;


@@ -216,7 +223,7 @@ typedef struct {
 #define        SESSIONACFC     2       // ACFC negotiated flags
 
 // 168 bytes per tunnel
 #define        SESSIONACFC     2       // ACFC negotiated flags
 
 // 168 bytes per tunnel

-typedef struct tunnels
+typedef struct

 {
        tunnelidt far;          // far end tunnel ID
        ipt ip;                 // Ip for far end
 {
        tunnelidt far;          // far end tunnel ID
        ipt ip;                 // Ip for far end


@@ -239,7 +246,7 @@ typedef struct tunnels
 tunnelt;
 
 // 180 bytes per radius session
 tunnelt;
 
 // 180 bytes per radius session

-typedef struct radiuss         // outstanding RADIUS requests
+typedef struct                 // outstanding RADIUS requests

 {
        sessionidt session;     // which session this applies to
        hasht auth;             // request authenticator
 {
        sessionidt session;     // which session this applies to
        hasht auth;             // request authenticator


@@ -270,7 +277,6 @@ struct Tringbuffer
                char level;
                sessionidt session;
                tunnelidt tunnel;
                char level;
                sessionidt session;
                tunnelidt tunnel;

-               ipt address;

                char message[MAX_LOG_LENGTH];
        } buffer[RINGBUFFER_SIZE];
        int head;
                char message[MAX_LOG_LENGTH];
        } buffer[RINGBUFFER_SIZE];
        int head;


@@ -393,7 +399,7 @@ struct Tstats
 #define SET_STAT(x, y)
 #endif
 
 #define SET_STAT(x, y)
 #endif
 

-struct configt
+typedef struct

 {
        int             debug;                          // debugging level
        time_t          start_time;                     // time when l2tpns was started
 {
        int             debug;                          // debugging level
        time_t          start_time;                     // time when l2tpns was started


@@ -470,16 +476,68 @@ struct configt
                int     hold;
        }               neighbour[BGP_NUM_PEERS];
 #endif
                int     hold;
        }               neighbour[BGP_NUM_PEERS];
 #endif

-};
+} configt;

 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC };
 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC };

-struct config_descriptt
+typedef struct

 {
        char *key;
        int offset;
        int size;
        enum config_typet type;
 {
        char *key;
        int offset;
        int size;
        enum config_typet type;

-};
+} config_descriptt;
+
+typedef struct
+{
+       u8 op;          // operation
+#define FILTER_PORT_OP_NONE    0 // all ports match
+#define FILTER_PORT_OP_EQ      1
+#define FILTER_PORT_OP_NEQ     2
+#define FILTER_PORT_OP_GT      3
+#define FILTER_PORT_OP_LT      4
+#define FILTER_PORT_OP_RANGE   5
+       portt port;     // port (host byte order)
+       portt port2;    // range
+} ip_filter_portt;
+
+typedef struct
+{
+       int action;             // permit/deny
+#define FILTER_ACTION_DENY     1
+#define FILTER_ACTION_PERMIT   2
+       u8 proto;               // protocol: IPPROTO_* (netinet/in.h)
+       ipt src_ip;             // source ip (network byte order)
+       ipt src_wild;
+       ip_filter_portt src_ports;
+       ipt dst_ip;             // dest ip
+       ipt dst_wild;
+       ip_filter_portt dst_ports;
+       u8 frag;                // apply to non-initial fragments
+       u8 tcp_flag_op;         // match type: any, all, established
+#define FILTER_FLAG_OP_ANY     1
+#define FILTER_FLAG_OP_ALL     2
+#define FILTER_FLAG_OP_EST     3
+       u8 tcp_sflags;          // flags set
+       u8 tcp_cflags;          // flags clear
+       u32 counter;            // match count
+} ip_filter_rulet;
+
+#define TCP_FLAG_FIN   0x01
+#define TCP_FLAG_SYN   0x02
+#define TCP_FLAG_RST   0x04
+#define TCP_FLAG_PSH   0x08
+#define TCP_FLAG_ACK   0x10
+#define TCP_FLAG_URG   0x20
+
+#define MAXFILTER              32
+#define MAXFILTER_RULES                32
+typedef struct
+{
+       char name[32];          // ACL name
+       int extended;           // type: 0 = standard, 1 = extended
+       ip_filter_rulet rules[MAXFILTER_RULES];
+       int used;               // session ref count
+} ip_filtert;

 
 // arp.c
 void sendarp(int ifr_idx, const unsigned char* mac, ipt ip);
 
 // arp.c
 void sendarp(int ifr_idx, const unsigned char* mac, ipt ip);


@@ -517,16 +575,17 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t);
 void sendipcp(tunnelidt t, sessionidt s);
 void processudp(u8 * buf, int len, struct sockaddr_in *addr);
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port);
 void sendipcp(tunnelidt t, sessionidt s);
 void processudp(u8 * buf, int len, struct sockaddr_in *addr);
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port);

+int ip_filter(u8 *buf, int len, u8 filter);

 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
 
 #undef LOG
 #undef LOG_HEX
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
 
 #undef LOG
 #undef LOG_HEX

-#define LOG(D, a, s, t, f, ...)        ({ if (D <= config->debug) _log(D, a, s, t, f, ## __VA_ARGS__); })
+#define LOG(D, s, t, f, ...)   ({ if (D <= config->debug) _log(D, s, t, f, ## __VA_ARGS__); })

 #define LOG_HEX(D, t, d, s)    ({ if (D <= config->debug) _log_hex(D, t, d, s); })
 
 #define LOG_HEX(D, t, d, s)    ({ if (D <= config->debug) _log_hex(D, t, d, s); })
 

-void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 5, 6)));
+void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5)));

 void _log_hex(int level, const char *title, const char *data, int maxsize);
 
 int sessionsetup(tunnelidt t, sessionidt s);
 void _log_hex(int level, const char *title, const char *data, int maxsize);
 
 int sessionsetup(tunnelidt t, sessionidt s);


@@ -559,18 +618,18 @@ if (count++ < max) { \
        void *array[20]; \
        char **strings; \
        int size, i; \
        void *array[20]; \
        char **strings; \
        int size, i; \

-       LOG(0, 0, 0, t, "Backtrace follows"); \
+       LOG(0, 0, t, "Backtrace follows"); \

        size = backtrace(array, 10); \
        strings = backtrace_symbols(array, size); \
        if (strings) for (i = 0; i < size; i++) \
        { \
        size = backtrace(array, 10); \
        strings = backtrace_symbols(array, size); \
        if (strings) for (i = 0; i < size; i++) \
        { \

-               LOG(0, 0, 0, t, "%s\n", strings[i]); \
+               LOG(0, 0, t, "%s\n", strings[i]); \

        } \
        free(strings); \
 }
 
 
        } \
        free(strings); \
 }
 
 

-extern struct configt *config;
+extern configt *config;

 extern time_t basetime;                // Time when this process started.
 extern time_t time_now;                // Seconds since EPOCH.
 extern u32 last_id;
 extern time_t basetime;                // Time when this process started.
 extern time_t time_now;                // Seconds since EPOCH.
 extern u32 last_id;