Merge from Master

[l2tpns.git] / tbf.c

diff --git a/tbf.c b/tbf.c
index 091e52d..9dba63e 100644 (file)
--- a/tbf.c
+++ b/tbf.c
@@ -1,8 +1,10 @@
 // L2TPNS: token bucket filters
 
 // L2TPNS: token bucket filters
 

-char const *cvs_id_tbf = "$Id: tbf.c,v 1.12 2005-05-02 09:55:04 bodea Exp $";
-

 #include <string.h>
 #include <string.h>

+#include <linux/rtnetlink.h>
+#include <netinet/ip6.h>
+
+#include "dhcp6.h"

 #include "l2tpns.h"
 #include "util.h"
 #include "tbf.h"
 #include "l2tpns.h"
 #include "util.h"
 #include "tbf.h"


@@ -159,10 +161,10 @@ void fsck_tbfs(void)
 // If we can send it right away, we do. Else we
 // try and queue it to send later. Else we drop it.
 //
 // If we can send it right away, we do. Else we
 // try and queue it to send later. Else we drop it.
 //

-int tbf_queue_packet(int tbf_id, char * data, int size)
+int tbf_queue_packet(int tbf_id, uint8_t *data, int size)

 {
        int i;
 {
        int i;

-       tbft * f;
+       tbft *f;

 
        if (!filter_list)
                return -1;
 
        if (!filter_list)
                return -1;


@@ -309,7 +311,7 @@ int tbf_run_timer(void)
        return 1;
 }
 
        return 1;
 }
 

-int cmd_show_tbf(struct cli_def *cli, char *command, char **argv, int argc)
+int cmd_show_tbf(struct cli_def *cli, const char *command, char **argv, int argc)

 {
        int i;
        int count = 0;
 {
        int i;
        int count = 0;