Header file structure change requires additional qualifications in member
references.
Signed-off-by: M.S. Zick [EMAIL PROTECTED]
---
./SRCS/openWRT/trunk/build_dir/linux-x86_generic/iptables-1.4.0/extensions/libxt_string.c~
2007-10-15 07:45:09.000000000 -0500
+++
./SRCS/openWRT/trunk/build_dir/linux-x86_generic/iptables-1.4.0/extensions/libxt_string.c
2008-10-11 09:19:36.000000000 -0500
@@ -1,5 +1,5 @@
-/* Shared library add-on to iptables to add string matching support.
- *
+/* Shared library add-on to iptables to add string matching support.
+ *
* Copyright (C) 2000 Emmanuel Roger <[EMAIL PROTECTED]>
*
* 2005-08-05 Pablo Neira Ayuso <[EMAIL PROTECTED]>
@@ -62,7 +62,7 @@
static void
parse_string(const char *s, struct xt_string_info *info)
-{
+{
if (strlen(s) <= XT_STRING_MAX_PATTERN_SIZE) {
strncpy(info->pattern, s, XT_STRING_MAX_PATTERN_SIZE);
info->patlen = strlen(s);
@@ -201,7 +201,7 @@
check_inverse(optarg, &invert, &optind, 0);
parse_string(argv[optind-1], stringinfo);
if (invert)
- stringinfo->invert = 1;
+ stringinfo->u.v0.invert = 1;
stringinfo->patlen=strlen((char *)&stringinfo->pattern);
*flags |= STRING;
break;
@@ -214,7 +214,7 @@
check_inverse(optarg, &invert, &optind, 0);
parse_hex_string(argv[optind-1], stringinfo); /* sets length */
if (invert)
- stringinfo->invert = 1;
+ stringinfo->u.v0.invert = 1;
*flags |= STRING;
break;
@@ -290,10 +290,10 @@
(const struct xt_string_info*) match->data;
if (is_hex_string(info->pattern, info->patlen)) {
- printf("STRING match %s", (info->invert) ? "!" : "");
+ printf("STRING match %s", (info->u.v0.invert) ? "!" : "");
print_hex_string(info->pattern, info->patlen);
} else {
- printf("STRING match %s", (info->invert) ? "!" : "");
+ printf("STRING match %s", (info->u.v0.invert) ? "!" : "");
print_string(info->pattern, info->patlen);
}
printf("ALGO name %s ", info->algo);
@@ -311,10 +311,10 @@
(const struct xt_string_info*) match->data;
if (is_hex_string(info->pattern, info->patlen)) {
- printf("--hex-string %s", (info->invert) ? "! ": "");
+ printf("--hex-string %s", (info->u.v0.invert) ? "! ": "");
print_hex_string(info->pattern, info->patlen);
} else {
- printf("--string %s", (info->invert) ? "! ": "");
+ printf("--string %s", (info->u.v0.invert) ? "! ": "");
print_string(info->pattern, info->patlen);
}
printf("--algo %s ", info->algo);
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
