Merge from master

[l2tpns.git] / tbf.c

diff --git a/tbf.c b/tbf.c
index 223c40d..aa9810e 100644 (file)
--- a/tbf.c
+++ b/tbf.c
@@ -1,8 +1,9 @@
 // L2TPNS: token bucket filters
 
 // L2TPNS: token bucket filters
 

-char const *cvs_id_tbf = "$Id: tbf.c,v 1.13 2005/07/31 10:04:10 bodea Exp $";
-

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

+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
+

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


@@ -309,7 +310,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;