From: Harald Welte Subject: [PATCH] netfilter 2.5 cosmetic changes Date: Tue, 24 Jun 2003 17:00:57 +0200 Sender: netfilter-devel-admin@lists.netfilter.org Message-ID: <20030624150057.GL2645@sunbeam.de.gnumonks.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ai3I8gwHc37+ASRI" Cc: Netfilter Development Mailinglist Return-path: To: David Miller Content-Disposition: inline Errors-To: netfilter-devel-admin@lists.netfilter.org List-Help: List-Post: List-Subscribe: , List-Unsubscribe: , List-Archive: List-Id: netfilter-devel.vger.kernel.org --ai3I8gwHc37+ASRI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Dave! This is the 2.5.x merge of the cosmetic changes --- linux-2.5.73-nf_fixes/include/linux/netfilter.h 2003-06-22 20:32:46.000= 000000 +0200 +++ linux-2.5.73-cosmetic/include/linux/netfilter.h 2003-06-24 17:05:04.000= 000000 +0200 @@ -19,9 +19,10 @@ #define NF_REPEAT 4 #define NF_MAX_VERDICT NF_REPEAT =20 -/* Generic cache responses from hook functions. */ -#define NFC_ALTERED 0x8000 +/* Generic cache responses from hook functions. + <=3D 0x2000 is used for protocol-flags. */ #define NFC_UNKNOWN 0x4000 +#define NFC_ALTERED 0x8000 =20 #ifdef __KERNEL__ #include diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ip_conntrack_core.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_connt= rack_core.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ip_conntrack_core.c 2003-06-24= 16:58:24.000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_conntrack_core.c 2003-06-24= 17:05:04.000000000 +0200 @@ -258,9 +258,7 @@ =20 DEBUGP("remove_expectations(%p)\n", ct); =20 - for (exp_entry =3D ct->sibling_list.next; - exp_entry !=3D &ct->sibling_list; exp_entry =3D next) { - next =3D exp_entry->next; + list_for_each_safe(exp_entry, next, &ct->sibling_list) { exp =3D list_entry(exp_entry, struct ip_conntrack_expect, expected_list); =20 @@ -307,7 +305,7 @@ IP_NF_ASSERT(atomic_read(&nfct->use) =3D=3D 0); IP_NF_ASSERT(!timer_pending(&ct->timeout)); =20 - if (ct->master && master_ct(ct)) + if (master_ct(ct)) ip_conntrack_put(master_ct(ct)); =20 /* To make sure we don't get any weird locking issues here: @@ -675,9 +673,6 @@ =20 INIT_LIST_HEAD(&conntrack->sibling_list); =20 - /* Mark clearly that it's not in the hash table. */ - conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list.next =3D NULL; - WRITE_LOCK(&ip_conntrack_lock); /* Need finding and deleting of expected ONLY if we win race */ READ_LOCK(&ip_conntrack_expect_tuple_lock); @@ -1015,18 +1010,11 @@ return -ENOMEM; } =09 - /* Zero out the new structure, then fill out it with the data */ DEBUGP("new expectation %p of conntrack %p\n", new, related_to); - memset(new, 0, sizeof(*expect)); - INIT_LIST_HEAD(&new->list); - INIT_LIST_HEAD(&new->expected_list); memcpy(new, expect, sizeof(*expect)); new->expectant =3D related_to; new->sibling =3D NULL; - /* increase usage count. This sucks. The memset above overwrites - * old usage count [if still present] and we increase to one. Only - * works because everything is done under ip_conntrack_lock() */ - atomic_inc(&new->use); + atomic_set(&new->use, 1); =09 /* add to expected list for this connection */=09 list_add(&new->expected_list, &related_to->sibling_list); @@ -1476,8 +1464,10 @@ ip_ct_attach =3D ip_conntrack_attach; return ret; =20 +#ifdef CONFIG_SYSCTL err_free_ct_cachep: kmem_cache_destroy(ip_conntrack_cachep); +#endif /*CONFIG_SYSCTL*/ err_free_hash: vfree(ip_conntrack_hash); err_unreg_sockopt: diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ip_conntrack_ftp.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_conntr= ack_ftp.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-06-24 = 16:49:56.000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-06-24 = 17:05:04.000000000 +0200 @@ -406,7 +406,6 @@ ports[0] =3D FTP_PORT; =20 for (i =3D 0; (i < MAX_PORTS) && ports[i]; i++) { - memset(&ftp[i], 0, sizeof(struct ip_conntrack_helper)); ftp[i].tuple.src.u.tcp.port =3D htons(ports[i]); ftp[i].tuple.dst.protonum =3D IPPROTO_TCP; ftp[i].mask.src.u.tcp.port =3D 0xFFFF; diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ip_conntrack_irc.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_conntr= ack_irc.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ip_conntrack_irc.c 2003-06-24 = 16:49:56.000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_conntrack_irc.c 2003-06-24 = 17:05:04.000000000 +0200 @@ -243,8 +243,6 @@ =20 for (i =3D 0; (i < MAX_PORTS) && ports[i]; i++) { hlpr =3D &irc_helpers[i]; - memset(hlpr, 0, - sizeof(struct ip_conntrack_helper)); hlpr->tuple.src.u.tcp.port =3D htons(ports[i]); hlpr->tuple.dst.protonum =3D IPPROTO_TCP; hlpr->mask.src.u.tcp.port =3D 0xFFFF; diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ip_nat_ftp.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_nat_ftp.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ip_nat_ftp.c 2003-06-24 16:51:= 42.000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_nat_ftp.c 2003-06-24 17:05:= 04.000000000 +0200 @@ -306,9 +306,6 @@ ports[0] =3D FTP_PORT; =20 for (i =3D 0; (i < MAX_PORTS) && ports[i]; i++) { - - memset(&ftp[i], 0, sizeof(struct ip_nat_helper)); - ftp[i].tuple.dst.protonum =3D IPPROTO_TCP; ftp[i].tuple.src.u.tcp.port =3D htons(ports[i]); ftp[i].mask.dst.protonum =3D 0xFFFF; diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ip_nat_irc.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_nat_irc.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ip_nat_irc.c 2003-06-22 20:33:= 35.000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ip_nat_irc.c 2003-06-24 17:05:= 04.000000000 +0200 @@ -243,9 +243,6 @@ =20 for (i =3D 0; (i < MAX_PORTS) && ports[i] !=3D 0; i++) { hlpr =3D &ip_nat_irc_helpers[i]; - memset(hlpr, 0, - sizeof(struct ip_nat_helper)); - hlpr->tuple.dst.protonum =3D IPPROTO_TCP; hlpr->tuple.src.u.tcp.port =3D htons(ports[i]); hlpr->mask.src.u.tcp.port =3D 0xFFFF; diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.v= er' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.= cmd' --exclude '*.mod.c' --exclude '*~' linux-2.5.73-nf_fixes/net/ipv4/netf= ilter/ipt_ULOG.c linux-2.5.73-cosmetic/net/ipv4/netfilter/ipt_ULOG.c --- linux-2.5.73-nf_fixes/net/ipv4/netfilter/ipt_ULOG.c 2003-06-22 20:32:41= =2E000000000 +0200 +++ linux-2.5.73-cosmetic/net/ipv4/netfilter/ipt_ULOG.c 2003-06-24 17:05:04= =2E000000000 +0200 @@ -325,7 +325,6 @@ =20 /* initialize ulog_buffers */ for (i =3D 0; i < ULOG_MAXNLGROUPS; i++) { - memset(&ulog_buffers[i], 0, sizeof(ulog_buff_t)); init_timer(&ulog_buffers[i].timer); ulog_buffers[i].timer.function =3D ulog_timer; ulog_buffers[i].timer.data =3D i; Please apply, thanks. --=20 - Harald Welte http://www.netfilter.org/ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D "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 --ai3I8gwHc37+ASRI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE++GepXaXGVTD0i/8RAst7AKCD8LRZJ4ptJxKQykQlcy2d/fUdtQCePcWN besK9QpV34vrIC2Z0PRCb+s= =Y8vY -----END PGP SIGNATURE----- --ai3I8gwHc37+ASRI--