Diff for /fwsync/patches/ipfw_main.patch between versions 1.2 and 1.2.2.1

version 1.2, 2022/07/11 17:03:15 version 1.2.2.1, 2022/08/26 14:46:29
Line 1 Line 1
 diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c  diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c
index 1b9c7f324a9..0b2ca745e4d 100644index 1b9c7f324a9..583545dbde5 100644
 --- a/sbin/ipfw/main.c  --- a/sbin/ipfw/main.c
 +++ b/sbin/ipfw/main.c  +++ b/sbin/ipfw/main.c
 @@ -42,6 +42,8 @@ help(void)  @@ -42,6 +42,8 @@ help(void)
Line 7  index 1b9c7f324a9..0b2ca745e4d 100644 Line 7  index 1b9c7f324a9..0b2ca745e4d 100644
  "where <command> is one of the following:\n\n"   "where <command> is one of the following:\n\n"
  "add [num] [set N] [prob x] RULE-BODY\n"   "add [num] [set N] [prob x] RULE-BODY\n"
 +"sync {start [edge|collector]|config [edge <port>|collector <ip,port>]|\n"  +"sync {start [edge|collector]|config [edge <port>|collector <ip,port>]|\n"
+"              show [config|status]|stop [edge|collector]|flush [edge|collector]}\n"+"              show|list [edge|collector]|stop [edge|collector]|flush [edge|collector]}\n"
  "{pipe|queue} N config PIPE-BODY\n"   "{pipe|queue} N config PIPE-BODY\n"
  "[pipe|queue] {zero|delete|show} [N{,N}]\n"   "[pipe|queue] {zero|delete|show} [N{,N}]\n"
  "nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|unreg_cgn|\n"   "nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|unreg_cgn|\n"
Line 44  index 1b9c7f324a9..0b2ca745e4d 100644 Line 44  index 1b9c7f324a9..0b2ca745e4d 100644
                 char *p = av[0];                  char *p = av[0];
     
                 av[0] = av[1];                  av[0] = av[1];
@@ -455,6 +460,16 @@ ipfw_main(int oldac, char **oldav)@@ -455,6 +460,18 @@ ipfw_main(int oldac, char **oldav)
                         ipfw_add(av);                          ipfw_add(av);
                 else if (g_co.do_nat && _substrcmp(*av, "show") == 0)                  else if (g_co.do_nat && _substrcmp(*av, "show") == 0)
                         ipfw_show_nat(ac, av);                          ipfw_show_nat(ac, av);
 +               else if (g_co.do_sync && _substrcmp(*av, "show") == 0)  +               else if (g_co.do_sync && _substrcmp(*av, "show") == 0)
 +                       ipfw_show_sync(ac, av);  +                       ipfw_show_sync(ac, av);
   +               else if (g_co.do_sync && _substrcmp(*av, "list") == 0)
   +                       ipfw_list_sync(ac, av);
 +               else if (g_co.do_sync && _substrcmp(*av, "start") == 0)  +               else if (g_co.do_sync && _substrcmp(*av, "start") == 0)
 +                       ipfw_start_sync(ac, av);  +                       ipfw_start_sync(ac, av);
 +               else if (g_co.do_sync && _substrcmp(*av, "stop") == 0)  +               else if (g_co.do_sync && _substrcmp(*av, "stop") == 0)

Removed from v.1.2  
changed lines
  Added in v.1.2.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>