X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/af2489f67ad3e5c83566b661ebd67806b6b96a0e..28a49c442bdb926f79de1bd39821b77dda7d862d:/cli.c?ds=sidebyside

diff --git a/cli.c b/cli.c
index cce382b..86751ea 100644
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.35 2004-11-29 03:55:19 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.38 2004-12-01 02:51:06 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -1003,7 +1003,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int
 			NULL);
 	}
 
-	cli_print(cli, "%6s%6s%5s%6s%9s%9s%4s", "ID", "Radius", "Sock", "State", "Session", "Retry", "Try");
+	cli_print(cli, "%6s%7s%5s%6s%9s%9s%4s", "ID", "Radius", "Sock", "State", "Session", "Retry", "Try");
 
 	time(&time_now);
 
@@ -1019,7 +1019,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int
 
 		if (!show_all && radius[i].state == RADIUSNULL) continue;
 
-		cli_print(cli, "%6d%6d%5d%6s%9d%9u%4d",
+		cli_print(cli, "%6d%7d%5d%6s%9d%9u%4d",
 				i,
 				i >> RADIUS_SHIFT,
 				i & RADIUS_MASK,
@@ -2688,6 +2688,12 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 	if (a < argc && MATCH("fragments", argv[a]))
 	{
+		if (rule.src_ports.op || rule.dst_ports.op || rule.tcp_flag_op)
+		{
+			cli_print(cli, "Can't specify \"fragments\" on rules with layer 4 matches");
+			return NULL;
+		}
+
 	    	rule.frag = 1;
 		a++;
 	}