[netfilter-cvslog] r3422 - trunk/nfsim/tools
rusty at netfilter.org
rusty at netfilter.org
Fri Dec 17 05:14:43 CET 2004
Author: rusty at netfilter.org
Date: 2004-12-17 05:14:42 +0100 (Fri, 17 Dec 2004)
New Revision: 3422
Modified:
trunk/nfsim/tools/gen_err.c
Log:
patch from acidfu: print out help in gen_err on parse error: need to move help function.
Modified: trunk/nfsim/tools/gen_err.c
===================================================================
--- trunk/nfsim/tools/gen_err.c 2004-12-17 03:19:12 UTC (rev 3421)
+++ trunk/nfsim/tools/gen_err.c 2004-12-17 04:14:42 UTC (rev 3422)
@@ -81,34 +81,6 @@
return true;
}
-static bool gen_err(int argc, char *argv[])
-{
- struct packet orig, packet;
- int len = 28;
- char *interface = NULL;
- int dump_flags = 0;
-
- if (argc > 1 && strncmp(argv[1], "IF=", 3) == 0) {
- interface = argv[1] + 3;
- argc--;
- argv++;
- }
-
- if (argc > 1 && strncmp(argv[1], "LEN=", 4) == 0) {
- len = string_to_number(argv[1] + 4, 0, 65535);
- argc--;
- argv++;
- }
-
- if (!parse_packet(&orig, argc-3, argv+3, &dump_flags))
- return false;
-
- if (!create_icmp(&packet, &orig, len, argv[1], argv[2], argv[3]))
- return false;
-
- return send_packet(&packet, interface, dump_flags);
-}
-
static void gen_err_help(int argc, char **argv)
{
#include "gen_err-help:gen_err"
@@ -139,6 +111,36 @@
*/
}
+static bool gen_err(int argc, char *argv[])
+{
+ struct packet orig, packet;
+ int len = 28;
+ char *interface = NULL;
+ int dump_flags = 0;
+
+ if (argc > 1 && strncmp(argv[1], "IF=", 3) == 0) {
+ interface = argv[1] + 3;
+ argc--;
+ argv++;
+ }
+
+ if (argc > 1 && strncmp(argv[1], "LEN=", 4) == 0) {
+ len = string_to_number(argv[1] + 4, 0, 65535);
+ argc--;
+ argv++;
+ }
+
+ if (!parse_packet(&orig, argc-3, argv+3, &dump_flags)) {
+ gen_err_help(0, NULL);
+ return false;
+ }
+
+ if (!create_icmp(&packet, &orig, len, argv[1], argv[2], argv[3]))
+ return false;
+
+ return send_packet(&packet, interface, dump_flags);
+}
+
static void init(void)
{
tui_register_command("gen_err", gen_err, gen_err_help);
More information about the netfilter-cvslog
mailing list