From b7659fdc744dc520a66404bde0a6deb3acfa63e7 Mon Sep 17 00:00:00 2001
From: Jaap Keuter <jaap.keuter@xs4all.nl>
Date: Thu, 6 May 2010 18:41:23 +0000
Subject: [PATCH] Follow up for revision 32670. Straighten out is_acn()
 function.

svn path=/trunk/; revision=32690
---
 epan/dissectors/packet-acn.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 1699a1b645..383a44eefa 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -49,7 +49,6 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/ipv6-utils.h>
-#include <string.h>
 
 #include "packet-acn.h"
 
@@ -327,19 +326,13 @@ static const enum_val_t dmx_display_line_format[] = {
 static gboolean is_acn(tvbuff_t *tvb)
 {
   static char acn_packet_id[] = "ASC-E1.17\0\0\0";  /* must be 12 bytes */
-  guint8      *packet_id;
 
   if (tvb_length(tvb) < (4+sizeof(acn_packet_id)))
     return FALSE;
 
   /* Check the bytes in octets 4 - 16 */
-  if (tvb_memeql(tvb, 4, acn_packet_id, sizeof(acn_packet_id)) != 0){
-    packet_id = tvb_get_ephemeral_string(tvb, 4, 12);
-    if (memcmp(packet_id, &acn_packet_id, 12) == 0) {
-      return TRUE;
-    }
+  if (tvb_memeql(tvb, 4, acn_packet_id, sizeof(acn_packet_id)-1) != 0)
     return FALSE;
-  }
 
   return TRUE;
 }