(no subject)
jamal
hadi@cyberus.ca
Mon, 11 Feb 2002 09:08:14 -0500 (EST)
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
---559023410-684387517-1013436494=:5946
Content-Type: TEXT/PLAIN; charset=US-ASCII
Dave,
Dont apply the ingress patch yet; I wanted Doron to comment
(we had a long discussion but i cant find my archives on the subject).
Doron, does this cover all grounds we discussed at the time?
cheers,
jamal
On Mon, 11 Feb 2002, Harald Welte wrote:
> On Sat, Feb 09, 2002 at 08:10:01AM -0500, Jamal Hadi Selim wrote:
>
> Hi Jamal & Dave.
>
> > Dave,
> > If Harald would propose something for nf_register_hook() then
> > the ifdef MODULE would dissapear as well.
>
> I do agree with jamal's original posting - we should return an error in
> case somebody tries to register the same thing a second time.
>
> However, the additional checks about the valid range of hook numbers
> introduced ipv4 specific code assumed that IPv4 is the only protocol
> having netfilter hooks - which is an invalid assumption.
>
> I've reduced his patch to just the "don't register twice" part:
>
> --- linuxppc-190102-plain/net/core/netfilter.c Thu Jan 17 21:44:29 2002
> +++ linuxppc-190102-nfpom/net/core/netfilter.c Mon Feb 11 12:14:12 2002
> @@ -61,6 +61,15 @@
> for (i = nf_hooks[reg->pf][reg->hooknum].next;
> i != &nf_hooks[reg->pf][reg->hooknum];
> i = i->next) {
> + /* assumption: If exact same thing already on the list
> + * we dont want to add a new one
> + */
> + if ((reg->priority == ((struct nf_hook_ops *)i)->priority)
> + && (reg->hook == (((struct nf_hook_ops *)i)->hook))) {
> + br_write_unlock_bh(BR_NETPROTO_LOCK);
> + return -1;
> + }
> +
> if (reg->priority < ((struct nf_hook_ops *)i)->priority)
> break;
> }
>
>
> Please apply.
>
> > cheers,
> > jamal
>
> --
> Live long and prosper
> - Harald Welte / laforge@gnumonks.org http://www.gnumonks.org/
> ============================================================================
> GCS/E/IT d- s-: a-- C+++ UL++++$ P+++ L++++$ E--- W- N++ o? K- w--- O- M+
> V-- PS++ PE-- Y++ PGP++ t+ 5-- !X !R tv-- b+++ !DI !D G+ e* h--- r++ y+(*)
>
---559023410-684387517-1013436494=:5946
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="patch.ing"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.GSO.4.30.0202110908140.5946@shell.cyberus.ca>
Content-Description:
Content-Disposition: attachment; filename="patch.ing"
LS0tIHNjaF9pbmdyZXNzLmMJMjAwMi8wMi8xMSAxMjo1MDoyNwkxLjENCisr
KyBzY2hfaW5ncmVzcy5jCTIwMDIvMDIvMTEgMTM6NTA6NDgNCkBAIC00Myw2
ICs0MywxMyBAQA0KICNkZWZpbmUgUFJJVihzY2gpICgoc3RydWN0IGluZ3Jl
c3NfcWRpc2NfZGF0YSAqKSAoc2NoKS0+ZGF0YSkNCiANCiANCisvKiBwcm9i
bGVtIGlzIGNhbiBvbmx5IGhhdmUgb25lIG5ldGZpbHRlciBpbnN0YW5jZSBi
dXQgDQorICogbXVsdGlwbGUgaW5ncmVzcyBxZGlzYyAob25lIHBlciBkZXYp
DQorICogSWYgd2UgY291bGQgdXNlIHRoZSBNT0RfSU5DL0RFQyB3ZSB3b250
IG5lZWQgdGhpcw0KKyAqIFRoYW5rcyB0byBEb3JvbiBPeiBmb3IgdGhpcyBo
YWNrDQorICovDQorc3RhdGljIGludCBuZl9yZWdpc3RlcmVkID0gMDsgDQor
DQogDQogc3RydWN0IGluZ3Jlc3NfcWRpc2NfZGF0YSB7DQogCXN0cnVjdCBR
ZGlzYwkJKnE7DQpAQCAtMjQwLDE4ICsyNDcsMTcgQEANCiAJbWVtc2V0KHAs
IDAsIHNpemVvZigqcCkpOw0KIAlwLT5maWx0ZXJfbGlzdCA9IE5VTEw7DQog
CXAtPnEgPSAmbm9vcF9xZGlzYzsNCi0jaWZuZGVmIE1PRFVMRQ0KLQlpZiAo
bmZfcmVnaXN0ZXJfaG9vaygmaW5nX29wcykgPCAwKSB7DQotCQlwcmludGso
IlVuYWJsZSB0byByZWdpc3RlciBpbmdyZXNzIFxuIik7DQotCQlnb3RvIGVy
cm9yOw0KKwlpZiAoIW5mX3JlZ2lzdGVyZWQpIHsNCisJCWlmIChuZl9yZWdp
c3Rlcl9ob29rKCZpbmdfb3BzKSA8IDApIHsNCisJCQlwcmludGsoImluZ3Jl
c3MgcWRpc2MgcmVnaXN0cmF0aW9uIGVycm9yIFxuIik7DQorCQkJZ290byBl
cnJvcjsNCisJCX0NCisJCW5mX3JlZ2lzdGVyZWQgPSAxOw0KIAl9DQotI2Vu
ZGlmDQogCURQUklOVEsoImluZ3Jlc3NfaW5pdDogcWRpc2MgJXBcbiIsIHNj
aCk7DQogCU1PRF9JTkNfVVNFX0NPVU5UOw0KIAlyZXR1cm4gMDsNCi0jaWZu
ZGVmIE1PRFVMRQ0KIGVycm9yOg0KLSNlbmRpZg0KIAlyZXR1cm4gLUVJTlZB
TDsNCiB9DQogDQpAQCAtMjk2LDkgKzMwMiw2IEBADQogCXFkaXNjX2Rlc3Ry
b3kocC0+cSk7DQogI2VuZGlmDQogDQotI2lmbmRlZiBNT0RVTEUNCi0JbmZf
dW5yZWdpc3Rlcl9ob29rKCZpbmdfb3BzKTsNCi0jZW5kaWYNCiANCiAJTU9E
X0RFQ19VU0VfQ09VTlQ7DQogfQ0K
---559023410-684387517-1013436494=:5946
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="ing.patch2"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.GSO.4.30.0202110908141.5946@shell.cyberus.ca>
Content-Description:
Content-Disposition: attachment; filename="ing.patch2"
LS0tIHNjaF9pbmdyZXNzLmMJMjAwMi8wMi8xMSAxMjo1MDoyNwkxLjENCisr
KyBzY2hfaW5ncmVzcy5jCTIwMDIvMDIvMTEgMTQ6MDM6MjcNCkBAIC0yNDAs
MTkgKzI0MCwxMiBAQA0KIAltZW1zZXQocCwgMCwgc2l6ZW9mKCpwKSk7DQog
CXAtPmZpbHRlcl9saXN0ID0gTlVMTDsNCiAJcC0+cSA9ICZub29wX3FkaXNj
Ow0KLSNpZm5kZWYgTU9EVUxFDQogCWlmIChuZl9yZWdpc3Rlcl9ob29rKCZp
bmdfb3BzKSA8IDApIHsNCi0JCXByaW50aygiVW5hYmxlIHRvIHJlZ2lzdGVy
IGluZ3Jlc3MgXG4iKTsNCi0JCWdvdG8gZXJyb3I7DQorCQlEUFJJTlRLKCJp
bmdyZXNzIHFkaXNjIHJlZ2lzdHJhdGlvbiBkb25lIGFscmVhZHlcbiIpOw0K
IAl9DQotI2VuZGlmDQogCURQUklOVEsoImluZ3Jlc3NfaW5pdDogcWRpc2Mg
JXBcbiIsIHNjaCk7DQogCU1PRF9JTkNfVVNFX0NPVU5UOw0KIAlyZXR1cm4g
MDsNCi0jaWZuZGVmIE1PRFVMRQ0KLWVycm9yOg0KLSNlbmRpZg0KLQlyZXR1
cm4gLUVJTlZBTDsNCiB9DQogDQogDQpAQCAtMjk2LDkgKzI4OSw2IEBADQog
CXFkaXNjX2Rlc3Ryb3kocC0+cSk7DQogI2VuZGlmDQogDQotI2lmbmRlZiBN
T0RVTEUNCi0JbmZfdW5yZWdpc3Rlcl9ob29rKCZpbmdfb3BzKTsNCi0jZW5k
aWYNCiANCiAJTU9EX0RFQ19VU0VfQ09VTlQ7DQogfQ0K
---559023410-684387517-1013436494=:5946--