Unified2rev2

Signed-off-by: Breno Silva <breno.silva@gmail.com>

src/alert-unified2-alert.c

@@ -364,20 +364,24 @@ int Unified2IPv6TypeAlert (ThreadVars *t, Packet *p, void *data, PacketQueue *pq
     else
         phdr.packet_action = 0;
 
-    if ((phdr.protocol == IPPROTO_ICMP) && p->icmpv4h)
+    switch(phdr.protocol)  {
-    {
+        case IPPROTO_ICMP:
-        phdr.sp = htons(p->icmpv4h->type);
+            if(p->icmpv4h)  {
-        phdr.dp = htons(p->icmpv4h->code);
+                phdr.sp = htons(p->icmpv4h->type);
-    }
+                phdr.dp = htons(p->icmpv4h->code);
-    else if (phdr.protocol != IPPROTO_RAW)
+            }
-    {
+            break;
-        phdr.sp = htons(p->sp);
+        case IPPROTO_UDP:
-        phdr.dp = htons(p->dp);
+        case IPPROTO_TCP:
-    }
+        case IPPROTO_SCTP:
-    else    {
+            phdr.sp = htons(p->sp);
-        phdr.sp = 0;
+            phdr.dp = htons(p->dp);
-        phdr.dp = 0;
+            break;
-    }
+        default:
+            phdr.sp = 0;
+            phdr.dp = 0;
+            break;
+     }
 
     memcpy(write_buffer+sizeof(Unified2AlertFileHeader),&phdr,sizeof(AlertIPv6Unified2));
 
@@ -466,21 +470,24 @@ int Unified2IPv4TypeAlert (ThreadVars *tv, Packet *p, void *data, PacketQueue *p
     else
         phdr.packet_action = 0;
 
-
+    switch(phdr.protocol)  {
-    if ((phdr.protocol == IPPROTO_ICMP) && p->icmpv4h)
+        case IPPROTO_ICMP:
-    {
+            if(p->icmpv4h)  {
-        phdr.sp = htons(p->icmpv4h->type);
+                phdr.sp = htons(p->icmpv4h->type);
-        phdr.dp = htons(p->icmpv4h->code);
+                phdr.dp = htons(p->icmpv4h->code);
-    }
+            }
-    else if (phdr.protocol != IPPROTO_RAW)
+            break;
-    {
+        case IPPROTO_UDP:
-        phdr.sp = htons(p->sp);
+        case IPPROTO_TCP:
-        phdr.dp = htons(p->dp);
+        case IPPROTO_SCTP:
-    }
+            phdr.sp = htons(p->sp);
-    else    {
+            phdr.dp = htons(p->dp);
-        phdr.sp = 0;
+            break;
-        phdr.dp = 0;
+        default:
-    }
+            phdr.sp = 0;
+            phdr.dp = 0;
+            break;
+     }
 
     memcpy(write_buffer+sizeof(Unified2AlertFileHeader),&phdr,sizeof(AlertIPv4Unified2));