X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2f5b811429a2690c2ce44d09cc571c3230420c1b..ba1c3362c6dc0d65eb3d06368c47b75aa135456b:/tbf.c?ds=inline

diff --git a/tbf.c b/tbf.c
index c717a82..9dba63e 100644
--- a/tbf.c
+++ b/tbf.c
@@ -1,8 +1,10 @@
 // L2TPNS: token bucket filters
 
-char const *cvs_id_tbf = "$Id: tbf.c,v 1.10 2004-11-29 02:17:18 bodea Exp $";
-
 #include <string.h>
+#include <linux/rtnetlink.h>
+#include <netinet/ip6.h>
+
+#include "dhcp6.h"
 #include "l2tpns.h"
 #include "util.h"
 #include "tbf.h"
@@ -91,7 +93,7 @@ int free_tbf(int tid)
 //
 // Allocate a new token bucket filter.
 //
-int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
+int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, uint8_t *, int))
 {
 	int i;
 	static int p = 0;
@@ -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.
 //
-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;
-	tbft * f;
+	tbft *f;
 
 	if (!filter_list)
 		return -1;
@@ -309,7 +311,7 @@ int tbf_run_timer(void)
 	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;
@@ -318,7 +320,7 @@ int cmd_show_tbf(struct cli_def *cli, char *command, char **argv, int argc)
 		return CLI_HELP_NO_ARGS;
 
 	if (!config->cluster_iam_master) {
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;