osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

For each column, have both a buffer into which strings for that column 

can be put, and a pointer to the string for the column, which might or
might not point to that buffer.

Add a routine "col_set_str()", which sets the string for the column to
the string passed to it as an argument; it should only be handed a
static string (a string constant would be ideal).  It doesn't do any
copying, so it's faster than "col_add_str()".

Make the routines that append to columns check whether the pointer to
the string for the column points to the buffer for the column and, if
not, copy the string for the column to the buffer for the column so that
you can append to it (so you can use "col_set_str()" and then use
"col_append_str()" or "col_append_fstr()").

Convert a bunch of "col_add_str()" calls that take a string constant as
an argument to "col_set_str()" calls.

Convert some "col_add_fstr()" calls that take a string constant as the
only argument - i.e., the format string doesn't have any "%" slots into
which to put strings for subsequent arguments to "col_set_str()" calls
(those calls are just like "col_add_str()" calls).

Replace an END_OF_FRAME reference in a tvbuffified dissector with a
"tvb_length(tvb)" call.

svn path=/trunk/; revision=2670
This commit is contained in:
Guy Harris 2000-11-19 08:54:37 +00:00
parent e88bd04f9a
commit 252d55d80f
125 changed files with 495 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
epan/packet.c
View File

@ -1,7 +1,7 @@
/* packet.c /* packet.c
* Routines for packet disassembly * Routines for packet disassembly
* *
* $Id: packet.c,v 1.6 2000/11/18 11:47:21 guy Exp $ * $Id: packet.c,v 1.7 2000/11/19 08:54:34 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -530,6 +530,18 @@ check_col(frame_data *fd, gint el) {
return FALSE; return FALSE;
} }
/* Use this if "str" points to something that will stay around (and thus
needn't be copied). */
void
col_set_str(frame_data *fd, gint el, gchar* str) {
int i;
for (i = 0; i < fd->cinfo->num_cols; i++) {
if (fd->cinfo->fmt_matx[i][el])
fd->cinfo->col_data[i] = str;
}
}
/* Adds a vararg list to a packet info string. */ /* Adds a vararg list to a packet info string. */
void void
col_add_fstr(frame_data *fd, gint el, gchar *format, ...) { col_add_fstr(frame_data *fd, gint el, gchar *format, ...) {
@ -545,11 +557,14 @@ col_add_fstr(frame_data *fd, gint el, gchar *format, ...) {
va_start(ap, format); va_start(ap, format);
for (i = 0; i < fd->cinfo->num_cols; i++) { for (i = 0; i < fd->cinfo->num_cols; i++) {
if (fd->cinfo->fmt_matx[i][el]) { if (fd->cinfo->fmt_matx[i][el]) {
vsnprintf(fd->cinfo->col_data[i], max_len, format, ap); vsnprintf(fd->cinfo->col_buf[i], max_len, format, ap);
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
} }
} }
} }
/* Use this if "str" points to something that won't stay around (and
must thus be copied). */
void void
col_add_str(frame_data *fd, gint el, const gchar* str) { col_add_str(frame_data *fd, gint el, const gchar* str) {
int i; int i;
@ -562,8 +577,9 @@ col_add_str(frame_data *fd, gint el, const gchar* str) {
for (i = 0; i < fd->cinfo->num_cols; i++) { for (i = 0; i < fd->cinfo->num_cols; i++) {
if (fd->cinfo->fmt_matx[i][el]) { if (fd->cinfo->fmt_matx[i][el]) {
strncpy(fd->cinfo->col_data[i], str, max_len); strncpy(fd->cinfo->col_buf[i], str, max_len);
fd->cinfo->col_data[i][max_len - 1] = 0; fd->cinfo->col_buf[i][max_len - 1] = 0;
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
} }
} }
} }
@ -583,8 +599,15 @@ col_append_fstr(frame_data *fd, gint el, gchar *format, ...) {
va_start(ap, format); va_start(ap, format);
for (i = 0; i < fd->cinfo->num_cols; i++) { for (i = 0; i < fd->cinfo->num_cols; i++) {
if (fd->cinfo->fmt_matx[i][el]) { if (fd->cinfo->fmt_matx[i][el]) {
len = strlen(fd->cinfo->col_data[i]); if (fd->cinfo->col_data[i] != fd->cinfo->col_buf[i]) {
vsnprintf(&fd->cinfo->col_data[i][len], max_len - len, format, ap); /* This was set with "col_set_str()"; copy the string they
set it to into the buffer, so we can append to it. */
strncpy(fd->cinfo->col_buf[i], fd->cinfo->col_data[i], max_len);
fd->cinfo->col_buf[i][max_len - 1] = '\0';
}
len = strlen(fd->cinfo->col_buf[i]);
vsnprintf(&fd->cinfo->col_buf[i][len], max_len - len, format, ap);
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
} }
} }
} }
@ -601,9 +624,16 @@ col_append_str(frame_data *fd, gint el, gchar* str) {
for (i = 0; i < fd->cinfo->num_cols; i++) { for (i = 0; i < fd->cinfo->num_cols; i++) {
if (fd->cinfo->fmt_matx[i][el]) { if (fd->cinfo->fmt_matx[i][el]) {
len = strlen(fd->cinfo->col_data[i]); if (fd->cinfo->col_data[i] != fd->cinfo->col_buf[i]) {
strncat(fd->cinfo->col_data[i], str, max_len - len); /* This was set with "col_set_str()"; copy the string they
fd->cinfo->col_data[i][max_len - 1] = 0; set it to into the buffer, so we can append to it. */
strncpy(fd->cinfo->col_buf[i], fd->cinfo->col_data[i], max_len);
fd->cinfo->col_buf[i][max_len - 1] = '\0';
}
len = strlen(fd->cinfo->col_buf[i]);
strncat(fd->cinfo->col_buf[i], str, max_len - len);
fd->cinfo->col_buf[i][max_len - 1] = 0;
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
} }
} }
} }
@ -618,11 +648,12 @@ col_set_abs_time(frame_data *fd, int col)
then = fd->abs_secs; then = fd->abs_secs;
tmp = localtime(&then); tmp = localtime(&then);
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%02d:%02d:%02d.%04ld", snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%02d:%02d:%02d.%04ld",
tmp->tm_hour, tmp->tm_hour,
tmp->tm_min, tmp->tm_min,
tmp->tm_sec, tmp->tm_sec,
(long)fd->abs_usecs/100); (long)fd->abs_usecs/100);
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
} }
static void static void
@ -633,7 +664,7 @@ col_set_abs_date_time(frame_data *fd, int col)
then = fd->abs_secs; then = fd->abs_secs;
tmp = localtime(&then); tmp = localtime(&then);
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN,
"%04d-%02d-%02d %02d:%02d:%02d.%04ld", "%04d-%02d-%02d %02d:%02d:%02d.%04ld",
tmp->tm_year + 1900, tmp->tm_year + 1900,
tmp->tm_mon + 1, tmp->tm_mon + 1,
@ -642,20 +673,23 @@ col_set_abs_date_time(frame_data *fd, int col)
tmp->tm_min, tmp->tm_min,
tmp->tm_sec, tmp->tm_sec,
(long)fd->abs_usecs/100); (long)fd->abs_usecs/100);
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
} }
static void static void
col_set_rel_time(frame_data *fd, int col) col_set_rel_time(frame_data *fd, int col)
{ {
display_signed_time(fd->cinfo->col_data[col], COL_MAX_LEN, display_signed_time(fd->cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_secs, fd->rel_usecs); fd->rel_secs, fd->rel_usecs);
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
} }
static void static void
col_set_delta_time(frame_data *fd, int col) col_set_delta_time(frame_data *fd, int col)
{ {
display_signed_time(fd->cinfo->col_data[col], COL_MAX_LEN, display_signed_time(fd->cinfo->col_buf[col], COL_MAX_LEN,
fd->del_secs, fd->del_usecs); fd->del_secs, fd->del_usecs);
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
} }
/* Add "command-line-specified" time. /* Add "command-line-specified" time.
@ -699,67 +733,80 @@ col_set_addr(frame_data *fd, int col, address *addr, gboolean is_res)
case AT_ETHER: case AT_ETHER:
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_ether_name(addr->data), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_ether_name(addr->data), COL_MAX_LEN);
else else
strncpy(fd->cinfo->col_data[col], ether_to_str(addr->data), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], ether_to_str(addr->data), COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_IPv4: case AT_IPv4:
memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr); memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_hostname(ipv4_addr), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_hostname(ipv4_addr), COL_MAX_LEN);
else else
strncpy(fd->cinfo->col_data[col], ip_to_str(addr->data), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], ip_to_str(addr->data), COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_IPv6: case AT_IPv6:
memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr); memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr);
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_hostname6(&ipv6_addr), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_hostname6(&ipv6_addr), COL_MAX_LEN);
else else
strncpy(fd->cinfo->col_data[col], ip6_to_str(&ipv6_addr), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], ip6_to_str(&ipv6_addr), COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_IPX: case AT_IPX:
strncpy(fd->cinfo->col_data[col], strncpy(fd->cinfo->col_buf[col],
ipx_addr_to_str(pntohl(&addr->data[0]), &addr->data[4]), COL_MAX_LEN); ipx_addr_to_str(pntohl(&addr->data[0]), &addr->data[4]), COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_SNA: case AT_SNA:
switch (addr->len) { switch (addr->len) {
case 1: case 1:
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%04X", addr->data[0]); snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%04X", addr->data[0]);
break; break;
case 2: case 2:
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%04X", snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%04X",
pntohs(&addr->data[0])); pntohs(&addr->data[0]));
break; break;
case SNA_FID_TYPE_4_ADDR_LEN: case SNA_FID_TYPE_4_ADDR_LEN:
memcpy(&sna_fid_type_4_addr, addr->data, SNA_FID_TYPE_4_ADDR_LEN); memcpy(&sna_fid_type_4_addr, addr->data, SNA_FID_TYPE_4_ADDR_LEN);
strncpy(fd->cinfo->col_data[col], strncpy(fd->cinfo->col_buf[col],
sna_fid_type_4_addr_to_str(&sna_fid_type_4_addr), COL_MAX_LEN); sna_fid_type_4_addr_to_str(&sna_fid_type_4_addr), COL_MAX_LEN);
break; break;
} }
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_ATALK: case AT_ATALK:
memcpy(&ddp_addr, addr->data, sizeof ddp_addr); memcpy(&ddp_addr, addr->data, sizeof ddp_addr);
strncpy(fd->cinfo->col_data[col], atalk_addr_to_str(&ddp_addr), strncpy(fd->cinfo->col_buf[col], atalk_addr_to_str(&ddp_addr),
COL_MAX_LEN); COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
case AT_VINES: case AT_VINES:
strncpy(fd->cinfo->col_data[col], vines_addr_to_str(&addr->data[0]), strncpy(fd->cinfo->col_buf[col], vines_addr_to_str(&addr->data[0]),
COL_MAX_LEN); COL_MAX_LEN);
fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
break; break;
default: default:
break; break;
} }
fd->cinfo->col_data[col][COL_MAX_LEN - 1] = '\0';
} }
static void static void
@ -770,29 +817,30 @@ col_set_port(frame_data *fd, int col, port_type ptype, guint32 port,
case PT_SCTP: case PT_SCTP:
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_sctp_port(port), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_sctp_port(port), COL_MAX_LEN);
else else
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port);
break; break;
case PT_TCP: case PT_TCP:
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_tcp_port(port), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_tcp_port(port), COL_MAX_LEN);
else else
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port);
break; break;
case PT_UDP: case PT_UDP:
if (is_res) if (is_res)
strncpy(fd->cinfo->col_data[col], get_udp_port(port), COL_MAX_LEN); strncpy(fd->cinfo->col_buf[col], get_udp_port(port), COL_MAX_LEN);
else else
snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port);
break; break;
default: default:
break; break;
} }
fd->cinfo->col_data[col][COL_MAX_LEN - 1] = '\0'; fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
fd->cinfo->col_data[col] = fd->cinfo->col_buf[col];
} }
void void
@ -804,7 +852,8 @@ fill_in_columns(frame_data *fd)
switch (fd->cinfo->col_fmt[i]) { switch (fd->cinfo->col_fmt[i]) {
case COL_NUMBER: case COL_NUMBER:
snprintf(fd->cinfo->col_data[i], COL_MAX_LEN, "%u", fd->num); snprintf(fd->cinfo->col_buf[i], COL_MAX_LEN, "%u", fd->num);
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
break; break;
case COL_CLS_TIME: case COL_CLS_TIME:
@ -904,7 +953,8 @@ fill_in_columns(frame_data *fd)
break; break;
case COL_PACKET_LENGTH: case COL_PACKET_LENGTH:
snprintf(fd->cinfo->col_data[i], COL_MAX_LEN, "%d", fd->pkt_len); snprintf(fd->cinfo->col_buf[i], COL_MAX_LEN, "%d", fd->pkt_len);
fd->cinfo->col_data[i] = fd->cinfo->col_buf[i];
break; break;
case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */ case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */

4
epan/packet.h
View File

@ -1,7 +1,7 @@
/* packet.h /* packet.h
* Definitions for packet disassembly structures and routines * Definitions for packet disassembly structures and routines
* *
* $Id: packet.h,v 1.9 2000/11/18 11:47:21 guy Exp $ * $Id: packet.h,v 1.10 2000/11/19 08:54:35 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -62,6 +62,7 @@ typedef struct _column_info {
gint *col_width; /* Column widths to use during a "-S" capture */ gint *col_width; /* Column widths to use during a "-S" capture */
gchar **col_title; /* Column titles */ gchar **col_title; /* Column titles */
gchar **col_data; /* Column data */ gchar **col_data; /* Column data */
gchar **col_buf; /* Buffer into which to copy data for column */
gboolean writable; /* Are we stil writing to the columns? */ gboolean writable; /* Are we stil writing to the columns? */
} column_info; } column_info;
@ -286,6 +287,7 @@ const char *decode_numeric_bitfield(guint32 val, guint32 mask, int width,
void col_set_writable(frame_data *fd, gboolean writable); void col_set_writable(frame_data *fd, gboolean writable);
gint check_col(frame_data *, gint); gint check_col(frame_data *, gint);
void col_set_str(frame_data *, gint, gchar *);
#if __GNUC__ == 2 #if __GNUC__ == 2
void col_add_fstr(frame_data *, gint, gchar *, ...) void col_add_fstr(frame_data *, gint, gchar *, ...)
__attribute__((format (printf, 3, 4))); __attribute__((format (printf, 3, 4)));

10
file.c
View File

@ -1,7 +1,7 @@
/* file.c /* file.c
* File I/O routines * File I/O routines
* *
* $Id: file.c,v 1.225 2000/10/20 04:26:38 gram Exp $ * $Id: file.c,v 1.226 2000/11/19 08:53:53 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -620,7 +620,8 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
fdata->cinfo = &cf->cinfo; fdata->cinfo = &cf->cinfo;
for (i = 0; i < fdata->cinfo->num_cols; i++) { for (i = 0; i < fdata->cinfo->num_cols; i++) {
fdata->cinfo->col_data[i][0] = '\0'; fdata->cinfo->col_buf[i][0] = '\0';
fdata->cinfo->col_data[i] = fdata->cinfo->col_buf[i];
} }
/* If either /* If either
@ -1172,7 +1173,8 @@ print_packets(capture_file *cf, print_args_t *print_args)
the logical protocol tree. */ the logical protocol tree. */
fdata->cinfo = &cf->cinfo; fdata->cinfo = &cf->cinfo;
for (i = 0; i < fdata->cinfo->num_cols; i++) { for (i = 0; i < fdata->cinfo->num_cols; i++) {
fdata->cinfo->col_data[i][0] = '\0'; fdata->cinfo->col_buf[i][0] = '\0';
fdata->cinfo->col_data[i] = fdata->cinfo->col_buf[i];
} }
edt = epan_dissect_new(&cf->pseudo_header, cf->pd, fdata, NULL); edt = epan_dissect_new(&cf->pseudo_header, cf->pd, fdata, NULL);
fill_in_columns(fdata); fill_in_columns(fdata);
@ -1332,7 +1334,7 @@ change_time_formats(capture_file *cf)
if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) { if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) {
/* This is one of the columns that shows the time in /* This is one of the columns that shows the time in
"command-line-specified" format; update it. */ "command-line-specified" format; update it. */
cf->cinfo.col_data[i][0] = '\0'; cf->cinfo.col_buf[i][0] = '\0';
col_set_cls_time(fdata, i); col_set_cls_time(fdata, i);
gtk_clist_set_text(GTK_CLIST(packet_list), row, i, gtk_clist_set_text(GTK_CLIST(packet_list), row, i,
cf->cinfo.col_data[i]); cf->cinfo.col_data[i]);

20
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c /* main.c
* *
* $Id: main.c,v 1.163 2000/11/01 08:31:36 guy Exp $ * $Id: main.c,v 1.164 2000/11/19 08:54:37 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -905,10 +905,10 @@ main(int argc, char *argv[])
/* Initialize the capture file struct */ /* Initialize the capture file struct */
cfile.plist = NULL; cfile.plist = NULL;
cfile.plist_end = NULL; cfile.plist_end = NULL;
cfile.wth = NULL; cfile.wth = NULL;
cfile.filename = NULL; cfile.filename = NULL;
cfile.user_saved = FALSE; cfile.user_saved = FALSE;
cfile.is_tempfile = FALSE; cfile.is_tempfile = FALSE;
cfile.rfcode = NULL; cfile.rfcode = NULL;
cfile.dfilter = NULL; cfile.dfilter = NULL;
@ -917,16 +917,17 @@ main(int argc, char *argv[])
cfile.cfilter = g_strdup(EMPTY_FILTER); cfile.cfilter = g_strdup(EMPTY_FILTER);
#endif #endif
cfile.iface = NULL; cfile.iface = NULL;
cfile.save_file = NULL; cfile.save_file = NULL;
cfile.save_file_fd = -1; cfile.save_file_fd = -1;
cfile.snap = WTAP_MAX_PACKET_SIZE; cfile.snap = WTAP_MAX_PACKET_SIZE;
cfile.count = 0; cfile.count = 0;
cfile.cinfo.num_cols = prefs->num_cols; cfile.cinfo.num_cols = prefs->num_cols;
cfile.cinfo.col_fmt = (gint *) g_malloc(sizeof(gint) * cfile.cinfo.num_cols); cfile.cinfo.col_fmt = (gint *) g_malloc(sizeof(gint) * cfile.cinfo.num_cols);
cfile.cinfo.fmt_matx = (gboolean **) g_malloc(sizeof(gboolean *) * cfile.cinfo.num_cols); cfile.cinfo.fmt_matx = (gboolean **) g_malloc(sizeof(gboolean *) * cfile.cinfo.num_cols);
cfile.cinfo.col_width = (gint *) g_malloc(sizeof(gint) * cfile.cinfo.num_cols); cfile.cinfo.col_width = (gint *) g_malloc(sizeof(gint) * cfile.cinfo.num_cols);
cfile.cinfo.col_title = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols); cfile.cinfo.col_title = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols);
cfile.cinfo.col_data = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols); cfile.cinfo.col_data = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols);
cfile.cinfo.col_buf = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols);
/* Assemble the compile-time options */ /* Assemble the compile-time options */
snprintf(comp_info_str, 256, snprintf(comp_info_str, 256,
@ -1205,10 +1206,11 @@ main(int argc, char *argv[])
cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) * cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) *
NUM_COL_FMTS); NUM_COL_FMTS);
get_column_format_matches(cfile.cinfo.fmt_matx[i], cfile.cinfo.col_fmt[i]); get_column_format_matches(cfile.cinfo.fmt_matx[i], cfile.cinfo.col_fmt[i]);
cfile.cinfo.col_data[i] = NULL;
if (cfile.cinfo.col_fmt[i] == COL_INFO) if (cfile.cinfo.col_fmt[i] == COL_INFO)
cfile.cinfo.col_data[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_INFO_LEN); cfile.cinfo.col_buf[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_INFO_LEN);
else else
cfile.cinfo.col_data[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN); cfile.cinfo.col_buf[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
} }
if (cfile.snap < 1) if (cfile.snap < 1)

4
packet-aarp.c
View File

@ -1,7 +1,7 @@
/* packet-aarp.c /* packet-aarp.c
* Routines for Appletalk ARP packet disassembly * Routines for Appletalk ARP packet disassembly
* *
* $Id: packet-aarp.c,v 1.24 2000/11/13 07:18:37 guy Exp $ * $Id: packet-aarp.c,v 1.25 2000/11/19 08:53:54 guy Exp $
* *
* Simon Wilkinson <sxw@dcs.ed.ac.uk> * Simon Wilkinson <sxw@dcs.ed.ac.uk>
* *
@ -169,7 +169,7 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tpa_str = aarpproaddr_to_str(tpa_val, ar_pln, ar_pro); tpa_str = aarpproaddr_to_str(tpa_val, ar_pln, ar_pro);
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "AARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "AARP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
switch (ar_op) { switch (ar_op) {

4
packet-afs.c
View File

@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at * Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM. * www.openafs.org, Copyright IBM.
* *
* $Id: packet-afs.c,v 1.22 2000/11/03 22:11:36 nneul Exp $ * $Id: packet-afs.c,v 1.23 2000/11/19 08:53:54 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -198,7 +198,7 @@ dissect_afs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
return; return;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "AFS (RX)"); col_set_str(fd, COL_PROTOCOL, "AFS (RX)");
rxh = (struct rx_header *) &pd[offset]; rxh = (struct rx_header *) &pd[offset];
doffset = offset + sizeof(struct rx_header); doffset = offset + sizeof(struct rx_header);

12
packet-aim.c
View File

@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection * Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2000, Ralf Hoelzer <ralf@well.com> * Copyright 2000, Ralf Hoelzer <ralf@well.com>
* *
* $Id: packet-aim.c,v 1.2 2000/11/12 09:29:38 guy Exp $ * $Id: packet-aim.c,v 1.3 2000/11/19 08:53:54 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net> * By Gerald Combs <gerald@unicom.net>
@ -134,7 +134,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Make entries in Protocol column and Info column on summary display */ /* Make entries in Protocol column and Info column on summary display */
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "AIM"); col_set_str(pinfo->fd, COL_PROTOCOL, "AIM");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "AOL Instant Messenger"); col_add_str(pinfo->fd, COL_INFO, "AOL Instant Messenger");
@ -248,7 +248,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
buddyname_length = get_buddyname( buddyname, tvb, 16, 17 ); buddyname_length = get_buddyname( buddyname, tvb, 16, 17 );
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "Oncoming Buddy"); col_add_str(pinfo->fd, COL_INFO, "Oncoming Buddy");
col_append_fstr(pinfo->fd, COL_INFO, ": %s", buddyname); col_append_fstr(pinfo->fd, COL_INFO, ": %s", buddyname);
} }
@ -264,7 +264,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
buddyname_length = get_buddyname( buddyname, tvb, 16, 17 ); buddyname_length = get_buddyname( buddyname, tvb, 16, 17 );
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "Offgoing Buddy"); col_add_str(pinfo->fd, COL_INFO, "Offgoing Buddy");
col_append_fstr(pinfo->fd, COL_INFO, ": %s", buddyname); col_append_fstr(pinfo->fd, COL_INFO, ": %s", buddyname);
} }
@ -347,7 +347,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length ); get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length );
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "Message "); col_add_str(pinfo->fd, COL_INFO, "Message ");
col_append_fstr(pinfo->fd, COL_INFO, "from: %s", buddyname); col_append_fstr(pinfo->fd, COL_INFO, "from: %s", buddyname);
col_append_fstr(pinfo->fd, COL_INFO, " -> %s", msg); col_append_fstr(pinfo->fd, COL_INFO, " -> %s", msg);
} }
@ -365,7 +365,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length); get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length);
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "Message"); col_add_str(pinfo->fd, COL_INFO, "Message");
col_append_fstr(pinfo->fd, COL_INFO, " to: %s", buddyname); col_append_fstr(pinfo->fd, COL_INFO, " to: %s", buddyname);
col_append_fstr(pinfo->fd, COL_INFO, " -> %s", msg); col_append_fstr(pinfo->fd, COL_INFO, " -> %s", msg);

14
packet-arp.c
View File

@ -1,7 +1,7 @@
/* packet-arp.c /* packet-arp.c
* Routines for ARP packet disassembly * Routines for ARP packet disassembly
* *
* $Id: packet-arp.c,v 1.36 2000/11/19 01:00:20 guy Exp $ * $Id: packet-arp.c,v 1.37 2000/11/19 08:53:54 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -472,17 +472,17 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case ARPOP_REPLY: case ARPOP_REPLY:
case ATMARPOP_NAK: case ATMARPOP_NAK:
default: default:
col_add_str(pinfo->fd, COL_PROTOCOL, "ATMARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "ATMARP");
break; break;
case ARPOP_RREQUEST: case ARPOP_RREQUEST:
case ARPOP_RREPLY: case ARPOP_RREPLY:
col_add_str(pinfo->fd, COL_PROTOCOL, "ATMRARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "ATMRARP");
break; break;
case ARPOP_IREQUEST: case ARPOP_IREQUEST:
case ARPOP_IREPLY: case ARPOP_IREPLY:
col_add_str(pinfo->fd, COL_PROTOCOL, "Inverse ATMARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "Inverse ATMARP");
break; break;
} }
} }
@ -628,17 +628,17 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case ARPOP_REQUEST: case ARPOP_REQUEST:
case ARPOP_REPLY: case ARPOP_REPLY:
default: default:
col_add_str(pinfo->fd, COL_PROTOCOL, "ARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "ARP");
break; break;
case ARPOP_RREQUEST: case ARPOP_RREQUEST:
case ARPOP_RREPLY: case ARPOP_RREPLY:
col_add_str(pinfo->fd, COL_PROTOCOL, "RARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "RARP");
break; break;
case ARPOP_IREQUEST: case ARPOP_IREQUEST:
case ARPOP_IREPLY: case ARPOP_IREPLY:
col_add_str(pinfo->fd, COL_PROTOCOL, "Inverse ARP"); col_set_str(pinfo->fd, COL_PROTOCOL, "Inverse ARP");
break; break;
} }
} }

10
packet-ascend.c
View File

@ -1,7 +1,7 @@
/* packet-ascend.c /* packet-ascend.c
* Routines for decoding Lucent/Ascend packet traces * Routines for decoding Lucent/Ascend packet traces
* *
* $Id: packet-ascend.c,v 1.19 2000/11/19 02:00:02 guy Exp $ * $Id: packet-ascend.c,v 1.20 2000/11/19 08:53:54 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -67,13 +67,13 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* load the top pane info. This should be overwritten by /* load the top pane info. This should be overwritten by
the next protocol in the stack */ the next protocol in the stack */
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "N/A" ); col_set_str(pinfo->fd, COL_PROTOCOL, "N/A" );
if(check_col(pinfo->fd, COL_INFO)) if(check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Lucent/Ascend packet trace" ); col_set_str(pinfo->fd, COL_INFO, "Lucent/Ascend packet trace" );
/* populate a tree in the second pane with the status of the link /* populate a tree in the second pane with the status of the link
layer (ie none) */ layer (ie none) */

10
packet-atalk.c
View File

@ -1,7 +1,7 @@
/* packet-atalk.c /* packet-atalk.c
* Routines for Appletalk packet disassembly (DDP, currently). * Routines for Appletalk packet disassembly (DDP, currently).
* *
* $Id: packet-atalk.c,v 1.46 2000/11/19 08:20:34 guy Exp $ * $Id: packet-atalk.c,v 1.47 2000/11/19 08:53:54 guy Exp $
* *
* Simon Wilkinson <sxw@dcs.ed.ac.uk> * Simon Wilkinson <sxw@dcs.ed.ac.uk>
* *
@ -205,7 +205,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
function = tvb_get_guint8(tvb, 0); function = tvb_get_guint8(tvb, 0);
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "RTMP"); col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "%s", col_add_fstr(pinfo->fd, COL_INFO, "%s",
@ -244,7 +244,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "RTMP"); col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "Net: %u Node Len: %u Node: %u", col_add_fstr(pinfo->fd, COL_INFO, "Net: %u Node Len: %u Node: %u",
@ -328,7 +328,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
count = info & 0x0F; count = info & 0x0F;
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NBP"); col_set_str(pinfo->fd, COL_PROTOCOL, "NBP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "Op: %s Count: %u", col_add_fstr(pinfo->fd, COL_INFO, "Op: %s Count: %u",
@ -407,7 +407,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
SET_ADDRESS(&pinfo->dst, AT_ATALK, sizeof dst, (guint8 *)&dst); SET_ADDRESS(&pinfo->dst, AT_ATALK, sizeof dst, (guint8 *)&dst);
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "DDP"); col_set_str(pinfo->fd, COL_PROTOCOL, "DDP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, col_add_str(pinfo->fd, COL_INFO,
val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)")); val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)"));

18
packet-atm.c
View File

@ -1,7 +1,7 @@
/* packet-atm.c /* packet-atm.c
* Routines for ATM packet disassembly * Routines for ATM packet disassembly
* *
* $Id: packet-atm.c,v 1.26 2000/11/16 07:35:37 guy Exp $ * $Id: packet-atm.c,v 1.27 2000/11/19 08:53:55 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -261,7 +261,7 @@ dissect_le_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 tlv_length; guint8 tlv_length;
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "LE Control"); col_set_str(pinfo->fd, COL_INFO, "LE Control");
if (tree) { if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_atm_lane, tvb, offset, 108, "ATM LANE"); ti = proto_tree_add_protocol_format(tree, proto_atm_lane, tvb, offset, 108, "ATM LANE");
@ -383,9 +383,9 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "ATM LANE"; pinfo->current_proto = "ATM LANE";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "ATM LANE"); col_set_str(pinfo->fd, COL_PROTOCOL, "ATM LANE");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "ATM LANE"); col_set_str(pinfo->fd, COL_INFO, "ATM LANE");
/* Is it LE Control, 802.3, 802.5, or "none of the above"? */ /* Is it LE Control, 802.3, 802.5, or "none of the above"? */
switch (pinfo->pseudo_header->ngsniffer_atm.AppHLType) { switch (pinfo->pseudo_header->ngsniffer_atm.AppHLType) {
@ -606,24 +606,24 @@ dissect_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "ATM"); col_set_str(pinfo->fd, COL_PROTOCOL, "ATM");
switch (pinfo->pseudo_header->ngsniffer_atm.channel) { switch (pinfo->pseudo_header->ngsniffer_atm.channel) {
case 0: case 0:
/* Traffic from DCE to DTE. */ /* Traffic from DCE to DTE. */
if (check_col(pinfo->fd, COL_RES_DL_DST)) if (check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "DTE"); col_set_str(pinfo->fd, COL_RES_DL_DST, "DTE");
if (check_col(pinfo->fd, COL_RES_DL_SRC)) if (check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE");
break; break;
case 1: case 1:
/* Traffic from DTE to DCE. */ /* Traffic from DTE to DCE. */
if (check_col(pinfo->fd, COL_RES_DL_DST)) if (check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "DCE"); col_set_str(pinfo->fd, COL_RES_DL_DST, "DCE");
if (check_col(pinfo->fd, COL_RES_DL_SRC)) if (check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "DTE");
break; break;
} }

4
packet-auto_rp.c
View File

@ -4,7 +4,7 @@
* *
* Heikki Vatiainen <hessu@cs.tut.fi> * Heikki Vatiainen <hessu@cs.tut.fi>
* *
* $Id: packet-auto_rp.c,v 1.8 2000/08/13 14:08:02 deniel Exp $ * $Id: packet-auto_rp.c,v 1.9 2000/11/19 08:53:55 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -131,7 +131,7 @@ static void dissect_auto_rp(const u_char *pd, int offset, frame_data *fd, proto_
memcpy(&arh, pd + offset, sizeof(struct auto_rp_fixed_hdr)); memcpy(&arh, pd + offset, sizeof(struct auto_rp_fixed_hdr));
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "Auto-RP"); col_set_str(fd, COL_PROTOCOL, "Auto-RP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (short_hdr) if (short_hdr)

4
packet-bgp.c
View File

@ -2,7 +2,7 @@
* Routines for BGP packet dissection. * Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org> * Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
* *
* $Id: packet-bgp.c,v 1.27 2000/08/20 18:10:12 deniel Exp $ * $Id: packet-bgp.c,v 1.28 2000/11/19 08:53:55 guy Exp $
* *
* Supports: * Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4) * RFC1771 A Border Gateway Protocol 4 (BGP-4)
@ -1141,7 +1141,7 @@ dissect_bgp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_bgp, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_bgp, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "BGP"); col_set_str(fd, COL_PROTOCOL, "BGP");
p = &pd[offset]; p = &pd[offset];
l = END_OF_FRAME; l = END_OF_FRAME;

8
packet-bootp.c
View File

@ -2,7 +2,7 @@
* Routines for BOOTP/DHCP packet disassembly * Routines for BOOTP/DHCP packet disassembly
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-bootp.c,v 1.41 2000/11/17 21:00:35 gram Exp $ * $Id: packet-bootp.c,v 1.42 2000/11/19 08:53:55 guy Exp $
* *
* The information used comes from: * The information used comes from:
* RFC 951: Bootstrap Protocol * RFC 951: Bootstrap Protocol
@ -628,7 +628,7 @@ dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
dhcp_type = NULL; dhcp_type = NULL;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "BOOTP"); col_set_str(fd, COL_PROTOCOL, "BOOTP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (pd[offset] == 1) { if (pd[offset] == 1) {
@ -637,7 +637,7 @@ dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
pd[offset+2], pd[offset+1])); pd[offset+2], pd[offset+1]));
} }
else { else {
col_add_str(fd, COL_INFO, "Boot Reply"); col_set_str(fd, COL_INFO, "Boot Reply");
} }
} }
@ -746,7 +746,7 @@ dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (dhcp_type != NULL ) { if (dhcp_type != NULL ) {
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "DHCP"); col_set_str(fd, COL_PROTOCOL, "DHCP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x", col_add_fstr(fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x",
dhcp_type, pntohl(&pd[offset+4])); dhcp_type, pntohl(&pd[offset+4]));

4
packet-bpdu.c
View File

@ -1,7 +1,7 @@
/* packet-bpdu.c /* packet-bpdu.c
* Routines for BPDU (Spanning Tree Protocol) disassembly * Routines for BPDU (Spanning Tree Protocol) disassembly
* *
* $Id: packet-bpdu.c,v 1.14 2000/11/16 07:35:37 guy Exp $ * $Id: packet-bpdu.c,v 1.15 2000/11/19 08:53:55 guy Exp $
* *
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org> * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
* *
@ -110,7 +110,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
port_identifier = tvb_get_ntohs(tvb, BPDU_PORT_IDENTIFIER); port_identifier = tvb_get_ntohs(tvb, BPDU_PORT_IDENTIFIER);
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */ col_set_str(pinfo->fd, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */
} }
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {

4
packet-bxxp.c
View File

@ -1,7 +1,7 @@
/* packet-bxxp.c /* packet-bxxp.c
* Routines for BXXP packet disassembly * Routines for BXXP packet disassembly
* *
* $Id: packet-bxxp.c,v 1.10 2000/10/24 20:23:16 sharpe Exp $ * $Id: packet-bxxp.c,v 1.11 2000/11/19 08:53:56 guy Exp $
* *
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* *
@ -1047,7 +1047,7 @@ dissect_bxxp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "BXXP"); col_set_str(pinfo->fd, COL_PROTOCOL, "BXXP");
if (check_col(pinfo->fd, COL_INFO)) { /* Check the type ... */ if (check_col(pinfo->fd, COL_INFO)) { /* Check the type ... */

6
packet-cdp.c
View File

@ -2,7 +2,7 @@
* Routines for the disassembly of the "Cisco Discovery Protocol" * Routines for the disassembly of the "Cisco Discovery Protocol"
* (c) Copyright Hannes R. Boehm <hannes@boehm.org> * (c) Copyright Hannes R. Boehm <hannes@boehm.org>
* *
* $Id: packet-cdp.c,v 1.26 2000/11/13 07:18:44 guy Exp $ * $Id: packet-cdp.c,v 1.27 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -105,9 +105,9 @@ dissect_cdp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_cdp, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_cdp, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "CDP"); col_set_str(fd, COL_PROTOCOL, "CDP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "Cisco Discovery Protocol"); col_set_str(fd, COL_INFO, "Cisco Discovery Protocol");
if(tree){ if(tree){
ti = proto_tree_add_item(tree, proto_cdp, NullTVB, offset, END_OF_FRAME, FALSE); ti = proto_tree_add_item(tree, proto_cdp, NullTVB, offset, END_OF_FRAME, FALSE);

6
packet-cgmp.c
View File

@ -1,7 +1,7 @@
/* packet-cgmp.c /* packet-cgmp.c
* Routines for the disassembly of the Cisco Group Management Protocol * Routines for the disassembly of the Cisco Group Management Protocol
* *
* $Id: packet-cgmp.c,v 1.4 2000/08/13 14:08:05 deniel Exp $ * $Id: packet-cgmp.c,v 1.5 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -68,9 +68,9 @@ dissect_cgmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_cgmp, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_cgmp, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "CGMP"); col_set_str(fd, COL_PROTOCOL, "CGMP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "Cisco Group Management Protocol"); col_set_str(fd, COL_INFO, "Cisco Group Management Protocol");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_cgmp, NullTVB, offset, END_OF_FRAME, FALSE); ti = proto_tree_add_item(tree, proto_cgmp, NullTVB, offset, END_OF_FRAME, FALSE);

10
packet-clip.c
View File

@ -1,7 +1,7 @@
/* packet-clip.c /* packet-clip.c
* Routines for clip packet disassembly * Routines for clip packet disassembly
* *
* $Id: packet-clip.c,v 1.11 2000/11/18 10:38:23 guy Exp $ * $Id: packet-clip.c,v 1.12 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -59,13 +59,13 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* load the top pane info. This should be overwritten by /* load the top pane info. This should be overwritten by
the next protocol in the stack */ the next protocol in the stack */
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "CLIP" ); col_set_str(pinfo->fd, COL_PROTOCOL, "CLIP" );
if(check_col(pinfo->fd, COL_INFO)) if(check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Classical IP frame" ); col_set_str(pinfo->fd, COL_INFO, "Classical IP frame" );
/* populate a tree in the second pane with the status of the link /* populate a tree in the second pane with the status of the link
layer (ie none) layer (ie none)

8
packet-clnp.c
View File

@ -1,7 +1,7 @@
/* packet-clnp.c /* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly * Routines for ISO/OSI network and transport protocol packet disassembly
* *
* $Id: packet-clnp.c,v 1.15 2000/11/19 04:14:26 guy Exp $ * $Id: packet-clnp.c,v 1.16 2000/11/19 08:53:56 guy Exp $
* Laurent Deniel <deniel@worldnet.fr> * Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de> * Ralf Schneider <Ralf.Schneider@t-online.de>
* *
@ -1516,7 +1516,7 @@ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo,
/* Well, we found at least one valid COTP or CLTP PDU, so I guess this /* Well, we found at least one valid COTP or CLTP PDU, so I guess this
is either COTP or CLTP. */ is either COTP or CLTP. */
if (!subdissector_found && check_col(pinfo->fd, COL_PROTOCOL)) if (!subdissector_found && check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, is_cltp ? "CLTP" : "COTP"); col_set_str(pinfo->fd, COL_PROTOCOL, is_cltp ? "CLTP" : "COTP");
found_ositp = TRUE; found_ositp = TRUE;
} }
@ -1562,12 +1562,12 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "CLNP"; pinfo->current_proto = "CLNP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "CLNP"); col_set_str(pinfo->fd, COL_PROTOCOL, "CLNP");
cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID); cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID);
if (cnf_proto_id == NLPID_NULL) { if (cnf_proto_id == NLPID_NULL) {
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Inactive subset"); col_set_str(pinfo->fd, COL_INFO, "Inactive subset");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, FALSE); ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, FALSE);
clnp_tree = proto_item_add_subtree(ti, ett_clnp); clnp_tree = proto_item_add_subtree(ti, ett_clnp);

4
packet-cops.c
View File

@ -4,7 +4,7 @@
* *
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
* *
* $Id: packet-cops.c,v 1.5 2000/10/16 14:05:08 gram Exp $ * $Id: packet-cops.c,v 1.6 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -268,7 +268,7 @@ static void dissect_cops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "COPS"; pinfo->current_proto = "COPS";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "COPS"); col_set_str(pinfo->fd, COL_PROTOCOL, "COPS");
op_code = tvb_get_guint8(tvb, 1); op_code = tvb_get_guint8(tvb, 1);
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))

16
packet-ddtp.c
View File

@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/ * see http://ddt.sourceforge.net/
* Olivier Abad <oabad@cybercable.fr> * Olivier Abad <oabad@cybercable.fr>
* *
* $Id: packet-ddtp.c,v 1.10 2000/08/13 14:08:08 deniel Exp $ * $Id: packet-ddtp.c,v 1.11 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -108,7 +108,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "DDTP"; pinfo->current_proto = "DDTP";
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
/* Indicate what kind of message this is. */ /* Indicate what kind of message this is. */
col_add_str (pinfo->fd, COL_PROTOCOL, "DDTP"); col_set_str (pinfo->fd, COL_PROTOCOL, "DDTP");
} }
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0,
@ -123,11 +123,11 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (tvb_get_ntohl(tvb, 12)) { switch (tvb_get_ntohl(tvb, 12)) {
case DDTP_MESSAGE_ERROR : case DDTP_MESSAGE_ERROR :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Message Error"); col_set_str (pinfo->fd, COL_INFO, "Message Error");
break; break;
case DDTP_UPDATE_QUERY : case DDTP_UPDATE_QUERY :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Update Query"); col_set_str (pinfo->fd, COL_INFO, "Update Query");
proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4, proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4,
FALSE); FALSE);
proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, tvb, 20, 4, proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, tvb, 20, 4,
@ -135,25 +135,25 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break; break;
case DDTP_UPDATE_REPLY : case DDTP_UPDATE_REPLY :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Update Reply"); col_set_str (pinfo->fd, COL_INFO, "Update Reply");
proto_tree_add_item(ddtp_tree, hf_ddtp_status, tvb, 16, 4, proto_tree_add_item(ddtp_tree, hf_ddtp_status, tvb, 16, 4,
FALSE); FALSE);
break; break;
case DDTP_ALIVE_QUERY : case DDTP_ALIVE_QUERY :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Alive Query"); col_set_str (pinfo->fd, COL_INFO, "Alive Query");
proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u", proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u",
tvb_get_ntohl(tvb, 16)); tvb_get_ntohl(tvb, 16));
break; break;
case DDTP_ALIVE_REPLY : case DDTP_ALIVE_REPLY :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Alive Reply"); col_set_str (pinfo->fd, COL_INFO, "Alive Reply");
proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u", proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u",
tvb_get_ntohl(tvb, 16)); tvb_get_ntohl(tvb, 16));
break; break;
default : default :
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "Unknwon type"); col_set_str (pinfo->fd, COL_INFO, "Unknwon type");
proto_tree_add_text(ddtp_tree, tvb, 12, 4, "Unknown type : %u", proto_tree_add_text(ddtp_tree, tvb, 12, 4, "Unknown type : %u",
tvb_get_ntohl(tvb, 12)); tvb_get_ntohl(tvb, 12));
} }

4
packet-diameter.c
View File

@ -1,7 +1,7 @@
/* packet-diameter.c /* packet-diameter.c
* Routines for DIAMETER packet disassembly * Routines for DIAMETER packet disassembly
* *
* $Id: packet-diameter.c,v 1.7 2000/11/17 21:00:35 gram Exp $ * $Id: packet-diameter.c,v 1.8 2000/11/19 08:53:56 guy Exp $
* *
* Copyright (c) 2000 by David Frascone <chaos@mindspring.com> * Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
* *
@ -542,7 +542,7 @@ void dissect_diameter(const u_char *pd, int offset, frame_data *fd,
codestrval="Unknown Packet"; codestrval="Unknown Packet";
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "DIAMETER"); col_set_str(fd, COL_PROTOCOL, "DIAMETER");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (DIAM_FLAGS_W & dh.flagsVer) { if (DIAM_FLAGS_W & dh.flagsVer) {
if (DIAM_FLAGS_A & dh.flagsVer) { if (DIAM_FLAGS_A & dh.flagsVer) {

6
packet-dns.c
View File

@ -1,7 +1,7 @@
/* packet-dns.c /* packet-dns.c
* Routines for DNS packet disassembly * Routines for DNS packet disassembly
* *
* $Id: packet-dns.c,v 1.58 2000/11/14 03:51:41 gram Exp $ * $Id: packet-dns.c,v 1.59 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -2254,11 +2254,11 @@ dissect_dns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
dns_data_offset = offset; dns_data_offset = offset;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "DNS"); col_set_str(fd, COL_PROTOCOL, "DNS");
if (!BYTES_ARE_IN_FRAME(offset, DNS_HDRLEN)) { if (!BYTES_ARE_IN_FRAME(offset, DNS_HDRLEN)) {
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_str(fd, COL_INFO, "Short DNS packet"); col_set_str(fd, COL_INFO, "Short DNS packet");
} }
old_dissect_data(pd, offset, fd, tree); old_dissect_data(pd, offset, fd, tree);
return; return;

4
packet-eigrp.c
View File

@ -2,7 +2,7 @@
* Routines for EIGRP dissection * Routines for EIGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro> * Copyright 2000, Paul Ionescu <paul@acorp.ro>
* *
* $Id: packet-eigrp.c,v 1.8 2000/11/14 19:13:40 gram Exp $ * $Id: packet-eigrp.c,v 1.9 2000/11/19 08:53:56 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -154,7 +154,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (opcode==EIGRP_HELLO) { if (ack == 0) opcode_tmp=EIGRP_HI; else opcode_tmp=EIGRP_ACK; } if (opcode==EIGRP_HELLO) { if (ack == 0) opcode_tmp=EIGRP_HI; else opcode_tmp=EIGRP_ACK; }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "EIGRP"); col_set_str(pinfo->fd, COL_PROTOCOL, "EIGRP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, col_add_str(pinfo->fd, COL_INFO,
val_to_str(opcode_tmp , eigrp_opcode_vals, "Unknown (0x%04x)")); val_to_str(opcode_tmp , eigrp_opcode_vals, "Unknown (0x%04x)"));

4
packet-esis.c
View File

@ -2,7 +2,7 @@
* Routines for ISO/OSI End System to Intermediate System * Routines for ISO/OSI End System to Intermediate System
* Routeing Exchange Protocol ISO 9542. * Routeing Exchange Protocol ISO 9542.
* *
* $Id: packet-esis.c,v 1.8 2000/11/18 10:38:24 guy Exp $ * $Id: packet-esis.c,v 1.9 2000/11/19 08:53:56 guy Exp $
* Ralf Schneider <Ralf.Schneider@t-online.de> * Ralf Schneider <Ralf.Schneider@t-online.de>
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
@ -298,7 +298,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
pinfo->current_proto = "ESIS"; pinfo->current_proto = "ESIS";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "ESIS"); col_set_str(pinfo->fd, COL_PROTOCOL, "ESIS");
tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr); tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr);

6
packet-eth.c
View File

@ -1,7 +1,7 @@
/* packet-eth.c /* packet-eth.c
* Routines for ethernet packet disassembly * Routines for ethernet packet disassembly
* *
* $Id: packet-eth.c,v 1.48 2000/11/19 02:00:02 guy Exp $ * $Id: packet-eth.c,v 1.49 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -163,7 +163,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
orig_captured_len = pinfo->captured_len; orig_captured_len = pinfo->captured_len;
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "Ethernet"); col_set_str(pinfo->fd, COL_PROTOCOL, "Ethernet");
src = tvb_get_ptr(tvb, 6, 6); src = tvb_get_ptr(tvb, 6, 6);
dst = tvb_get_ptr(tvb, 0, 6); dst = tvb_get_ptr(tvb, 0, 6);
@ -243,7 +243,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} else { } else {
ethhdr_type = ETHERNET_II; ethhdr_type = ETHERNET_II;
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Ethernet II"); col_set_str(pinfo->fd, COL_INFO, "Ethernet II");
if (tree) { if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE,

4
packet-fddi.c
View File

@ -3,7 +3,7 @@
* *
* Laurent Deniel <deniel@worldnet.fr> * Laurent Deniel <deniel@worldnet.fr>
* *
* $Id: packet-fddi.c,v 1.41 2000/11/17 21:00:35 gram Exp $ * $Id: packet-fddi.c,v 1.42 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -235,7 +235,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
pinfo->current_proto = "FDDI"; pinfo->current_proto = "FDDI";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "FDDI"); col_set_str(pinfo->fd, COL_PROTOCOL, "FDDI");
fc = (int) tvb_get_guint8(tvb, FDDI_P_FC); fc = (int) tvb_get_guint8(tvb, FDDI_P_FC);
fc_str = fddifc_to_str(fc); fc_str = fddifc_to_str(fc);

6
packet-ftp.c
View File

@ -2,7 +2,7 @@
* Routines for ftp packet dissection * Routines for ftp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-ftp.c,v 1.22 2000/11/13 08:57:59 guy Exp $ * $Id: packet-ftp.c,v 1.23 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -83,7 +83,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "FTP"; pinfo->current_proto = "FTP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "FTP"); col_set_str(pinfo->fd, COL_PROTOCOL, "FTP");
/* /*
* Find the end of the first line. * Find the end of the first line.
@ -190,7 +190,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "FTP-DATA"; pinfo->current_proto = "FTP-DATA";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "FTP-DATA"); col_set_str(pinfo->fd, COL_PROTOCOL, "FTP-DATA");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "FTP Data: %u bytes", col_add_fstr(pinfo->fd, COL_INFO, "FTP Data: %u bytes",

4
packet-giop.c
View File

@ -4,7 +4,7 @@
* Laurent Deniel <deniel@worldnet.fr> * Laurent Deniel <deniel@worldnet.fr>
* Craig Rodrigues <rodrigc@mediaone.net> * Craig Rodrigues <rodrigc@mediaone.net>
* *
* $Id: packet-giop.c,v 1.25 2000/11/16 07:35:37 guy Exp $ * $Id: packet-giop.c,v 1.26 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1257,7 +1257,7 @@ dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->fd, COL_PROTOCOL)) if (check_col (pinfo->fd, COL_PROTOCOL))
{ {
col_add_str (pinfo->fd, COL_PROTOCOL, "GIOP"); col_set_str (pinfo->fd, COL_PROTOCOL, "GIOP");
} }
if (header.GIOP_version.major != GIOP_MAJOR || if (header.GIOP_version.major != GIOP_MAJOR ||

4
packet-gre.c
View File

@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol * Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
* *
* $Id: packet-gre.c,v 1.28 2000/11/19 02:00:02 guy Exp $ * $Id: packet-gre.c,v 1.29 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -88,7 +88,7 @@ dissect_gre(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
OLD_CHECK_DISPLAY_AS_DATA(proto_gre, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_gre, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "GRE"); col_set_str(fd, COL_PROTOCOL, "GRE");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "Encapsulated %s", col_add_fstr(fd, COL_INFO, "Encapsulated %s",

4
packet-h1.c
View File

@ -2,7 +2,7 @@
* Routines for Sinec H1 packet disassembly * Routines for Sinec H1 packet disassembly
* Gerrit Gehnen <G.Gehnen@atrie.de> * Gerrit Gehnen <G.Gehnen@atrie.de>
* *
* $Id: packet-h1.c,v 1.13 2000/11/16 07:35:37 guy Exp $ * $Id: packet-h1.c,v 1.14 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -122,7 +122,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
if (check_col (pinfo->fd, COL_PROTOCOL)) if (check_col (pinfo->fd, COL_PROTOCOL))
col_add_str (pinfo->fd, COL_PROTOCOL, "H1"); col_set_str (pinfo->fd, COL_PROTOCOL, "H1");
if (check_col (pinfo->fd, COL_INFO)) if (check_col (pinfo->fd, COL_INFO))
col_add_str (pinfo->fd, COL_INFO, "S5: "); col_add_str (pinfo->fd, COL_INFO, "S5: ");
if (tree) if (tree)

4
packet-h261.c
View File

@ -77,11 +77,11 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
unsigned int offset = 0; unsigned int offset = 0;
if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { if ( check_col( pinfo->fd, COL_PROTOCOL ) ) {
col_add_str( pinfo->fd, COL_PROTOCOL, "H.261" ); col_set_str( pinfo->fd, COL_PROTOCOL, "H.261" );
} }
if ( check_col( pinfo->fd, COL_INFO) ) { if ( check_col( pinfo->fd, COL_INFO) ) {
col_add_str( pinfo->fd, COL_INFO, "H.261 message"); col_set_str( pinfo->fd, COL_INFO, "H.261 message");
} }
if ( tree ) { if ( tree ) {

4
packet-hsrp.c
View File

@ -4,7 +4,7 @@
* *
* Heikki Vatiainen <hessu@cs.tut.fi> * Heikki Vatiainen <hessu@cs.tut.fi>
* *
* $Id: packet-hsrp.c,v 1.9 2000/11/17 21:00:35 gram Exp $ * $Id: packet-hsrp.c,v 1.10 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -102,7 +102,7 @@ dissect_hsrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
memcpy(&hsrp, pd + offset, sizeof(struct hsrp_packet)); memcpy(&hsrp, pd + offset, sizeof(struct hsrp_packet));
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "HSRP"); col_set_str(fd, COL_PROTOCOL, "HSRP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (short_packet) if (short_packet)

6
packet-http.c
View File

@ -3,7 +3,7 @@
* *
* Guy Harris <guy@alum.mit.edu> * Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-http.c,v 1.28 2000/11/16 07:35:37 guy Exp $ * $Id: packet-http.c,v 1.29 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -83,7 +83,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "HTTP"; pinfo->current_proto = "HTTP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, is_ipp ? "IPP" : "HTTP"); col_set_str(pinfo->fd, COL_PROTOCOL, is_ipp ? "IPP" : "HTTP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
/* /*
* Put the first line from the buffer into the summary * Put the first line from the buffer into the summary
@ -97,7 +97,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_add_str(pinfo->fd, COL_INFO, col_add_str(pinfo->fd, COL_INFO,
format_text(line, linelen)); format_text(line, linelen));
else else
col_add_str(pinfo->fd, COL_INFO, "Continuation"); col_set_str(pinfo->fd, COL_INFO, "Continuation");
} }
if (tree) { if (tree) {

4
packet-icmpv6.c
View File

@ -1,7 +1,7 @@
/* packet-icmpv6.c /* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly * Routines for ICMPv6 packet disassembly
* *
* $Id: packet-icmpv6.c,v 1.30 2000/11/11 10:23:41 guy Exp $ * $Id: packet-icmpv6.c,v 1.31 2000/11/19 08:53:57 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -882,7 +882,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ICMPv6"); col_set_str(fd, COL_PROTOCOL, "ICMPv6");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
char typebuf[256], codebuf[256]; char typebuf[256], codebuf[256];

4
packet-icp.c
View File

@ -2,7 +2,7 @@
* Routines for ICP (internet cache protocol) packet disassembly * Routines for ICP (internet cache protocol) packet disassembly
* RFC 2186 && RFC 2187 * RFC 2186 && RFC 2187
* *
* $Id: packet-icp.c,v 1.12 2000/11/17 21:00:35 gram Exp $ * $Id: packet-icp.c,v 1.13 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Peter Torvals * By Peter Torvals
@ -202,7 +202,7 @@ static void dissect_icp(const u_char *pd, int offset, frame_data *fd,
(guint16)icph.opcode,icph.request_number); (guint16)icph.opcode,icph.request_number);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ICP"); col_set_str(fd, COL_PROTOCOL, "ICP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
{ {

18
packet-icq.c
View File

@ -1,7 +1,7 @@
/* packet-icq.c /* packet-icq.c
* Routines for ICQ packet disassembly * Routines for ICQ packet disassembly
* *
* $Id: packet-icq.c,v 1.21 2000/08/13 14:08:15 deniel Exp $ * $Id: packet-icq.c,v 1.22 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Johan Feyaerts * By Johan Feyaerts
@ -561,10 +561,10 @@ dissect_icqv4(const u_char *pd,
{ {
/* Not really implemented yet */ /* Not really implemented yet */
if (check_col(fd, COL_PROTOCOL)) { if (check_col(fd, COL_PROTOCOL)) {
col_add_str(fd, COL_PROTOCOL, "ICQv4 (UDP)"); col_set_str(fd, COL_PROTOCOL, "ICQv4 (UDP)");
} }
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_str(fd, COL_INFO, "ICQ Version 4 protocol"); col_set_str(fd, COL_INFO, "ICQ Version 4 protocol");
} }
} }
@ -576,10 +576,10 @@ dissect_icqv3(const u_char *pd,
{ {
/* Not really implemented yet */ /* Not really implemented yet */
if (check_col(fd, COL_PROTOCOL)) { if (check_col(fd, COL_PROTOCOL)) {
col_add_str(fd, COL_PROTOCOL, "ICQv3 (UDP)"); col_set_str(fd, COL_PROTOCOL, "ICQv3 (UDP)");
} }
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_str(fd, COL_INFO, "ICQ Version 3 protocol"); col_set_str(fd, COL_INFO, "ICQ Version 3 protocol");
} }
} }
@ -591,10 +591,10 @@ dissect_icqv2(const u_char *pd,
{ {
/* Not really implemented yet */ /* Not really implemented yet */
if (check_col(fd, COL_PROTOCOL)) { if (check_col(fd, COL_PROTOCOL)) {
col_add_str(fd, COL_PROTOCOL, "ICQv2 (UDP)"); col_set_str(fd, COL_PROTOCOL, "ICQv2 (UDP)");
} }
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_str(fd, COL_INFO, "ICQ Version 2 protocol"); col_set_str(fd, COL_INFO, "ICQ Version 2 protocol");
} }
} }
@ -2410,9 +2410,9 @@ static void dissect_icqv5(const u_char *pd,
guint32 unknown = pletohl(&pd[offset + ICQ5_UNKNOWN]); guint32 unknown = pletohl(&pd[offset + ICQ5_UNKNOWN]);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ICQv5 (UDP)"); col_set_str(fd, COL_PROTOCOL, "ICQv5 (UDP)");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "ICQv5 packet"); col_set_str(fd, COL_INFO, "ICQv5 packet");
if (unknown == 0x0L) { if (unknown == 0x0L) {
dissect_icqv5Client(pd, offset, fd, tree); dissect_icqv5Client(pd, offset, fd, tree);
} else { } else {

4
packet-ieee80211.c
View File

@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB * Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
* *
* $Id: packet-ieee80211.c,v 1.2 2000/11/15 09:37:49 guy Exp $ * $Id: packet-ieee80211.c,v 1.3 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net> * By Gerald Combs <gerald@unicom.net>
@ -749,7 +749,7 @@ dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
pinfo->current_proto = capture_proto_name; pinfo->current_proto = capture_proto_name;
if (check_col (pinfo->fd, COL_PROTOCOL)) if (check_col (pinfo->fd, COL_PROTOCOL))
col_add_str (pinfo->fd, COL_PROTOCOL, "IEEE 802.11"); col_set_str (pinfo->fd, COL_PROTOCOL, "IEEE 802.11");
/* Add the FC to the current tree */ /* Add the FC to the current tree */
if (tree) if (tree)

4
packet-igrp.c
View File

@ -2,7 +2,7 @@
* Routines for IGRP dissection * Routines for IGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro> * Copyright 2000, Paul Ionescu <paul@acorp.ro>
* *
* $Id: packet-igrp.c,v 1.1 2000/10/26 09:14:28 guy Exp $ * $Id: packet-igrp.c,v 1.2 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -70,7 +70,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IGRP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IGRP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
switch (ver_and_opcode) { switch (ver_and_opcode) {

4
packet-imap.c
View File

@ -2,7 +2,7 @@
* Routines for imap packet dissection * Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-imap.c,v 1.9 2000/08/13 14:08:16 deniel Exp $ * $Id: packet-imap.c,v 1.10 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -84,7 +84,7 @@ dissect_imap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IMAP"); col_set_str(fd, COL_PROTOCOL, "IMAP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {

10
packet-ip.c
View File

@ -1,7 +1,7 @@
/* packet-ip.c /* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly * Routines for IP and miscellaneous IP protocol packet disassembly
* *
* $Id: packet-ip.c,v 1.106 2000/11/18 10:38:24 guy Exp $ * $Id: packet-ip.c,v 1.107 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -937,7 +937,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (iph.ip_off & IP_OFFSET) { if (iph.ip_off & IP_OFFSET) {
/* fragmented */ /* fragmented */
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)", col_add_fstr(pinfo->fd, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)",
ipprotostr(iph.ip_p), iph.ip_p, (iph.ip_off & IP_OFFSET) * 8); ipprotostr(iph.ip_p), iph.ip_p, (iph.ip_off & IP_OFFSET) * 8);
@ -956,7 +956,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) { if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
/* Unknown protocol */ /* Unknown protocol */
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p); col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p);
dissect_data(next_tvb, 0, pinfo, tree); dissect_data(next_tvb, 0, pinfo, tree);
@ -1093,7 +1093,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "ICMP"); col_set_str(pinfo->fd, COL_PROTOCOL, "ICMP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, type_str); col_add_str(pinfo->fd, COL_INFO, type_str);
@ -1243,7 +1243,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "IGMP"; pinfo->current_proto = "IGMP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IGMP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IGMP");
/* Avoids alignment problems on many architectures. */ /* Avoids alignment problems on many architectures. */
memcpy(&ih, tvb_get_ptr(tvb, 0, sizeof(e_igmp)), sizeof(e_igmp)); memcpy(&ih, tvb_get_ptr(tvb, 0, sizeof(e_igmp)), sizeof(e_igmp));

8
packet-ipp.c
View File

@ -3,7 +3,7 @@
* *
* Guy Harris <guy@alum.mit.edu> * Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-ipp.c,v 1.16 2000/11/16 07:35:37 guy Exp $ * $Id: packet-ipp.c,v 1.17 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -174,12 +174,12 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "IPP"; pinfo->current_proto = "IPP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IPP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IPP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
if (is_request) if (is_request)
col_add_str(pinfo->fd, COL_INFO, "IPP request"); col_set_str(pinfo->fd, COL_INFO, "IPP request");
else else
col_add_str(pinfo->fd, COL_INFO, "IPP response"); col_set_str(pinfo->fd, COL_INFO, "IPP response");
} }
if (tree) { if (tree) {

10
packet-ipsec.c
View File

@ -1,7 +1,7 @@
/* packet-ipsec.c /* packet-ipsec.c
* Routines for IPsec/IPComp packet disassembly * Routines for IPsec/IPComp packet disassembly
* *
* $Id: packet-ipsec.c,v 1.21 2000/11/17 21:00:35 gram Exp $ * $Id: packet-ipsec.c,v 1.22 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -117,7 +117,7 @@ dissect_ah_old(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
advance = sizeof(ah) + ((ah.ah_len - 1) << 2); advance = sizeof(ah) + ((ah.ah_len - 1) << 2);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "AH"); col_set_str(fd, COL_PROTOCOL, "AH");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)", col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)",
(guint32)ntohl(ah.ah_spi)); (guint32)ntohl(ah.ah_spi));
@ -160,7 +160,7 @@ dissect_ah(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
advance = sizeof(ah) + ((ah.ah_len - 1) << 2); advance = sizeof(ah) + ((ah.ah_len - 1) << 2);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "AH"); col_set_str(fd, COL_PROTOCOL, "AH");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)", col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)",
(guint32)ntohl(ah.ah_spi)); (guint32)ntohl(ah.ah_spi));
@ -222,7 +222,7 @@ dissect_esp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
* the next protocol in the stack * the next protocol in the stack
*/ */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ESP"); col_set_str(fd, COL_PROTOCOL, "ESP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "ESP (SPI=0x%08x)", col_add_fstr(fd, COL_INFO, "ESP (SPI=0x%08x)",
(guint32)ntohl(esp.esp_spi)); (guint32)ntohl(esp.esp_spi));
@ -262,7 +262,7 @@ dissect_ipcomp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
* the next protocol in the stack * the next protocol in the stack
*/ */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IPComp"); col_set_str(fd, COL_PROTOCOL, "IPComp");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
p = val_to_str(ntohs(ipcomp.comp_cpi), cpi2val, ""); p = val_to_str(ntohs(ipcomp.comp_cpi), cpi2val, "");
if (p[0] == '\0') { if (p[0] == '\0') {

6
packet-ipv6.c
View File

@ -1,7 +1,7 @@
/* packet-ipv6.c /* packet-ipv6.c
* Routines for IPv6 packet disassembly * Routines for IPv6 packet disassembly
* *
* $Id: packet-ipv6.c,v 1.45 2000/11/17 06:02:20 guy Exp $ * $Id: packet-ipv6.c,v 1.46 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -417,7 +417,7 @@ again:
if (frag) { if (frag) {
/* fragmented */ /* fragmented */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IPv6"); col_set_str(fd, COL_PROTOCOL, "IPv6");
/* COL_INFO was filled in by "dissect_frag6()" */ /* COL_INFO was filled in by "dissect_frag6()" */
old_dissect_data(pd, offset, fd, tree); old_dissect_data(pd, offset, fd, tree);
} else { } else {
@ -425,7 +425,7 @@ again:
if (!old_dissector_try_port(ip_dissector_table, nxt, pd, offset, fd, tree)) { if (!old_dissector_try_port(ip_dissector_table, nxt, pd, offset, fd, tree)) {
/* Unknown protocol */ /* Unknown protocol */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IPv6"); col_set_str(fd, COL_PROTOCOL, "IPv6");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "%s (0x%02x)", ipprotostr(nxt), nxt); col_add_fstr(fd, COL_INFO, "%s (0x%02x)", ipprotostr(nxt), nxt);
old_dissect_data(pd, offset, fd, tree); old_dissect_data(pd, offset, fd, tree);

16
packet-ipx.c
View File

@ -2,7 +2,7 @@
* Routines for NetWare's IPX * Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-ipx.c,v 1.69 2000/11/17 21:00:35 gram Exp $ * $Id: packet-ipx.c,v 1.70 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -321,7 +321,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
SET_ADDRESS(&pi.dst, AT_IPX, 10, dst_net_node); SET_ADDRESS(&pi.dst, AT_IPX, 10, dst_net_node);
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IPX"); col_set_str(pinfo->fd, COL_PROTOCOL, "IPX");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%04X)", col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%04X)",
socket_text(ipx_dsocket), ipx_dsocket); socket_text(ipx_dsocket), ipx_dsocket);
@ -447,9 +447,9 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "SPX"; pinfo->current_proto = "SPX";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SPX"); col_set_str(pinfo->fd, COL_PROTOCOL, "SPX");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "SPX"); col_set_str(pinfo->fd, COL_INFO, "SPX");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, FALSE); ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, FALSE);
@ -493,7 +493,7 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "IPX MSG"; pinfo->current_proto = "IPX MSG";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IPX MSG"); col_set_str(pinfo->fd, COL_PROTOCOL, "IPX MSG");
conn_number = tvb_get_guint8(tvb, 0); conn_number = tvb_get_guint8(tvb, 0);
sig_char = tvb_get_guint8(tvb, 1); sig_char = tvb_get_guint8(tvb, 1);
@ -533,7 +533,7 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "IPX RIP"; pinfo->current_proto = "IPX RIP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IPX RIP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IPX RIP");
operation = tvb_get_ntohs(tvb, 0) - 1; operation = tvb_get_ntohs(tvb, 0) - 1;
@ -681,7 +681,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "IPX SAP"; pinfo->current_proto = "IPX SAP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "IPX SAP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IPX SAP");
query.query_type = tvb_get_ntohs(tvb, 0); query.query_type = tvb_get_ntohs(tvb, 0);
query.server_type = tvb_get_ntohs(tvb, 2); query.server_type = tvb_get_ntohs(tvb, 2);
@ -691,7 +691,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_add_str(pinfo->fd, COL_INFO, sap_type[query.query_type - 1]); col_add_str(pinfo->fd, COL_INFO, sap_type[query.query_type - 1]);
} }
else { else {
col_add_str(pinfo->fd, COL_INFO, "Unknown Packet Type"); col_set_str(pinfo->fd, COL_INFO, "Unknown Packet Type");
} }
} }

4
packet-irc.c
View File

@ -1,7 +1,7 @@
/* packet-irc.c /* packet-irc.c
* Routines for MSX irc packet dissection * Routines for MSX irc packet dissection
* *
* $Id: packet-irc.c,v 1.8 2000/08/13 14:08:18 deniel Exp $ * $Id: packet-irc.c,v 1.9 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -81,7 +81,7 @@ dissect_irc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_irc, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_irc, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IRC"); col_set_str(fd, COL_PROTOCOL, "IRC");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
{ {

4
packet-isakmp.c
View File

@ -3,7 +3,7 @@
* (ISAKMP) (RFC 2408) * (ISAKMP) (RFC 2408)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
* *
* $Id: packet-isakmp.c,v 1.29 2000/10/07 06:58:24 guy Exp $ * $Id: packet-isakmp.c,v 1.30 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -359,7 +359,7 @@ dissect_isakmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
OLD_CHECK_DISPLAY_AS_DATA(proto_isakmp, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_isakmp, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ISAKMP"); col_set_str(fd, COL_PROTOCOL, "ISAKMP");
len = pntohl(&hdr->length); len = pntohl(&hdr->length);

4
packet-isis.c
View File

@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly, core * Routines for ISO/OSI network and transport protocol packet disassembly, core
* bits. * bits.
* *
* $Id: packet-isis.c,v 1.14 2000/08/13 14:08:23 deniel Exp $ * $Id: packet-isis.c,v 1.15 2000/11/19 08:53:58 guy Exp $
* Stuart Stanley <stuarts@mxmail.net> * Stuart Stanley <stuarts@mxmail.net>
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
@ -142,7 +142,7 @@ dissect_isis(const u_char *pd, int offset, frame_data *fd,
OLD_CHECK_DISPLAY_AS_DATA(proto_isis, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_isis, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ISIS"); col_set_str(fd, COL_PROTOCOL, "ISIS");
if (!BYTES_ARE_IN_FRAME(offset, sizeof(*ihdr))) { if (!BYTES_ARE_IN_FRAME(offset, sizeof(*ihdr))) {
isis_dissect_unknown(offset, sizeof(*ihdr), tree, fd, isis_dissect_unknown(offset, sizeof(*ihdr), tree, fd,

4
packet-isl.c
View File

@ -1,7 +1,7 @@
/* packet-isl.c /* packet-isl.c
* Routines for Cisco ISL Ethernet header disassembly * Routines for Cisco ISL Ethernet header disassembly
* *
* $Id: packet-isl.c,v 1.16 2000/11/16 07:35:38 guy Exp $ * $Id: packet-isl.c,v 1.17 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -154,7 +154,7 @@ dissect_isl(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "ISL"); col_set_str(fd, COL_PROTOCOL, "ISL");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "VLAN ID: 0x%04X", pntohs(&pd[offset+20]) >> 1); col_add_fstr(fd, COL_INFO, "VLAN ID: 0x%04X", pntohs(&pd[offset+20]) >> 1);

4
packet-kerberos.c
View File

@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000 * Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu * wjhardaker@ucdavis.edu
* *
* $Id: packet-kerberos.c,v 1.5 2000/11/13 07:18:48 guy Exp $ * $Id: packet-kerberos.c,v 1.6 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -297,7 +297,7 @@ dissect_kerberos(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_kerberos, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_kerberos, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "KRB5"); col_set_str(fd, COL_PROTOCOL, "KRB5");
if (tree) { if (tree) {
item = proto_tree_add_item(tree, proto_kerberos, NullTVB, offset, item = proto_tree_add_item(tree, proto_kerberos, NullTVB, offset,

4
packet-l2tp.c
View File

@ -7,7 +7,7 @@
* Laurent Cazalet <laurent.cazalet@mailclub.net> * Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be> * Thomas Parvais <thomas.parvais@advalvas.be>
* *
* $Id: packet-l2tp.c,v 1.16 2000/11/19 02:00:02 guy Exp $ * $Id: packet-l2tp.c,v 1.17 2000/11/19 08:53:58 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -298,7 +298,7 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "L2TP"; pinfo->current_proto = "L2TP";
if (check_col(pinfo->fd, COL_PROTOCOL)) /* build output for closed L2tp frame displayed */ if (check_col(pinfo->fd, COL_PROTOCOL)) /* build output for closed L2tp frame displayed */
col_add_str(pinfo->fd, COL_PROTOCOL, "L2TP"); col_set_str(pinfo->fd, COL_PROTOCOL, "L2TP");
control = tvb_get_ntohs(tvb, 0); control = tvb_get_ntohs(tvb, 0);

14
packet-lapb.c
View File

@ -2,7 +2,7 @@
* Routines for lapb frame disassembly * Routines for lapb frame disassembly
* Olivier Abad <oabad@cybercable.fr> * Olivier Abad <oabad@cybercable.fr>
* *
* $Id: packet-lapb.c,v 1.22 2000/08/13 14:08:24 deniel Exp $ * $Id: packet-lapb.c,v 1.23 2000/11/19 08:53:59 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -62,19 +62,19 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "LAPB"; pinfo->current_proto = "LAPB";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "LAPB"); col_set_str(pinfo->fd, COL_PROTOCOL, "LAPB");
if (pinfo->pseudo_header->x25.flags & FROM_DCE) { if (pinfo->pseudo_header->x25.flags & FROM_DCE) {
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "DTE"); col_set_str(pinfo->fd, COL_RES_DL_DST, "DTE");
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE");
} }
else { else {
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "DCE"); col_set_str(pinfo->fd, COL_RES_DL_DST, "DCE");
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "DTE");
} }
byte0 = tvb_get_guint8(tvb, 0); byte0 = tvb_get_guint8(tvb, 0);
@ -82,7 +82,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (byte0 != 0x01 && byte0 != 0x03) /* invalid LAPB frame */ if (byte0 != 0x01 && byte0 != 0x03) /* invalid LAPB frame */
{ {
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Invalid LAPB frame"); col_set_str(pinfo->fd, COL_INFO, "Invalid LAPB frame");
if (tree) if (tree)
ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0,
tvb_length(tvb), "Invalid LAPB frame"); tvb_length(tvb), "Invalid LAPB frame");

12
packet-lapd.c
View File

@ -2,7 +2,7 @@
* Routines for LAPD frame disassembly * Routines for LAPD frame disassembly
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-lapd.c,v 1.15 2000/11/16 07:35:38 guy Exp $ * $Id: packet-lapd.c,v 1.16 2000/11/19 08:53:59 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -99,7 +99,7 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "LAPD"; pinfo->current_proto = "LAPD";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "LAPD"); col_set_str(pinfo->fd, COL_PROTOCOL, "LAPD");
address = tvb_get_ntohs(tvb, 0); address = tvb_get_ntohs(tvb, 0);
cr = address & LAPD_CR; cr = address & LAPD_CR;
@ -109,16 +109,16 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (pinfo->pseudo_header->p2p.sent) { if (pinfo->pseudo_header->p2p.sent) {
is_response = cr ? TRUE : FALSE; is_response = cr ? TRUE : FALSE;
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "Network"); col_set_str(pinfo->fd, COL_RES_DL_DST, "Network");
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "User"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "User");
} }
else { else {
is_response = cr ? FALSE : TRUE; is_response = cr ? FALSE : TRUE;
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "User"); col_set_str(pinfo->fd, COL_RES_DL_DST, "User");
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "Network"); col_set_str(pinfo->fd, COL_RES_DL_SRC, "Network");
} }

4
packet-ldap.c
View File

@ -1,7 +1,7 @@
/* packet-ldap.c /* packet-ldap.c
* Routines for ldap packet dissection * Routines for ldap packet dissection
* *
* $Id: packet-ldap.c,v 1.16 2000/08/24 05:40:50 guy Exp $ * $Id: packet-ldap.c,v 1.17 2000/11/19 08:53:59 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -924,7 +924,7 @@ dissect_ldap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (first_time) if (first_time)
{ {
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "LDAP"); col_set_str(fd, COL_PROTOCOL, "LDAP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "MsgId=%u MsgType=%s", col_add_fstr(fd, COL_INFO, "MsgId=%u MsgType=%s",

4
packet-llc.c
View File

@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer * Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-llc.c,v 1.70 2000/11/16 07:35:38 guy Exp $ * $Id: packet-llc.c,v 1.71 2000/11/19 08:53:59 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -284,7 +284,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "LLC"; pinfo->current_proto = "LLC";
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd, COL_PROTOCOL, "LLC"); col_set_str(pinfo->fd, COL_PROTOCOL, "LLC");
} }
dsap = tvb_get_guint8(tvb, 0); dsap = tvb_get_guint8(tvb, 0);

8
packet-lpd.c
View File

@ -2,7 +2,7 @@
* Routines for LPR and LPRng packet disassembly * Routines for LPR and LPRng packet disassembly
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-lpd.c,v 1.22 2000/08/13 14:08:27 deniel Exp $ * $Id: packet-lpd.c,v 1.23 2000/11/19 08:53:59 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -92,16 +92,16 @@ dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "LPD"); col_set_str(fd, COL_PROTOCOL, "LPD");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (lpr_packet_type == request) { if (lpr_packet_type == request) {
col_add_str(fd, COL_INFO, lpd_client_code[pd[offset]]); col_add_str(fd, COL_INFO, lpd_client_code[pd[offset]]);
} }
else if (lpr_packet_type == response) { else if (lpr_packet_type == response) {
col_add_str(fd, COL_INFO, "LPD response"); col_set_str(fd, COL_INFO, "LPD response");
} }
else { else {
col_add_str(fd, COL_INFO, "LPD continuation"); col_set_str(fd, COL_INFO, "LPD continuation");
} }
} }

4
packet-mapi.c
View File

@ -1,7 +1,7 @@
/* packet-mapi.c /* packet-mapi.c
* Routines for MSX mapi packet dissection * Routines for MSX mapi packet dissection
* *
* $Id: packet-mapi.c,v 1.9 2000/08/13 14:08:27 deniel Exp $ * $Id: packet-mapi.c,v 1.10 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -58,7 +58,7 @@ dissect_mapi(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_mapi, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_mapi, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "MAPI"); col_set_str(fd, COL_PROTOCOL, "MAPI");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
{ {

8
packet-mip.c
View File

@ -2,7 +2,7 @@
* Routines for Mobile IP dissection * Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com> * Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
* *
* $Id: packet-mip.c,v 1.8 2000/08/13 14:08:28 deniel Exp $ * $Id: packet-mip.c,v 1.9 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net> * By Gerald Combs <gerald@unicom.net>
@ -153,14 +153,14 @@ dissect_mip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
pinfo->current_proto = "Mobile IP"; pinfo->current_proto = "Mobile IP";
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "mip"); col_set_str(fd, COL_PROTOCOL, "mip");
type = tvb_get_guint8(tvb, 0); type = tvb_get_guint8(tvb, 0);
if (type==1) { if (type==1) {
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "Mobile IP Registration Request"); col_set_str(fd, COL_INFO, "Mobile IP Registration Request");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_mip, tvb, 0, tvb_length(tvb), FALSE); ti = proto_tree_add_item(tree, proto_mip, tvb, 0, tvb_length(tvb), FALSE);
@ -186,7 +186,7 @@ dissect_mip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (type==3){ if (type==3){
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "Mobile IP Registration Reply"); col_set_str(fd, COL_INFO, "Mobile IP Registration Reply");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_mip, tvb, 0, tvb_length(tvb), FALSE); ti = proto_tree_add_item(tree, proto_mip, tvb, 0, tvb_length(tvb), FALSE);

4
packet-mpls.c
View File

@ -3,7 +3,7 @@
* *
* (c) Copyright Ashok Narayanan <ashokn@cisco.com> * (c) Copyright Ashok Narayanan <ashokn@cisco.com>
* *
* $Id: packet-mpls.c,v 1.10 2000/11/18 10:38:24 guy Exp $ * $Id: packet-mpls.c,v 1.11 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -138,7 +138,7 @@ dissect_mpls(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_mpls, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_mpls, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) { if (check_col(fd, COL_PROTOCOL)) {
col_add_str(fd,COL_PROTOCOL, "MPLS"); col_set_str(fd,COL_PROTOCOL, "MPLS");
} }
if (check_col(fd,COL_INFO)) { if (check_col(fd,COL_INFO)) {

6
packet-msproxy.c
View File

@ -2,7 +2,7 @@
* Routines for Microsoft Proxy packet dissection * Routines for Microsoft Proxy packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
* *
* $Id: packet-msproxy.c,v 1.13 2000/11/18 10:38:24 guy Exp $ * $Id: packet-msproxy.c,v 1.14 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -230,7 +230,7 @@ static void msproxy_sub_dissector( const u_char *pd, int offset, frame_data *fd,
redirect_info = (redirect_entry_t*)conversation->data; redirect_info = (redirect_entry_t*)conversation->data;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "MS Proxy"); col_set_str(fd, COL_PROTOCOL, "MS Proxy");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "%s", col_add_fstr(fd, COL_INFO, "%s",
@ -1183,7 +1183,7 @@ static void dissect_msproxy(const u_char *pd, int offset, frame_data *fd, proto_
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "MSproxy"); col_set_str(fd, COL_PROTOCOL, "MSproxy");
/* display packet info */ /* display packet info */

8
packet-nbipx.c
View File

@ -2,7 +2,7 @@
* Routines for NetBIOS over IPX packet disassembly * Routines for NetBIOS over IPX packet disassembly
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-nbipx.c,v 1.28 2000/11/17 21:00:35 gram Exp $ * $Id: packet-nbipx.c,v 1.29 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -120,7 +120,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "NBIPX"; pinfo->current_proto = "NBIPX";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NBIPX"); col_set_str(pinfo->fd, COL_PROTOCOL, "NBIPX");
/* /*
* As said above, we look at the length of the packet to decide * As said above, we look at the length of the packet to decide
@ -303,7 +303,7 @@ dissect_nwlink_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
node_name_type = get_netbios_name(tvb, offset+52, node_name); node_name_type = get_netbios_name(tvb, offset+52, node_name);
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NWLink"); col_set_str(pinfo->fd, COL_PROTOCOL, "NWLink");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
/* /*
@ -344,7 +344,7 @@ dissect_nwlink_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break; break;
default: default:
col_add_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)"); col_set_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)");
break; break;
} }
} }

12
packet-nbns.c
View File

@ -4,7 +4,7 @@
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* Much stuff added by Guy Harris <guy@alum.mit.edu> * Much stuff added by Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-nbns.c,v 1.46 2000/11/14 03:51:41 gram Exp $ * $Id: packet-nbns.c,v 1.47 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1138,11 +1138,11 @@ dissect_nbns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
nbns_data_offset = offset; nbns_data_offset = offset;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NBNS"); col_set_str(fd, COL_PROTOCOL, "NBNS");
if (pi.captured_len < NBNS_HDRLEN) { if (pi.captured_len < NBNS_HDRLEN) {
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_str(fd, COL_INFO, "Short NBNS packet"); col_set_str(fd, COL_INFO, "Short NBNS packet");
} }
old_dissect_data(pd, offset, fd, tree); old_dissect_data(pd, offset, fd, tree);
return; return;
@ -1325,7 +1325,7 @@ dissect_nbdgm(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NBDS"); col_set_str(fd, COL_PROTOCOL, "NBDS");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "%s", message[message_index]); col_add_fstr(fd, COL_INFO, "%s", message[message_index]);
} }
@ -1635,7 +1635,7 @@ dissect_nbss(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
(memcmp(pd + offset + 4, "\377SMB", 4) != 0))) { (memcmp(pd + offset + 4, "\377SMB", 4) != 0))) {
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NBSS"); col_set_str(fd, COL_PROTOCOL, "NBSS");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "NBSS Continuation Message"); col_add_fstr(fd, COL_INFO, "NBSS Continuation Message");
} }
@ -1648,7 +1648,7 @@ dissect_nbss(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
#endif #endif
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NBSS"); col_set_str(fd, COL_PROTOCOL, "NBSS");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, col_add_fstr(fd, COL_INFO,
val_to_str(msg_type, message_types, "Unknown (%x)")); val_to_str(msg_type, message_types, "Unknown (%x)"));

4
packet-ncp.c
View File

@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net> * Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
* *
* $Id: packet-ncp.c,v 1.40 2000/08/13 14:08:31 deniel Exp $ * $Id: packet-ncp.c,v 1.41 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -263,7 +263,7 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "NCP"; pinfo->current_proto = "NCP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NCP"); col_set_str(pinfo->fd, COL_PROTOCOL, "NCP");
if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) {
ncpiph.signature = tvb_get_ntohl(tvb, 0); ncpiph.signature = tvb_get_ntohl(tvb, 0);

6
packet-netbios.c
View File

@ -5,7 +5,7 @@
* *
* derived from the packet-nbns.c * derived from the packet-nbns.c
* *
* $Id: packet-netbios.c,v 1.25 2000/11/13 03:52:16 gerald Exp $ * $Id: packet-netbios.c,v 1.26 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -995,7 +995,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* load the display labels */ /* load the display labels */
pinfo->current_proto = "NetBIOS"; pinfo->current_proto = "NetBIOS";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NetBIOS"); col_set_str(pinfo->fd, COL_PROTOCOL, "NetBIOS");
/* Find NetBIOS marker EFFF, this is done because I have seen an extra LLC */ /* Find NetBIOS marker EFFF, this is done because I have seen an extra LLC */
@ -1006,7 +1006,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ( 0xefff != tvb_get_letohs(tvb, 3)){ if ( 0xefff != tvb_get_letohs(tvb, 3)){
if (check_col( pinfo->fd, COL_INFO)) /* print bad packet */ if (check_col( pinfo->fd, COL_INFO)) /* print bad packet */
col_add_str( pinfo->fd, COL_INFO, "Bad packet, no 0xEFFF marker"); col_set_str( pinfo->fd, COL_INFO, "Bad packet, no 0xEFFF marker");
return; /* this is an unknow packet, no marker */ return; /* this is an unknow packet, no marker */
} }

4
packet-nntp.c
View File

@ -2,7 +2,7 @@
* Routines for nntp packet dissection * Routines for nntp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-nntp.c,v 1.15 2000/11/13 08:58:05 guy Exp $ * $Id: packet-nntp.c,v 1.16 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -71,7 +71,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "NNTP"; pinfo->current_proto = "NNTP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "NNTP"); col_set_str(pinfo->fd, COL_PROTOCOL, "NNTP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
/* /*

6
packet-ntp.c
View File

@ -2,7 +2,7 @@
* Routines for NTP packet dissection * Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu> * Copyright 1999, Nathan Neulinger <nneul@umr.edu>
* *
* $Id: packet-ntp.c,v 1.17 2000/11/17 05:25:59 guy Exp $ * $Id: packet-ntp.c,v 1.18 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -248,10 +248,10 @@ dissect_ntp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
pkt = (struct ntp_packet *) &pd[offset]; pkt = (struct ntp_packet *) &pd[offset];
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NTP"); col_set_str(fd, COL_PROTOCOL, "NTP");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "NTP"); col_set_str(fd, COL_INFO, "NTP");
if (tree) { if (tree) {
/* Adding NTP item and subtree */ /* Adding NTP item and subtree */

10
packet-null.c
View File

@ -1,7 +1,7 @@
/* packet-null.c /* packet-null.c
* Routines for null packet disassembly * Routines for null packet disassembly
* *
* $Id: packet-null.c,v 1.33 2000/11/19 02:00:02 guy Exp $ * $Id: packet-null.c,v 1.34 2000/11/19 08:54:00 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -233,13 +233,13 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* load the top pane info. This should be overwritten by /* load the top pane info. This should be overwritten by
the next protocol in the stack */ the next protocol in the stack */
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "N/A" ); col_set_str(pinfo->fd, COL_PROTOCOL, "N/A" );
if(check_col(pinfo->fd, COL_INFO)) if(check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Null/Loopback" ); col_set_str(pinfo->fd, COL_INFO, "Null/Loopback" );
/* /*
* Treat it as a normal DLT_NULL header. * Treat it as a normal DLT_NULL header.

8
packet-osi.c
View File

@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly * Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions * Main entrance point and common functions
* *
* $Id: packet-osi.c,v 1.37 2000/11/19 04:14:26 guy Exp $ * $Id: packet-osi.c,v 1.38 2000/11/19 08:54:00 guy Exp $
* Laurent Deniel <deniel@worldnet.fr> * Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de> * Ralf Schneider <Ralf.Schneider@t-online.de>
* *
@ -243,19 +243,19 @@ void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case NLPID_ISO9542X25_ESIS: case NLPID_ISO9542X25_ESIS:
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd, COL_PROTOCOL, "ESIS (X.25)"); col_set_str(pinfo->fd, COL_PROTOCOL, "ESIS (X.25)");
} }
dissect_data(tvb, 0, pinfo, tree); dissect_data(tvb, 0, pinfo, tree);
break; break;
case NLPID_ISO10747_IDRP: case NLPID_ISO10747_IDRP:
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd, COL_PROTOCOL, "IDRP"); col_set_str(pinfo->fd, COL_PROTOCOL, "IDRP");
} }
dissect_data(tvb, 0, pinfo, tree); dissect_data(tvb, 0, pinfo, tree);
break; break;
default: default:
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd, COL_PROTOCOL, "ISO"); col_set_str(pinfo->fd, COL_PROTOCOL, "ISO");
} }
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "Unknown ISO protocol (%02x)", nlpid); col_add_fstr(pinfo->fd, COL_INFO, "Unknown ISO protocol (%02x)", nlpid);

4
packet-ospf.c
View File

@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly * Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org> * (c) Copyright Hannes R. Boehm <hannes@boehm.org>
* *
* $Id: packet-ospf.c,v 1.28 2000/09/13 07:47:09 guy Exp $ * $Id: packet-ospf.c,v 1.29 2000/11/19 08:54:01 guy Exp $
* *
* At this time, this module is able to analyze OSPF * At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other * packets as specified in RFC2328. MOSPF (RFC1584) and other
@ -104,7 +104,7 @@ dissect_ospf(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
packet_type = match_strval(ospfh.packet_type, pt_vals); packet_type = match_strval(ospfh.packet_type, pt_vals);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "OSPF"); col_set_str(fd, COL_PROTOCOL, "OSPF");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (packet_type != NULL) if (packet_type != NULL)
col_add_str(fd, COL_INFO, packet_type); col_add_str(fd, COL_INFO, packet_type);

6
packet-pop.c
View File

@ -2,7 +2,7 @@
* Routines for pop packet dissection * Routines for pop packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-pop.c,v 1.20 2000/11/16 07:35:38 guy Exp $ * $Id: packet-pop.c,v 1.21 2000/11/19 08:54:01 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -73,7 +73,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "POP"; pinfo->current_proto = "POP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "POP"); col_set_str(pinfo->fd, COL_PROTOCOL, "POP");
/* /*
* Find the end of the first line. * Find the end of the first line.
@ -97,7 +97,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* Otherwise, just call it a continuation. * Otherwise, just call it a continuation.
*/ */
if (is_continuation) if (is_continuation)
col_add_str(pinfo->fd, COL_INFO, "Continuation"); col_set_str(pinfo->fd, COL_INFO, "Continuation");
else else
col_add_fstr(pinfo->fd, COL_INFO, "%s: %s", col_add_fstr(pinfo->fd, COL_INFO, "%s: %s",
is_request ? "Request" : "Response", is_request ? "Request" : "Response",

8
packet-ppp.c
View File

@ -1,7 +1,7 @@
/* packet-ppp.c /* packet-ppp.c
* Routines for ppp packet disassembly * Routines for ppp packet disassembly
* *
* $Id: packet-ppp.c,v 1.43 2000/11/19 02:03:00 guy Exp $ * $Id: packet-ppp.c,v 1.44 2000/11/19 08:54:01 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1138,11 +1138,11 @@ dissect_ppp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
the next protocol in the stack */ the next protocol in the stack */
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "PPP" ); col_set_str(pinfo->fd, COL_PROTOCOL, "PPP" );
if(tree) { if(tree) {
ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, 4, FALSE); ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, 4, FALSE);

6
packet-pppoe.c
View File

@ -1,7 +1,7 @@
/* packet-pppoe.c /* packet-pppoe.c
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516) * Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
* *
* $Id: packet-pppoe.c,v 1.12 2000/11/19 02:00:03 guy Exp $ * $Id: packet-pppoe.c,v 1.13 2000/11/19 08:54:02 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -170,7 +170,7 @@ dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
pppoe_length = tvb_get_ntohs(tvb, 4); pppoe_length = tvb_get_ntohs(tvb, 4);
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd,COL_PROTOCOL, "PPPoED"); col_set_str(pinfo->fd,COL_PROTOCOL, "PPPoED");
} }
if (check_col(pinfo->fd,COL_INFO)) { if (check_col(pinfo->fd,COL_INFO)) {
@ -219,7 +219,7 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
pppoe_length = tvb_get_ntohs(tvb, 4); pppoe_length = tvb_get_ntohs(tvb, 4);
if (check_col(pinfo->fd, COL_PROTOCOL)) { if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_add_str(pinfo->fd,COL_PROTOCOL, "PPPoES"); col_set_str(pinfo->fd,COL_PROTOCOL, "PPPoES");
} }
if (check_col(pinfo->fd,COL_INFO)) { if (check_col(pinfo->fd,COL_INFO)) {

4
packet-pptp.c
View File

@ -2,7 +2,7 @@
* Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637) * Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
* *
* $Id: packet-pptp.c,v 1.12 2000/08/25 12:30:30 deniel Exp $ * $Id: packet-pptp.c,v 1.13 2000/11/19 08:54:02 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -393,7 +393,7 @@ dissect_pptp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
OLD_CHECK_DISPLAY_AS_DATA(proto_pptp, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_pptp, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "PPTP"); col_set_str(fd, COL_PROTOCOL, "PPTP");
len = pntohs(&hdr->len); len = pntohs(&hdr->len);
cntrl_type = pntohs(&hdr->cntrl_type); cntrl_type = pntohs(&hdr->cntrl_type);

4
packet-q2931.c
View File

@ -2,7 +2,7 @@
* Routines for Q.2931 frame disassembly * Routines for Q.2931 frame disassembly
* Guy Harris <guy@alum.mit.edu> * Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-q2931.c,v 1.12 2000/11/13 07:18:53 guy Exp $ * $Id: packet-q2931.c,v 1.13 2000/11/19 08:54:03 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1993,7 +1993,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "Q.2931"; pinfo->current_proto = "Q.2931";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "Q.2931"); col_set_str(pinfo->fd, COL_PROTOCOL, "Q.2931");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_q2931, tvb, offset, ti = proto_tree_add_item(tree, proto_q2931, tvb, offset,

4
packet-q931.c
View File

@ -2,7 +2,7 @@
* Routines for Q.931 frame disassembly * Routines for Q.931 frame disassembly
* Guy Harris <guy@alum.mit.edu> * Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-q931.c,v 1.20 2000/11/13 07:18:56 guy Exp $ * $Id: packet-q931.c,v 1.21 2000/11/19 08:54:03 guy Exp $
* *
* Modified by Andreas Sikkema for possible use with H.323 * Modified by Andreas Sikkema for possible use with H.323
* *
@ -2218,7 +2218,7 @@ q931_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "Q.931"); col_set_str(pinfo->fd, COL_PROTOCOL, "Q.931");
if (tree) { if (tree) {
ti = proto_tree_add_item(tree, proto_q931, tvb, offset, ti = proto_tree_add_item(tree, proto_q931, tvb, offset,

4
packet-quake.c
View File

@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com> * Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip * http://www.idsoftware.com/q1source/q1source.zip
* *
* $Id: packet-quake.c,v 1.8 2000/11/16 07:35:38 guy Exp $ * $Id: packet-quake.c,v 1.9 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -525,7 +525,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
length &= NETFLAG_LENGTH_MASK; length &= NETFLAG_LENGTH_MASK;
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "QUAKE"); col_set_str(pinfo->fd, COL_PROTOCOL, "QUAKE");
if (tree) { if (tree) {
quake_item = proto_tree_add_item(tree, proto_quake, quake_item = proto_tree_add_item(tree, proto_quake,

4
packet-radius.c
View File

@ -1,7 +1,7 @@
/* packet-radius.c /* packet-radius.c
* Routines for RADIUS packet disassembly * Routines for RADIUS packet disassembly
* *
* $Id: packet-radius.c,v 1.18 2000/11/17 21:00:35 gram Exp $ * $Id: packet-radius.c,v 1.19 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Johan Feyaerts * By Johan Feyaerts
@ -695,7 +695,7 @@ proto_tree
codestrval="Unknown Packet"; codestrval="Unknown Packet";
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "RADIUS"); col_set_str(fd, COL_PROTOCOL, "RADIUS");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
{ {
sprintf(textbuffer,"%s(%d) (id=%d, l=%d)", sprintf(textbuffer,"%s(%d) (id=%d, l=%d)",

10
packet-raw.c
View File

@ -1,7 +1,7 @@
/* packet-raw.c /* packet-raw.c
* Routines for raw packet disassembly * Routines for raw packet disassembly
* *
* $Id: packet-raw.c,v 1.21 2000/11/19 02:00:03 guy Exp $ * $Id: packet-raw.c,v 1.22 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -89,13 +89,13 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* load the top pane info. This should be overwritten by /* load the top pane info. This should be overwritten by
the next protocol in the stack */ the next protocol in the stack */
if(check_col(pinfo->fd, COL_RES_DL_SRC)) if(check_col(pinfo->fd, COL_RES_DL_SRC))
col_add_str(pinfo->fd, COL_RES_DL_SRC, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
if(check_col(pinfo->fd, COL_RES_DL_DST)) if(check_col(pinfo->fd, COL_RES_DL_DST))
col_add_str(pinfo->fd, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->fd, COL_PROTOCOL)) if(check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "N/A" ); col_set_str(pinfo->fd, COL_PROTOCOL, "N/A" );
if(check_col(pinfo->fd, COL_INFO)) if(check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, "Raw packet data" ); col_set_str(pinfo->fd, COL_INFO, "Raw packet data" );
/* populate a tree in the second pane with the status of the link /* populate a tree in the second pane with the status of the link
layer (ie none) */ layer (ie none) */

4
packet-rlogin.c
View File

@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection * Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
* *
* $Id: packet-rlogin.c,v 1.10 2000/10/21 05:52:21 guy Exp $ * $Id: packet-rlogin.c,v 1.11 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -386,7 +386,7 @@ dissect_rlogin(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
} }
if (check_col(fd, COL_PROTOCOL)) /* update protocol */ if (check_col(fd, COL_PROTOCOL)) /* update protocol */
col_add_str(fd, COL_PROTOCOL, "Rlogin"); col_set_str(fd, COL_PROTOCOL, "Rlogin");
if (check_col(fd, COL_INFO)){ /* display packet info*/ if (check_col(fd, COL_INFO)){ /* display packet info*/

4
packet-rpc.c
View File

@ -2,7 +2,7 @@
* Routines for rpc dissection * Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
* *
* $Id: packet-rpc.c,v 1.42 2000/10/21 05:52:21 guy Exp $ * $Id: packet-rpc.c,v 1.43 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1158,7 +1158,7 @@ dissect_rpc( const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
} }
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "RPC"); col_set_str(fd, COL_PROTOCOL, "RPC");
if (tree) { if (tree) {
rpc_item = proto_tree_add_item(tree, proto_rpc, NullTVB, offset, END_OF_FRAME, FALSE); rpc_item = proto_tree_add_item(tree, proto_rpc, NullTVB, offset, END_OF_FRAME, FALSE);

4
packet-rsh.c
View File

@ -4,7 +4,7 @@
* Robert Tsai <rtsai@netapp.com> * Robert Tsai <rtsai@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-rsh.c,v 1.6 2000/11/13 08:58:08 guy Exp $ * $Id: packet-rsh.c,v 1.7 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -62,7 +62,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "RSH"; pinfo->current_proto = "RSH";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "RSH"); col_set_str(pinfo->fd, COL_PROTOCOL, "RSH");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
/* Put the first line from the buffer into the summary. */ /* Put the first line from the buffer into the summary. */
tvb_find_line_end(tvb, offset, -1, &next_offset); tvb_find_line_end(tvb, offset, -1, &next_offset);

4
packet-rsvp.c
View File

@ -3,7 +3,7 @@
* *
* (c) Copyright Ashok Narayanan <ashokn@cisco.com> * (c) Copyright Ashok Narayanan <ashokn@cisco.com>
* *
* $Id: packet-rsvp.c,v 1.27 2000/08/13 14:07:58 deniel Exp $ * $Id: packet-rsvp.c,v 1.28 2000/11/19 08:54:04 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -852,7 +852,7 @@ dissect_rsvp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
hdr = (rsvp_header *)&pd[offset]; hdr = (rsvp_header *)&pd[offset];
packet_type = match_strval(hdr->message_type, message_type_vals); packet_type = match_strval(hdr->message_type, message_type_vals);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "RSVP"); col_set_str(fd, COL_PROTOCOL, "RSVP");
if (check_col(fd, COL_INFO)) { if (check_col(fd, COL_INFO)) {
if (packet_type != NULL) if (packet_type != NULL)
col_add_str(fd, COL_INFO, packet_type); col_add_str(fd, COL_INFO, packet_type);

18
packet-rtcp.c
View File

@ -633,7 +633,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
pinfo->current_proto = "RTCP"; pinfo->current_proto = "RTCP";
if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { if ( check_col( pinfo->fd, COL_PROTOCOL ) ) {
col_add_str( pinfo->fd, COL_PROTOCOL, "RTCP" ); col_set_str( pinfo->fd, COL_PROTOCOL, "RTCP" );
} }
if ( check_col( pinfo->fd, COL_INFO) ) { if ( check_col( pinfo->fd, COL_INFO) ) {
@ -641,28 +641,28 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
/* switch ( pd[ offset + 1 ] ) { */ /* switch ( pd[ offset + 1 ] ) { */
switch ( tvb_get_guint8( tvb, 1 ) ) { switch ( tvb_get_guint8( tvb, 1 ) ) {
case RTCP_SR: case RTCP_SR:
col_add_str( pinfo->fd, COL_INFO, "Sender Report"); col_set_str( pinfo->fd, COL_INFO, "Sender Report");
break; break;
case RTCP_RR: case RTCP_RR:
col_add_str( pinfo->fd, COL_INFO, "Receiver Report"); col_set_str( pinfo->fd, COL_INFO, "Receiver Report");
break; break;
case RTCP_SDES: case RTCP_SDES:
col_add_str( pinfo->fd, COL_INFO, "Source Description"); col_set_str( pinfo->fd, COL_INFO, "Source Description");
break; break;
case RTCP_BYE: case RTCP_BYE:
col_add_str( pinfo->fd, COL_INFO, "Goodbye"); col_set_str( pinfo->fd, COL_INFO, "Goodbye");
break; break;
case RTCP_APP: case RTCP_APP:
col_add_str( pinfo->fd, COL_INFO, "Application defined"); col_set_str( pinfo->fd, COL_INFO, "Application defined");
break; break;
case RTCP_FIR: case RTCP_FIR:
col_add_str( pinfo->fd, COL_INFO, "Full Intra-frame Request (H.261)"); col_set_str( pinfo->fd, COL_INFO, "Full Intra-frame Request (H.261)");
break; break;
case RTCP_NACK: case RTCP_NACK:
col_add_str( pinfo->fd, COL_INFO, "Negative Acknowledgement (H.261)"); col_set_str( pinfo->fd, COL_INFO, "Negative Acknowledgement (H.261)");
break; break;
default: default:
col_add_str( pinfo->fd, COL_INFO, "Unknown packet type"); col_set_str( pinfo->fd, COL_INFO, "Unknown packet type");
break; break;
} }
} }

2
packet-rtp.c
View File

@ -307,7 +307,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
sync_src = tvb_get_ntohl( tvb, offset + 8 ); sync_src = tvb_get_ntohl( tvb, offset + 8 );
if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { if ( check_col( pinfo->fd, COL_PROTOCOL ) ) {
col_add_str( pinfo->fd, COL_PROTOCOL, "RTP" ); col_set_str( pinfo->fd, COL_PROTOCOL, "RTP" );
} }
if ( check_col( pinfo->fd, COL_INFO) ) { if ( check_col( pinfo->fd, COL_INFO) ) {

6
packet-rtsp.c
View File

@ -4,7 +4,7 @@
* Jason Lango <jal@netapp.com> * Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-rtsp.c,v 1.26 2000/11/15 07:07:43 guy Exp $ * $Id: packet-rtsp.c,v 1.27 2000/11/19 08:54:05 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -207,7 +207,7 @@ dissect_rtsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "RTSP"); col_set_str(pinfo->fd, COL_PROTOCOL, "RTSP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
/* /*
* Put the first line from the buffer into the summary * Put the first line from the buffer into the summary
@ -226,7 +226,7 @@ dissect_rtsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break; break;
default: default:
col_add_str(pinfo->fd, COL_INFO, "Continuation"); col_set_str(pinfo->fd, COL_INFO, "Continuation");
break; break;
} }
} }

4
packet-rx.c
View File

@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by * Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil> * Ken Hornstein <kenh@cmf.nrl.navy.mil>
* *
* $Id: packet-rx.c,v 1.14 2000/08/13 14:08:44 deniel Exp $ * $Id: packet-rx.c,v 1.15 2000/11/19 08:54:05 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -112,7 +112,7 @@ dissect_rx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
return; return;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "RX"); col_set_str(fd, COL_PROTOCOL, "RX");
if (tree) { if (tree) {

4
packet-sap.c
View File

@ -4,7 +4,7 @@
* *
* Heikki Vatiainen <hessu@cs.tut.fi> * Heikki Vatiainen <hessu@cs.tut.fi>
* *
* $Id: packet-sap.c,v 1.14 2000/11/15 07:07:43 guy Exp $ * $Id: packet-sap.c,v 1.15 2000/11/19 08:54:05 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -155,7 +155,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "SAP"; pinfo->current_proto = "SAP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SAP"); col_set_str(pinfo->fd, COL_PROTOCOL, "SAP");
if (check_col(pinfo->fd, COL_INFO)) { if (check_col(pinfo->fd, COL_INFO)) {
col_add_fstr(pinfo->fd, COL_INFO, "%s (v%u)", col_add_fstr(pinfo->fd, COL_INFO, "%s (v%u)",

4
packet-sctp.c
View File

@ -2,7 +2,7 @@
* Routines for Stream Control Transmission Protocol dissection * Routines for Stream Control Transmission Protocol dissection
* Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de> * Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
* *
* $Id: packet-sctp.c,v 1.6 2000/08/19 08:37:36 guy Exp $ * $Id: packet-sctp.c,v 1.7 2000/11/19 08:54:05 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net> * By Gerald Combs <gerald@unicom.net>
@ -1523,7 +1523,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* make entry in the Protocol column on summary display */ /* make entry in the Protocol column on summary display */
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SCTP"); col_set_str(pinfo->fd, COL_PROTOCOL, "SCTP");
/* Make entries in Info column on summary display */ /* Make entries in Info column on summary display */
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))

4
packet-sip.c
View File

@ -7,7 +7,7 @@
* *
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
* *
* $Id: packet-sip.c,v 1.7 2000/11/18 16:56:31 gram Exp $ * $Id: packet-sip.c,v 1.8 2000/11/19 08:54:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -79,7 +79,7 @@ static void dissect_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->current_proto = "SIP"; pinfo->current_proto = "SIP";
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SIP"); col_set_str(pinfo->fd, COL_PROTOCOL, "SIP");
offset = 0; offset = 0;
is_request = sip_is_request(tvb, 0); is_request = sip_is_request(tvb, 0);

6
packet-smb-browse.c
View File

@ -2,7 +2,7 @@
* Routines for smb packet dissection * Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-smb-browse.c,v 1.5 2000/08/13 14:08:48 deniel Exp $ * $Id: packet-smb-browse.c,v 1.6 2000/11/19 08:54:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -154,10 +154,10 @@ dissect_mailslot_browse(const u_char *pd, int offset, frame_data *fd, proto_tree
return 0; return 0;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "BROWSER"); col_set_str(fd, COL_PROTOCOL, "BROWSER");
if (check_col(fd, COL_INFO)) /* Put in something, and replace it later */ if (check_col(fd, COL_INFO)) /* Put in something, and replace it later */
col_add_str(fd, COL_INFO, "Browse Announcement"); col_set_str(fd, COL_INFO, "Browse Announcement");
/* /*
* Now, decode the browse request * Now, decode the browse request

4
packet-smb-logon.c
View File

@ -2,7 +2,7 @@
* Routines for smb net logon packet dissection * Routines for smb net logon packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
* *
* $Id: packet-smb-logon.c,v 1.9 2000/10/31 09:41:07 sharpe Exp $ * $Id: packet-smb-logon.c,v 1.10 2000/11/19 08:54:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -533,7 +533,7 @@ static void (*dissect_smb_logon_cmds[])(const u_char *, int, frame_data *,
cmd = MIN( GBYTE(pd, offset), array_length(dissect_smb_logon_cmds)-1); cmd = MIN( GBYTE(pd, offset), array_length(dissect_smb_logon_cmds)-1);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "NETLOGON"); col_set_str(fd, COL_PROTOCOL, "NETLOGON");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))

4
packet-smb-mailslot.c
View File

@ -2,7 +2,7 @@
* Routines for smb mailslot packet dissection * Routines for smb mailslot packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
* *
* $Id: packet-smb-mailslot.c,v 1.6 2000/08/13 14:08:49 deniel Exp $ * $Id: packet-smb-mailslot.c,v 1.7 2000/11/19 08:54:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -85,7 +85,7 @@ dissect_mailslot_smb(const u_char *pd, int offset, frame_data *fd,
Temp16 = GSHORT(pd, offset); /* get Op code */ Temp16 = GSHORT(pd, offset); /* get Op code */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "SMB Mailslot"); col_set_str(fd, COL_PROTOCOL, "SMB Mailslot");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "%s", col_add_fstr(fd, COL_INFO, "%s",

4
packet-smb.c
View File

@ -2,7 +2,7 @@
* Routines for smb packet dissection * Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* *
* $Id: packet-smb.c,v 1.73 2000/10/21 05:52:22 guy Exp $ * $Id: packet-smb.c,v 1.74 2000/11/19 08:54:06 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -10603,7 +10603,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
cmd = pd[offset + SMB_hdr_com_offset]; cmd = pd[offset + SMB_hdr_com_offset];
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "SMB"); col_set_str(fd, COL_PROTOCOL, "SMB");
/* Hmmm, poor coding here ... Also, should check the type */ /* Hmmm, poor coding here ... Also, should check the type */

6
packet-smtp.c
View File

@ -1,7 +1,7 @@
/* packet-smtp.c /* packet-smtp.c
* Routines for SMTP packet disassembly * Routines for SMTP packet disassembly
* *
* $Id: packet-smtp.c,v 1.11 2000/11/13 08:58:13 guy Exp $ * $Id: packet-smtp.c,v 1.12 2000/11/19 08:54:07 guy Exp $
* *
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* *
@ -364,7 +364,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/ */
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SMTP"); col_set_str(pinfo->fd, COL_PROTOCOL, "SMTP");
if (check_col(pinfo->fd, COL_INFO)) { /* Add the appropriate type here */ if (check_col(pinfo->fd, COL_INFO)) { /* Add the appropriate type here */
@ -380,7 +380,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (frame_data->pdu_type) { switch (frame_data->pdu_type) {
case SMTP_PDU_MESSAGE: case SMTP_PDU_MESSAGE:
col_add_str(pinfo->fd, COL_INFO, "Message Body"); col_set_str(pinfo->fd, COL_INFO, "Message Body");
break; break;
case SMTP_PDU_EOM: case SMTP_PDU_EOM:

4
packet-sna.c
View File

@ -2,7 +2,7 @@
* Routines for SNA * Routines for SNA
* Gilbert Ramirez <gram@xiexie.org> * Gilbert Ramirez <gram@xiexie.org>
* *
* $Id: packet-sna.c,v 1.18 2000/08/13 14:08:58 deniel Exp $ * $Id: packet-sna.c,v 1.19 2000/11/19 08:54:07 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -326,7 +326,7 @@ dissect_sna(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
/* Summary information */ /* Summary information */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "SNA"); col_set_str(fd, COL_PROTOCOL, "SNA");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, val_to_str(th_fid, sna_th_fid_vals, "Unknown FID: %01x")); col_add_str(fd, COL_INFO, val_to_str(th_fid, sna_th_fid_vals, "Unknown FID: %01x"));

6
packet-snmp.c
View File

@ -2,7 +2,7 @@
* Routines for SNMP (simple network management protocol) * Routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998 * D.Jorand (c) 1998
* *
* $Id: packet-snmp.c,v 1.52 2000/11/13 07:18:59 guy Exp $ * $Id: packet-snmp.c,v 1.53 2000/11/19 08:54:07 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -1563,7 +1563,7 @@ dissect_snmp_pdu(const u_char *pd, int offset, frame_data *fd,
"Encrypted PDU (%d bytes)", length); "Encrypted PDU (%d bytes)", length);
g_free(cryptpdu); g_free(cryptpdu);
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, "Encrypted PDU"); col_set_str(fd, COL_INFO, "Encrypted PDU");
return; return;
} }
ret = asn1_sequence_decode(&asn1, &global_length, &length); ret = asn1_sequence_decode(&asn1, &global_length, &length);
@ -1660,7 +1660,7 @@ dissect_smux_pdu(const u_char *pd, int offset, frame_data *fd,
guint cls, con; guint cls, con;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "SMUX"); col_set_str(fd, COL_PROTOCOL, "SMUX");
if (tree) { if (tree) {
item = proto_tree_add_item(tree, proto, NullTVB, offset, item = proto_tree_add_item(tree, proto, NullTVB, offset,

8
packet-socks.c
View File

@ -2,7 +2,7 @@
* Routines for socks versions 4 &5 packet dissection * Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
* *
* $Id: packet-socks.c,v 1.14 2000/11/18 10:38:25 guy Exp $ * $Id: packet-socks.c,v 1.15 2000/11/19 08:54:08 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -376,7 +376,7 @@ static void socks_udp_dissector( const u_char *pd, int offset, frame_data *fd,
hash_info = (socks_hash_entry_t*)conversation->data; hash_info = (socks_hash_entry_t*)conversation->data;
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "Socks"); col_set_str(fd, COL_PROTOCOL, "Socks");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "Version: 5, UDP Associated packet"); col_add_fstr(fd, COL_INFO, "Version: 5, UDP Associated packet");
@ -985,7 +985,7 @@ dissect_socks(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
/* display summary window information */ /* display summary window information */
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "Socks"); col_set_str(fd, COL_PROTOCOL, "Socks");
if (check_col(fd, COL_INFO)){ if (check_col(fd, COL_INFO)){
if (( hash_info->version == 4) || ( hash_info->version == 5)){ if (( hash_info->version == 4) || ( hash_info->version == 5)){
@ -993,7 +993,7 @@ dissect_socks(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
hash_info->version); hash_info->version);
} }
else /* unknown version display error */ else /* unknown version display error */
col_add_str(fd, COL_INFO, "Unknown"); col_set_str(fd, COL_INFO, "Unknown");
if ( hash_info->command == PING_COMMAND) if ( hash_info->command == PING_COMMAND)

4
packet-srvloc.c
View File

@ -6,7 +6,7 @@
* In particular I have not had an opportunity to see how it * In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP. * responds to SRVLOC over TCP.
* *
* $Id: packet-srvloc.c,v 1.15 2000/09/11 16:16:08 gram Exp $ * $Id: packet-srvloc.c,v 1.16 2000/11/19 08:54:08 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -186,7 +186,7 @@ dissect_srvloc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
OLD_CHECK_DISPLAY_AS_DATA(proto_srvloc, pd, offset, fd, tree); OLD_CHECK_DISPLAY_AS_DATA(proto_srvloc, pd, offset, fd, tree);
if (check_col(fd, COL_PROTOCOL)) if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "SRVLOC"); col_set_str(fd, COL_PROTOCOL, "SRVLOC");
if (check_col(fd, COL_INFO)) if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, val_to_str(pd[offset + 1], srvloc_functions, "Unknown Function (%d)")); col_add_str(fd, COL_INFO, val_to_str(pd[offset + 1], srvloc_functions, "Unknown Function (%d)"));

4
packet-sscop.c
View File

@ -2,7 +2,7 @@
* Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly
* Guy Harris <guy@alum.mit.edu> * Guy Harris <guy@alum.mit.edu>
* *
* $Id: packet-sscop.c,v 1.11 2000/11/16 07:35:38 guy Exp $ * $Id: packet-sscop.c,v 1.12 2000/11/19 08:54:09 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -152,7 +152,7 @@ dissect_sscop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
sscop_pdu_type = tvb_get_guint8(tvb, SSCOP_PDU_TYPE); sscop_pdu_type = tvb_get_guint8(tvb, SSCOP_PDU_TYPE);
pdu_type = sscop_pdu_type & SSCOP_TYPE_MASK; pdu_type = sscop_pdu_type & SSCOP_TYPE_MASK;
if (check_col(pinfo->fd, COL_PROTOCOL)) if (check_col(pinfo->fd, COL_PROTOCOL))
col_add_str(pinfo->fd, COL_PROTOCOL, "SSCOP"); col_set_str(pinfo->fd, COL_PROTOCOL, "SSCOP");
if (check_col(pinfo->fd, COL_INFO)) if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, val_to_str(pdu_type, sscop_type_vals, col_add_str(pinfo->fd, COL_INFO, val_to_str(pdu_type, sscop_type_vals,
"Unknown PDU type (0x%02x)")); "Unknown PDU type (0x%02x)"));

Some files were not shown because too many files have changed in this diff Show More