aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-12-08 21:36:53 +0000
committerGuy Harris <guy@alum.mit.edu>2003-12-08 21:36:53 +0000
commitd06dc0727a5a4d8e952a96ea275190a8298d725b (patch)
treebabff8fb96181ceae0b8420269ce69214cada67a /epan
parent556c517b888e371846034e69df336ea79d6fe655 (diff)
From Michael Lum: support an AT_SS7PC address type for SS7 point codes,
and set the direction in pinfo for SS7 packets based on source and destination addresses. svn path=/trunk/; revision=9209
Diffstat (limited to 'epan')
-rw-r--r--epan/packet_info.h5
-rw-r--r--epan/to_str.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/epan/packet_info.h b/epan/packet_info.h
index c672d3a65f..4bfdf6899d 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -1,7 +1,7 @@
/* packet_info.h
* Definitions for packet info structures and routines
*
- * $Id: packet_info.h,v 1.35 2003/11/21 21:58:55 guy Exp $
+ * $Id: packet_info.h,v 1.36 2003/12/08 21:36:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,8 @@ typedef enum {
AT_VINES, /* Banyan Vines */
AT_OSI, /* OSI NSAP */
AT_ARCNET, /* ARCNET */
- AT_FC /* Fibre Channel */
+ AT_FC, /* Fibre Channel */
+ AT_SS7PC /* SS7 Point Code */
} address_type;
typedef struct _address {
diff --git a/epan/to_str.c b/epan/to_str.c
index 0d0706c931..3ac1925b95 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1,7 +1,7 @@
/* to_str.c
* Routines for utilities to convert various other types to strings.
*
- * $Id: to_str.c,v 1.39 2003/11/17 22:56:45 sahlberg Exp $
+ * $Id: to_str.c,v 1.40 2003/12/08 21:36:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -63,6 +63,7 @@
#include "atalk-utils.h"
#include "sna-utils.h"
#include "osi-utils.h"
+#include "packet-mtp3.h"
#include <stdio.h>
#include <time.h>
@@ -844,6 +845,9 @@ address_to_str_buf(address *addr, gchar *buf)
case AT_FC:
sprintf(buf, "%02x.%02x.%02x", addr->data[0], addr->data[1], addr->data[2]);
break;
+ case AT_SS7PC:
+ mtp3_addr_to_str_buf(addr->data, buf);
+ break;
default:
g_assert_not_reached();
}