Re: [PATCH]: several small patches

[Harald Welte <laforge@netfilter.org>]

[-- Attachment #1: Type: text/plain, Size: 2248 bytes --]

On Sun, Jun 15, 2003 at 08:50:25PM +0200, Patrick McHardy wrote:
> Hi Harald,
> these are some patches that summed up, mostly one liners.

Thanks.

> 1. ip_conntrack-outdated-comment.diff:
> remove outdated comment in ip_conntrack_expect_related
> that seems to have it's origin in time before newnat. it also
> makes the initialization of new->use explicit.

fine with me.

> 2. ip-conntrack-unneeded-check.diff:
> remove double-check for ct->master, master_ct() also does the
> check.

ack.

> 3. ip-conntrack-unconfirmed-expect.diff:
> in init_conntrack: do not delete timer/call expect function for
> connections matching expectations from unconfirmed connections.

Again, correct.

> 4. unneeded-init.diff:
> this is an old patch which removes some memset(x,0,..) for
> data in bss segment. some more unneeded initializations since
> last post:
> 
> - conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list.next = NULL
> in init_conntrack() seems to be forgotten when IPS_CONFIRMED
> was introduced.

true.

> - memset and INIT_LIST_HEAD in ip_conntrack_expect_related()
> are not required, memory is overwritten in the next line anyway
> and list-member heads don't need to be initialized.

ok, that was my mistake... I somehow didn't notice the fact that only
the master list head needs to be initialized.  But this is, obviously,
correct.

> 5. ip-conntrack-expect-drop-refcnt.diff:
> drop master conntrack refcnt before setting expectant = NULL in
> remove_expectations. untested but seems to make sense.

There have been recent changes in this part of code...

Jozsef: Any objections?

 
> 6. ip-conntrack-remove_expectations-list_for_each_safe.diff:
> use list_for_each_safe in remove_expectations

ok, a cosmetic correction.

I'll put 1-4 and 6 into patch-o-matic, 5 is Jozsef's call.

> Best regards,
> Patrick
-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]