diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
| commit | 48056fa49608bedc4c076181478485569fec7d5f (patch) | |
| tree | 3d60586d43ec504d7018af00ba7cf1d895e3f099 /extensions | |
| parent | 4decf5460114e222532147ccc97fbec05bc5cccb (diff) | |
| parent | 5bbd235a4a30b26f477b73b2779619a5f20ad73b (diff) | |
| download | conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.tar.gz conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.zip | |
Merge branch 'pacifica' into oxnard
Conflicts:
.frlog
debian/changelog
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/libct_proto_icmp.c | 4 | ||||
| -rw-r--r-- | extensions/libct_proto_icmpv6.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c index 3a346ed..d04397f 100644 --- a/extensions/libct_proto_icmp.c +++ b/extensions/libct_proto_icmp.c @@ -43,8 +43,8 @@ static char icmp_commands_v_options[NUMBER_OF_CMD][ICMP_NUMBER_OF_OPT] = /* 1 2 3 */ /*CT_LIST*/ {2,2,2}, /*CT_CREATE*/ {1,1,2}, -/*CT_UPDATE*/ {1,1,2}, -/*CT_DELETE*/ {1,1,2}, +/*CT_UPDATE*/ {2,2,2}, +/*CT_DELETE*/ {2,2,2}, /*CT_GET*/ {1,1,2}, /*CT_FLUSH*/ {0,0,0}, /*CT_EVENT*/ {2,2,2}, diff --git a/extensions/libct_proto_icmpv6.c b/extensions/libct_proto_icmpv6.c index 070eb7f..f8c2c68 100644 --- a/extensions/libct_proto_icmpv6.c +++ b/extensions/libct_proto_icmpv6.c @@ -46,8 +46,8 @@ static char icmpv6_commands_v_options[NUMBER_OF_CMD][ICMPV6_NUMBER_OF_OPT] = /* 1 2 3 */ /*CT_LIST*/ {2,2,2}, /*CT_CREATE*/ {1,1,2}, -/*CT_UPDATE*/ {1,1,2}, -/*CT_DELETE*/ {1,1,2}, +/*CT_UPDATE*/ {2,2,2}, +/*CT_DELETE*/ {2,2,2}, /*CT_GET*/ {1,1,2}, /*CT_FLUSH*/ {0,0,0}, /*CT_EVENT*/ {2,2,2}, |