[PATCHES] fix ICMP logging and logging of non tcp,udp, icmp proto

[Martin Josefsson]

Hi,

Attached are two patches, the first one fixes the problem with ICMP
logging. And the second one adds PROTO=<number> for non tcp, udp or icmp
protocols, just like ipt_LOG does.

-- 
/Martin

Never argue with an idiot. They drag you down to their level, then beat
you with experience.

--- ulog/ulogd/extensions/ulogd_BASE.c.orig     Sat Apr 27 19:59:14 2002
+++ ulog/ulogd/extensions/ulogd_BASE.c  Sat Apr 27 19:59:49 2002
@@ -309,7 +309,7 @@
                                ulog_packet_msg_t *pkt)
 {
        struct iphdr *iph = (struct iphdr *) pkt->payload;
-       void *protoh = (u_int32_t *) (iph + iph->ihl);
+       void *protoh = (u_int32_t *)iph + iph->ihl;
        struct icmphdr *icmph = protoh;
        ulog_iret_t *ret = ip->result;
 

--- ulog/ulogd/extensions/ulogd_LOGEMU.c.orig   Sat Apr 27 19:26:45 2002
+++ ulog/ulogd/extensions/ulogd_LOGEMU.c        Sat Apr 27 19:49:07 2002
@@ -231,6 +231,9 @@
                                        break;
                        }
                        break;
+               default:
+
+                       fprintf(of, "PROTO=%u ", GET_VALUE(11).ui8);
        }
        fprintf(of,"\n");