Merge branch 'master' into samesversion

[l2tpns.git] / tbf.c

diff --git a/tbf.c b/tbf.c
index c717a82..8b488d6 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.10 2004-11-29 02:17:18 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"


@@ -91,7 +92,7 @@ int free_tbf(int tid)
 //
 // Allocate a new token bucket filter.
 //
 //
 // 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;
 {
        int i;
        static int p = 0;


@@ -159,10 +160,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;


@@ -318,7 +319,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) {
                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;
                        fmtaddr(config->cluster_master_address, 0));
 
                return CLI_OK;