packages: kernel/kernel-ipt_account.patch, kernel/kernel-pom-ng-mms-conntra...

[arekm]

Author: arekm                        Date: Mon Jul 20 21:48:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/kernel:
   kernel-ipt_account.patch (1.2 -> 1.3) , kernel-pom-ng-mms-conntrack-nat.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-ipt_account.patch
diff -u packages/kernel/kernel-ipt_account.patch:1.2 packages/kernel/kernel-ipt_account.patch:1.3
--- packages/kernel/kernel-ipt_account.patch:1.2	Tue Mar 31 14:04:26 2009
+++ packages/kernel/kernel-ipt_account.patch	Mon Jul 20 23:48:07 2009
@@ -393,9 +393,9 @@
 +    /* Yes, account this packet. */
 +#ifdef DEBUG_IPT_ACCOUNT  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)  
-+    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet src = %u.%u.%u.%u, proto = %u.\n", HIPQUAD(address), ip_hdr(skb)->protocol);
++    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet src = %pI4, proto = %u.\n", &address, ip_hdr(skb)->protocol);
 +#else
-+    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet src = %u.%u.%u.%u, proto = %u.\n", HIPQUAD(address), skb->nh.iph->protocol);
++    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet src = %pI4, proto = %u.\n", &address, skb->nh.iph->protocol);
 +#endif  
 +#endif  
 +    /* Update counters this host. */
@@ -432,9 +432,9 @@
 +    write_lock_bh(&table->stats_lock);
 +#ifdef DEBUG_IPT_ACCOUNT 
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)  
-+    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet dst = %u.%u.%u.%u, proto = %u.\n", HIPQUAD(address), ip_hdr(skb)->protocol);
++    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet dst = %pI4, proto = %u.\n", &address, ip_hdr(skb)->protocol);
 +#else    
-+    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet dst = %u.%u.%u.%u, proto = %u.\n", HIPQUAD(address), skb->nh.iph->protocol);
++    if (debug) printk(KERN_DEBUG "ipt_account: [match]: accounting packet dst = %pI4, proto = %u.\n", &address, skb->nh.iph->protocol);
 +#endif  
 +#endif    
 +    if (!table->shortlisting) {
@@ -705,8 +705,8 @@
 +      return 0;
 +    }
 +    seq_printf(sf,
-+        "ip = %u.%u.%u.%u bytes_src = %llu %llu %llu %llu %llu packets_src = %llu %llu %llu %llu %llu bytes_dst = %llu %llu %llu %llu %llu packets_dst = %llu %llu %llu %llu %llu time = %lu\n",
-+        HIPQUAD(address),
++        "ip = %pI4 bytes_src = %llu %llu %llu %llu %llu packets_src = %llu %llu %llu %llu %llu bytes_dst = %llu %llu %llu %llu %llu packets_dst = %llu %llu %llu %llu %llu time = %lu\n",
++        &address,
 +        l->src.b_all,
 +        l->src.b_tcp,
 +        l->src.b_udp,
@@ -743,8 +743,8 @@
 +      return 0;
 +    }
 +    seq_printf(sf,
-+        "ip = %u.%u.%u.%u bytes_src = %llu packets_src = %llu bytes_dst = %llu packets_dst = %llu time = %lu\n",
-+        HIPQUAD(address),
++        "ip = %pI4 bytes_src = %llu packets_src = %llu bytes_dst = %llu packets_dst = %llu time = %lu\n",
++        &address,
 +        s->src.b_all,
 +        s->src.p_all,
 +        s->dst.b_all,

================================================================
Index: packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch
diff -u packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.2 packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.3
--- packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.2	Tue Mar 31 14:04:31 2009
+++ packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch	Mon Jul 20 23:48:07 2009
@@ -504,7 +504,7 @@
 +	/* IP address ? */
 +	*mms_ip = asciiiptoi(tempstring+2);
 +
-+	i=sprintf(getlengthstring, "%u.%u.%u.%u", HIPQUAD(*mms_ip));
++	i=sprintf(getlengthstring, "%pI4", mms_ip);
 +
 +	/* protocol ? */
 +	if(strncmp(tempstring+3+i, "TCP", 3)==0)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-ipt_account.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch?r1=1.2&r2=1.3&f=u