projects / packages / iptables.git / blame
| Commit | Line | Data |
|---|---|---|
| 3ec39b81 JR |
1 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/Makefile userspace/Makefile |
| 2 | --- iptables-1.2.2/Makefile Tue May 1 11:44:16 2001 | |
| 3 | +++ userspace/Makefile Mon May 14 16:32:52 2001 | |
| 4 | @@ -91,24 +91,24 @@ | |
| 5 | cp $< $@ | |
| 6 | ||
| 7 | ip6tables.o: ip6tables.c | |
| 8 | - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< | |
| 9 | + $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< | |
| 10 | ||
| 11 | ip6tables: ip6tables-standalone.c ip6tables.o libiptc/libiptc.a | |
| 12 | - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 13 | + $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 14 | ||
| 15 | $(DESTDIR)$(BINDIR)/ip6tables: ip6tables | |
| 16 | @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) | |
| 17 | cp $< $@ | |
| 18 | ||
| 19 | ip6tables-save: ip6tables-save.c ip6tables.o libiptc/libiptc.a | |
| 20 | - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 21 | + $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 22 | ||
| 23 | $(DESTDIR)$(BINDIR)/ip6tables-save: ip6tables-save | |
| 24 | @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) | |
| 25 | cp $< $@ | |
| 26 | ||
| 27 | ip6tables-restore: ip6tables-restore.c ip6tables.o libiptc/libiptc.a | |
| 28 | - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 29 | + $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ -ldl | |
| 30 | ||
| 31 | $(DESTDIR)$(BINDIR)/ip6tables-restore: ip6tables-restore | |
| 32 | @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) | |
| 33 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/extensions/libipt_REJECT.c userspace/extensions/libipt_REJECT.c | |
| 34 | --- iptables-1.2.2/extensions/libipt_REJECT.c Mon Dec 18 06:09:52 2000 | |
| 35 | +++ userspace/extensions/libipt_REJECT.c Mon May 14 16:32:55 2001 | |
| 36 | @@ -146,8 +146,13 @@ | |
| 37 | { | |
| 38 | const struct ipt_reject_info *reject | |
| 39 | = (const struct ipt_reject_info *)target->data; | |
| 40 | + unsigned int i; | |
| 41 | ||
| 42 | - printf("--reject-with %s ", reject_table[reject->with].name); | |
| 43 | + for (i = 0; i < sizeof(reject_table)/sizeof(struct reject_names); i++) | |
| 44 | + if (reject_table[i].with == reject->with) | |
| 45 | + break; | |
| 46 | + | |
| 47 | + printf("--reject-with %s ", reject_table[i].name); | |
| 48 | } | |
| 49 | ||
| 50 | struct iptables_target reject | |
| 51 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/ip6tables-save.c userspace/ip6tables-save.c | |
| 52 | --- iptables-1.2.2/ip6tables-save.c Tue Feb 27 10:59:48 2001 | |
| 53 | +++ userspace/ip6tables-save.c Mon May 14 16:32:52 2001 | |
| 54 | @@ -51,7 +51,7 @@ | |
| 55 | if (iface[i] != '\0') | |
| 56 | printf("%c", iface[i]); | |
| 57 | } else { | |
| 58 | - if (iface[i] != '\0') | |
| 59 | + if (iface[i] == '\0') | |
| 60 | printf("+"); | |
| 61 | break; | |
| 62 | } | |
| 63 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/ip6tables.c userspace/ip6tables.c | |
| 64 | --- iptables-1.2.2/ip6tables.c Sat May 5 23:37:47 2001 | |
| 65 | +++ userspace/ip6tables.c Mon May 14 16:32:52 2001 | |
| 66 | @@ -745,7 +745,7 @@ | |
| 67 | memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1); | |
| 68 | } | |
| 69 | for (i = 0; vianame[i]; i++) { | |
| 70 | - if (!isalnum(vianame[i])) { | |
| 71 | + if (!isalnum(vianame[i]) && vianame[i] != '_') { | |
| 72 | printf("Warning: wierd character in interface" | |
| 73 | " `%s' (No aliases, :, ! or *).\n", | |
| 74 | vianame); | |
| 75 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/iptables-save.c userspace/iptables-save.c | |
| 76 | --- iptables-1.2.2/iptables-save.c Thu Mar 15 16:12:02 2001 | |
| 77 | +++ userspace/iptables-save.c Mon May 14 16:32:52 2001 | |
| 78 | @@ -48,7 +48,7 @@ | |
| 79 | if (iface[i] != '\0') | |
| 80 | printf("%c", iface[i]); | |
| 81 | } else { | |
| 82 | - if (iface[i] != '\0') | |
| 83 | + if (iface[i] == '\0') | |
| 84 | printf("+"); | |
| 85 | break; | |
| 86 | } | |
| 87 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/iptables.c userspace/iptables.c | |
| 88 | --- iptables-1.2.2/iptables.c Sun Mar 25 21:55:04 2001 | |
| 89 | +++ userspace/iptables.c Mon May 14 16:32:52 2001 | |
| 90 | @@ -744,7 +744,7 @@ | |
| 91 | memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1); | |
| 92 | } | |
| 93 | for (i = 0; vianame[i]; i++) { | |
| 94 | - if (!isalnum(vianame[i])) { | |
| 95 | + if (!isalnum(vianame[i]) && vianame[i] != '_') { | |
| 96 | printf("Warning: wierd character in interface" | |
| 97 | " `%s' (No aliases, :, ! or *).\n", | |
| 98 | vianame); | |
| 99 | diff -urN -x CVS -x .cvsignore iptables-1.2.2/patch-o-matic/irc-conntrack-nat.patch userspace/patch-o-matic/irc-conntrack-nat.patch | |
| 100 | --- iptables-1.2.2/patch-o-matic/irc-conntrack-nat.patch Thu May 3 02:30:11 2001 | |
| 101 | +++ userspace/patch-o-matic/irc-conntrack-nat.patch Sun May 20 21:27:21 2001 | |
| 102 | @@ -260,8 +260,8 @@ | |
| 103 | + printk(KERN_WARNING | |
| 104 | + "Forged DCC command from " | |
| 105 | + "%u.%u.%u.%u: %u.%u.%u.%u:%u\n", | |
| 106 | -+ HIPQUAD(ct->tuplehash[dir].tuple.src.ip), | |
| 107 | -+ NIPQUAD(dcc_ip), dcc_port); | |
| 108 | ++ NIPQUAD(ct->tuplehash[dir].tuple.src.ip), | |
| 109 | ++ HIPQUAD(dcc_ip), dcc_port); | |
| 110 | + | |
| 111 | + continue; | |
| 112 | + } |