diff --git a/epan/packet.c b/epan/packet.c index 5c00e4b922..bccae296d2 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * 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 * By Gerald Combs @@ -530,6 +530,18 @@ check_col(frame_data *fd, gint el) { 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. */ void 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); for (i = 0; i < fd->cinfo->num_cols; i++) { 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 col_add_str(frame_data *fd, gint el, const gchar* str) { 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++) { if (fd->cinfo->fmt_matx[i][el]) { - strncpy(fd->cinfo->col_data[i], str, max_len); - fd->cinfo->col_data[i][max_len - 1] = 0; + strncpy(fd->cinfo->col_buf[i], str, max_len); + 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); for (i = 0; i < fd->cinfo->num_cols; i++) { if (fd->cinfo->fmt_matx[i][el]) { - len = strlen(fd->cinfo->col_data[i]); - vsnprintf(&fd->cinfo->col_data[i][len], max_len - len, format, ap); + if (fd->cinfo->col_data[i] != fd->cinfo->col_buf[i]) { + /* 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++) { if (fd->cinfo->fmt_matx[i][el]) { - len = strlen(fd->cinfo->col_data[i]); - strncat(fd->cinfo->col_data[i], str, max_len - len); - fd->cinfo->col_data[i][max_len - 1] = 0; + if (fd->cinfo->col_data[i] != fd->cinfo->col_buf[i]) { + /* 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]); + 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; 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_min, tmp->tm_sec, (long)fd->abs_usecs/100); + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; } static void @@ -633,7 +664,7 @@ col_set_abs_date_time(frame_data *fd, int col) then = fd->abs_secs; 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", tmp->tm_year + 1900, tmp->tm_mon + 1, @@ -642,20 +673,23 @@ col_set_abs_date_time(frame_data *fd, int col) tmp->tm_min, tmp->tm_sec, (long)fd->abs_usecs/100); + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; } static void 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->cinfo->col_data[col] = fd->cinfo->col_buf[col]; } static void 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->cinfo->col_data[col] = fd->cinfo->col_buf[col]; } /* 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: 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 - 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; case AT_IPv4: memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr); 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 - 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; case AT_IPv6: memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr); 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 - 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; 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); + fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; break; case AT_SNA: switch (addr->len) { 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; 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])); break; case 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); break; } + fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; break; case AT_ATALK: 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); + fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; break; 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); + fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; break; default: break; } - fd->cinfo->col_data[col][COL_MAX_LEN - 1] = '\0'; } static void @@ -770,29 +817,30 @@ col_set_port(frame_data *fd, int col, port_type ptype, guint32 port, case PT_SCTP: 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 - snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); + snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port); break; case PT_TCP: 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 - snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); + snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port); break; case PT_UDP: 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 - snprintf(fd->cinfo->col_data[col], COL_MAX_LEN, "%u", port); + snprintf(fd->cinfo->col_buf[col], COL_MAX_LEN, "%u", port); break; default: 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 @@ -804,7 +852,8 @@ fill_in_columns(frame_data *fd) switch (fd->cinfo->col_fmt[i]) { 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; case COL_CLS_TIME: @@ -904,7 +953,8 @@ fill_in_columns(frame_data *fd) break; 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; case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */ diff --git a/epan/packet.h b/epan/packet.h index fe687e8f2a..1c54b5179c 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -1,7 +1,7 @@ /* packet.h * 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 * By Gerald Combs @@ -62,6 +62,7 @@ typedef struct _column_info { gint *col_width; /* Column widths to use during a "-S" capture */ gchar **col_title; /* Column titles */ 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? */ } 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); gint check_col(frame_data *, gint); +void col_set_str(frame_data *, gint, gchar *); #if __GNUC__ == 2 void col_add_fstr(frame_data *, gint, gchar *, ...) __attribute__((format (printf, 3, 4))); diff --git a/file.c b/file.c index bd2042f80b..e2717da15c 100644 --- a/file.c +++ b/file.c @@ -1,7 +1,7 @@ /* file.c * 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 * By Gerald Combs @@ -620,7 +620,8 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, fdata->cinfo = &cf->cinfo; 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 @@ -1172,7 +1173,8 @@ print_packets(capture_file *cf, print_args_t *print_args) the logical protocol tree. */ fdata->cinfo = &cf->cinfo; 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); fill_in_columns(fdata); @@ -1332,7 +1334,7 @@ change_time_formats(capture_file *cf) if (cf->cinfo.fmt_matx[i][COL_CLS_TIME]) { /* This is one of the columns that shows the time in "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); gtk_clist_set_text(GTK_CLIST(packet_list), row, i, cf->cinfo.col_data[i]); diff --git a/gtk/main.c b/gtk/main.c index 45d27d5b68..e14afd5904 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* 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 * By Gerald Combs @@ -905,10 +905,10 @@ main(int argc, char *argv[]) /* Initialize the capture file struct */ cfile.plist = NULL; - cfile.plist_end = NULL; + cfile.plist_end = NULL; cfile.wth = NULL; - cfile.filename = NULL; - cfile.user_saved = FALSE; + cfile.filename = NULL; + cfile.user_saved = FALSE; cfile.is_tempfile = FALSE; cfile.rfcode = NULL; cfile.dfilter = NULL; @@ -917,16 +917,17 @@ main(int argc, char *argv[]) cfile.cfilter = g_strdup(EMPTY_FILTER); #endif cfile.iface = NULL; - cfile.save_file = NULL; + cfile.save_file = NULL; cfile.save_file_fd = -1; cfile.snap = WTAP_MAX_PACKET_SIZE; cfile.count = 0; 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.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_buf = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols); /* Assemble the compile-time options */ snprintf(comp_info_str, 256, @@ -1205,10 +1206,11 @@ main(int argc, char *argv[]) cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) * NUM_COL_FMTS); 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) - 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 - 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) diff --git a/packet-aarp.c b/packet-aarp.c index d32ba74696..40e019b06b 100644 --- a/packet-aarp.c +++ b/packet-aarp.c @@ -1,7 +1,7 @@ /* packet-aarp.c * 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 * @@ -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); 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)) { switch (ar_op) { diff --git a/packet-afs.c b/packet-afs.c index 1e62d7c35b..2485d30aba 100644 --- a/packet-afs.c +++ b/packet-afs.c @@ -8,7 +8,7 @@ * Portions based on information/specs retrieved from the OpenAFS sources at * 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 * By Gerald Combs @@ -198,7 +198,7 @@ dissect_afs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) return; 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]; doffset = offset + sizeof(struct rx_header); diff --git a/packet-aim.c b/packet-aim.c index 8fd27b758c..da30a86b40 100644 --- a/packet-aim.c +++ b/packet-aim.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2000, Ralf Hoelzer * - * $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 * By Gerald Combs @@ -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 */ 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)) 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 ); 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); } @@ -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 ); 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); } @@ -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 ); 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, " -> %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); 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, " -> %s", msg); diff --git a/packet-arp.c b/packet-arp.c index 20ed13d1ea..2306a5bab8 100644 --- a/packet-arp.c +++ b/packet-arp.c @@ -1,7 +1,7 @@ /* packet-arp.c * 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 * By Gerald Combs @@ -472,17 +472,17 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ARPOP_REPLY: case ATMARPOP_NAK: default: - col_add_str(pinfo->fd, COL_PROTOCOL, "ATMARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ATMARP"); break; case ARPOP_RREQUEST: case ARPOP_RREPLY: - col_add_str(pinfo->fd, COL_PROTOCOL, "ATMRARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ATMRARP"); break; case ARPOP_IREQUEST: case ARPOP_IREPLY: - col_add_str(pinfo->fd, COL_PROTOCOL, "Inverse ATMARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "Inverse ATMARP"); break; } } @@ -628,17 +628,17 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ARPOP_REQUEST: case ARPOP_REPLY: default: - col_add_str(pinfo->fd, COL_PROTOCOL, "ARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ARP"); break; case ARPOP_RREQUEST: case ARPOP_RREPLY: - col_add_str(pinfo->fd, COL_PROTOCOL, "RARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "RARP"); break; case ARPOP_IREQUEST: case ARPOP_IREPLY: - col_add_str(pinfo->fd, COL_PROTOCOL, "Inverse ARP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "Inverse ARP"); break; } } diff --git a/packet-ascend.c b/packet-ascend.c index 72acab9fcc..2efc22061c 100644 --- a/packet-ascend.c +++ b/packet-ascend.c @@ -1,7 +1,7 @@ /* packet-ascend.c * 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 * By Gerald Combs @@ -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 the next protocol in the stack */ 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)) - 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)) - 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)) - 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 layer (ie none) */ diff --git a/packet-atalk.c b/packet-atalk.c index b7c2eaa543..8ad30255db 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -1,7 +1,7 @@ /* packet-atalk.c * 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 * @@ -205,7 +205,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { function = tvb_get_guint8(tvb, 0); 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)) 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)) - col_add_str(pinfo->fd, COL_PROTOCOL, "RTMP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP"); if (check_col(pinfo->fd, COL_INFO)) 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; 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)) 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); 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)) col_add_str(pinfo->fd, COL_INFO, val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)")); diff --git a/packet-atm.c b/packet-atm.c index 44473c6388..223cb1543d 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * 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 * By Gerald Combs @@ -261,7 +261,7 @@ dissect_le_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 tlv_length; 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) { 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"; 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)) - 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"? */ 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)) - col_add_str(pinfo->fd, COL_PROTOCOL, "ATM"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ATM"); switch (pinfo->pseudo_header->ngsniffer_atm.channel) { case 0: /* Traffic from DCE to DTE. */ 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); break; case 1: /* Traffic from DTE to DCE. */ 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); break; } diff --git a/packet-auto_rp.c b/packet-auto_rp.c index 46a1c519f4..8e3185c5b0 100644 --- a/packet-auto_rp.c +++ b/packet-auto_rp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $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 * By Gerald Combs @@ -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)); 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 (short_hdr) diff --git a/packet-bgp.c b/packet-bgp.c index 4f612cf51d..b94ee9953d 100644 --- a/packet-bgp.c +++ b/packet-bgp.c @@ -2,7 +2,7 @@ * Routines for BGP packet dissection. * Copyright 1999, Jun-ichiro itojun Hagino * - * $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: * 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); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "BGP"); + col_set_str(fd, COL_PROTOCOL, "BGP"); p = &pd[offset]; l = END_OF_FRAME; diff --git a/packet-bootp.c b/packet-bootp.c index ce22592c3b..2f70c589e9 100644 --- a/packet-bootp.c +++ b/packet-bootp.c @@ -2,7 +2,7 @@ * Routines for BOOTP/DHCP packet disassembly * Gilbert Ramirez * - * $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: * 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; 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 (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])); } 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 (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)) col_add_fstr(fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x", dhcp_type, pntohl(&pd[offset+4])); diff --git a/packet-bpdu.c b/packet-bpdu.c index 27b1b27ffe..730b658f85 100644 --- a/packet-bpdu.c +++ b/packet-bpdu.c @@ -1,7 +1,7 @@ /* packet-bpdu.c * 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 * @@ -110,7 +110,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { port_identifier = tvb_get_ntohs(tvb, BPDU_PORT_IDENTIFIER); 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)) { diff --git a/packet-bxxp.c b/packet-bxxp.c index 93b3732fc0..c7b1231600 100644 --- a/packet-bxxp.c +++ b/packet-bxxp.c @@ -1,7 +1,7 @@ /* packet-bxxp.c * 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 * @@ -1047,7 +1047,7 @@ dissect_bxxp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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 ... */ diff --git a/packet-cdp.c b/packet-cdp.c index 79fa8196f1..f33b7424af 100644 --- a/packet-cdp.c +++ b/packet-cdp.c @@ -2,7 +2,7 @@ * Routines for the disassembly of the "Cisco Discovery Protocol" * (c) Copyright Hannes R. Boehm * - * $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 * By Gerald Combs @@ -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); 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)) - col_add_str(fd, COL_INFO, "Cisco Discovery Protocol"); + col_set_str(fd, COL_INFO, "Cisco Discovery Protocol"); if(tree){ ti = proto_tree_add_item(tree, proto_cdp, NullTVB, offset, END_OF_FRAME, FALSE); diff --git a/packet-cgmp.c b/packet-cgmp.c index 1a2b4ebc62..8674e97f8b 100644 --- a/packet-cgmp.c +++ b/packet-cgmp.c @@ -1,7 +1,7 @@ /* packet-cgmp.c * 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 * By Gerald Combs @@ -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); 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)) - col_add_str(fd, COL_INFO, "Cisco Group Management Protocol"); + col_set_str(fd, COL_INFO, "Cisco Group Management Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_cgmp, NullTVB, offset, END_OF_FRAME, FALSE); diff --git a/packet-clip.c b/packet-clip.c index 856342a90c..ced6962878 100644 --- a/packet-clip.c +++ b/packet-clip.c @@ -1,7 +1,7 @@ /* packet-clip.c * 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 * By Gerald Combs @@ -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 the next protocol in the stack */ 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)) - 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)) - col_add_str(pinfo->fd, COL_PROTOCOL, "CLIP" ); + col_set_str(pinfo->fd, COL_PROTOCOL, "CLIP" ); 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 layer (ie none) diff --git a/packet-clnp.c b/packet-clnp.c index 118271db3d..667afdde55 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * 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 * Ralf Schneider * @@ -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 is either COTP or CLTP. */ 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; } @@ -1562,12 +1562,12 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "CLNP"; 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); if (cnf_proto_id == NLPID_NULL) { 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) { ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, FALSE); clnp_tree = proto_item_add_subtree(ti, ett_clnp); diff --git a/packet-cops.c b/packet-cops.c index 8d77252179..71a240b910 100644 --- a/packet-cops.c +++ b/packet-cops.c @@ -4,7 +4,7 @@ * * Copyright 2000, Heikki Vatiainen * - * $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 * By Gerald Combs @@ -268,7 +268,7 @@ static void dissect_cops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "COPS"; 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); if (check_col(pinfo->fd, COL_INFO)) diff --git a/packet-ddtp.c b/packet-ddtp.c index 057c8ccfc9..3ec6eaa0f4 100644 --- a/packet-ddtp.c +++ b/packet-ddtp.c @@ -3,7 +3,7 @@ * see http://ddt.sourceforge.net/ * Olivier Abad * - * $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 * By Gerald Combs @@ -108,7 +108,7 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "DDTP"; if (check_col(pinfo->fd, COL_PROTOCOL)) { /* 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) { 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)) { case DDTP_MESSAGE_ERROR : 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; case DDTP_UPDATE_QUERY : 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, FALSE); 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; case DDTP_UPDATE_REPLY : 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, FALSE); break; case DDTP_ALIVE_QUERY : 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", tvb_get_ntohl(tvb, 16)); break; case DDTP_ALIVE_REPLY : 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", tvb_get_ntohl(tvb, 16)); break; default : 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", tvb_get_ntohl(tvb, 12)); } diff --git a/packet-diameter.c b/packet-diameter.c index f16f876963..352312e8d0 100644 --- a/packet-diameter.c +++ b/packet-diameter.c @@ -1,7 +1,7 @@ /* packet-diameter.c * 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 * @@ -542,7 +542,7 @@ void dissect_diameter(const u_char *pd, int offset, frame_data *fd, codestrval="Unknown Packet"; } 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 (DIAM_FLAGS_W & dh.flagsVer) { if (DIAM_FLAGS_A & dh.flagsVer) { diff --git a/packet-dns.c b/packet-dns.c index bf2a9aeb52..1212f404ad 100644 --- a/packet-dns.c +++ b/packet-dns.c @@ -1,7 +1,7 @@ /* packet-dns.c * 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 * By Gerald Combs @@ -2254,11 +2254,11 @@ dissect_dns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) dns_data_offset = offset; 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 (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); return; diff --git a/packet-eigrp.c b/packet-eigrp.c index a10cc74485..194aeb08b2 100644 --- a/packet-eigrp.c +++ b/packet-eigrp.c @@ -2,7 +2,7 @@ * Routines for EIGRP dissection * Copyright 2000, Paul Ionescu * - * $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 * By Gerald Combs @@ -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 (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)) col_add_str(pinfo->fd, COL_INFO, val_to_str(opcode_tmp , eigrp_opcode_vals, "Unknown (0x%04x)")); diff --git a/packet-esis.c b/packet-esis.c index f6d47733ad..ec10dfe667 100644 --- a/packet-esis.c +++ b/packet-esis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI End System to Intermediate System * 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 * * Ethereal - Network traffic analyzer @@ -298,7 +298,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pinfo->current_proto = "ESIS"; 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); diff --git a/packet-eth.c b/packet-eth.c index b17d0ab35a..cbf297e2c5 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * 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 * By Gerald Combs @@ -163,7 +163,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) orig_captured_len = pinfo->captured_len; 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); dst = tvb_get_ptr(tvb, 0, 6); @@ -243,7 +243,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { ethhdr_type = ETHERNET_II; 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) { ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, diff --git a/packet-fddi.c b/packet-fddi.c index bb112465ab..ae3737e6f9 100644 --- a/packet-fddi.c +++ b/packet-fddi.c @@ -3,7 +3,7 @@ * * Laurent Deniel * - * $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 * By Gerald Combs @@ -235,7 +235,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->current_proto = "FDDI"; 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_str = fddifc_to_str(fc); diff --git a/packet-ftp.c b/packet-ftp.c index 6ca8fd315d..0dfed41afa 100644 --- a/packet-ftp.c +++ b/packet-ftp.c @@ -2,7 +2,7 @@ * Routines for ftp packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -83,7 +83,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "FTP"; 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. @@ -190,7 +190,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "FTP-DATA"; 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)) { col_add_fstr(pinfo->fd, COL_INFO, "FTP Data: %u bytes", diff --git a/packet-giop.c b/packet-giop.c index c2a365e10f..6b6368bb22 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -4,7 +4,7 @@ * Laurent Deniel * Craig Rodrigues * - * $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 * By Gerald Combs @@ -1257,7 +1257,7 @@ dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) 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 || diff --git a/packet-gre.c b/packet-gre.c index 1012a5cf51..decbe2961f 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest * - * $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 * By Gerald Combs @@ -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); 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)) { col_add_fstr(fd, COL_INFO, "Encapsulated %s", diff --git a/packet-h1.c b/packet-h1.c index 69448481fe..b3cfe66612 100644 --- a/packet-h1.c +++ b/packet-h1.c @@ -2,7 +2,7 @@ * Routines for Sinec H1 packet disassembly * Gerrit Gehnen * - * $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 * By Gerald Combs @@ -122,7 +122,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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)) col_add_str (pinfo->fd, COL_INFO, "S5: "); if (tree) diff --git a/packet-h261.c b/packet-h261.c index c59969fba2..4d2eba4dbe 100644 --- a/packet-h261.c +++ b/packet-h261.c @@ -77,11 +77,11 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) unsigned int offset = 0; 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) ) { - col_add_str( pinfo->fd, COL_INFO, "H.261 message"); + col_set_str( pinfo->fd, COL_INFO, "H.261 message"); } if ( tree ) { diff --git a/packet-hsrp.c b/packet-hsrp.c index f58301189b..287715ac00 100644 --- a/packet-hsrp.c +++ b/packet-hsrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $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 * By Gerald Combs @@ -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)); 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 (short_packet) diff --git a/packet-http.c b/packet-http.c index 7cdc060b76..3842c66e5a 100644 --- a/packet-http.c +++ b/packet-http.c @@ -3,7 +3,7 @@ * * Guy Harris * - * $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 * By Gerald Combs @@ -83,7 +83,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "HTTP"; 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)) { /* * 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, format_text(line, linelen)); else - col_add_str(pinfo->fd, COL_INFO, "Continuation"); + col_set_str(pinfo->fd, COL_INFO, "Continuation"); } if (tree) { diff --git a/packet-icmpv6.c b/packet-icmpv6.c index 87e222bdc0..0cc8c9857f 100644 --- a/packet-icmpv6.c +++ b/packet-icmpv6.c @@ -1,7 +1,7 @@ /* packet-icmpv6.c * 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 * By Gerald Combs @@ -882,7 +882,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } 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)) { char typebuf[256], codebuf[256]; diff --git a/packet-icp.c b/packet-icp.c index d038904802..d9a4d7b01c 100644 --- a/packet-icp.c +++ b/packet-icp.c @@ -2,7 +2,7 @@ * Routines for ICP (internet cache protocol) packet disassembly * 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 * 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); 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)) { diff --git a/packet-icq.c b/packet-icq.c index 2722ae4c5c..f4976f5bb2 100644 --- a/packet-icq.c +++ b/packet-icq.c @@ -1,7 +1,7 @@ /* packet-icq.c * 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 * By Johan Feyaerts @@ -561,10 +561,10 @@ dissect_icqv4(const u_char *pd, { /* Not really implemented yet */ 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)) { - 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 */ 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)) { - 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 */ 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)) { - 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]); 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)) - col_add_str(fd, COL_INFO, "ICQv5 packet"); + col_set_str(fd, COL_INFO, "ICQv5 packet"); if (unknown == 0x0L) { dissect_icqv5Client(pd, offset, fd, tree); } else { diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 4ec355ecb2..cef385c824 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * 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 * By Gerald Combs @@ -749,7 +749,7 @@ dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pinfo->current_proto = capture_proto_name; 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 */ if (tree) diff --git a/packet-igrp.c b/packet-igrp.c index e971b65077..347697a098 100644 --- a/packet-igrp.c +++ b/packet-igrp.c @@ -2,7 +2,7 @@ * Routines for IGRP dissection * Copyright 2000, Paul Ionescu * - * $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 * By Gerald Combs @@ -70,7 +70,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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)) { switch (ver_and_opcode) { diff --git a/packet-imap.c b/packet-imap.c index eef04d6875..6d4249c3c5 100644 --- a/packet-imap.c +++ b/packet-imap.c @@ -2,7 +2,7 @@ * Routines for imap packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -84,7 +84,7 @@ dissect_imap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } 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)) { diff --git a/packet-ip.c b/packet-ip.c index 20f3fed865..3279f4d160 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * 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 * By Gerald Combs @@ -937,7 +937,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (iph.ip_off & IP_OFFSET) { /* fragmented */ 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)) 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); @@ -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)) { /* Unknown 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)) col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p); 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)) - col_add_str(pinfo->fd, COL_PROTOCOL, "ICMP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ICMP"); if (check_col(pinfo->fd, COL_INFO)) 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"; 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. */ memcpy(&ih, tvb_get_ptr(tvb, 0, sizeof(e_igmp)), sizeof(e_igmp)); diff --git a/packet-ipp.c b/packet-ipp.c index 8244d66d2d..b6f8ee082f 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,7 +3,7 @@ * * Guy Harris * - * $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 * By Gerald Combs @@ -174,12 +174,12 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "IPP"; 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 (is_request) - col_add_str(pinfo->fd, COL_INFO, "IPP request"); + col_set_str(pinfo->fd, COL_INFO, "IPP request"); else - col_add_str(pinfo->fd, COL_INFO, "IPP response"); + col_set_str(pinfo->fd, COL_INFO, "IPP response"); } if (tree) { diff --git a/packet-ipsec.c b/packet-ipsec.c index 4c6e8ff315..21406b019c 100644 --- a/packet-ipsec.c +++ b/packet-ipsec.c @@ -1,7 +1,7 @@ /* packet-ipsec.c * 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 * By Gerald Combs @@ -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); 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)) { col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)", (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); 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)) { col_add_fstr(fd, COL_INFO, "AH (SPI=0x%08x)", (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 */ 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)) { col_add_fstr(fd, COL_INFO, "ESP (SPI=0x%08x)", (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 */ 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)) { p = val_to_str(ntohs(ipcomp.comp_cpi), cpi2val, ""); if (p[0] == '\0') { diff --git a/packet-ipv6.c b/packet-ipv6.c index 51aa504988..c2ae63524f 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * 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 * By Gerald Combs @@ -417,7 +417,7 @@ again: if (frag) { /* fragmented */ 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()" */ old_dissect_data(pd, offset, fd, tree); } else { @@ -425,7 +425,7 @@ again: if (!old_dissector_try_port(ip_dissector_table, nxt, pd, offset, fd, tree)) { /* Unknown 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)) col_add_fstr(fd, COL_INFO, "%s (0x%02x)", ipprotostr(nxt), nxt); old_dissect_data(pd, offset, fd, tree); diff --git a/packet-ipx.c b/packet-ipx.c index 0f69c5779a..8596e3dc56 100644 --- a/packet-ipx.c +++ b/packet-ipx.c @@ -2,7 +2,7 @@ * Routines for NetWare's IPX * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -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); 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)) col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%04X)", 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"; 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)) - col_add_str(pinfo->fd, COL_INFO, "SPX"); + col_set_str(pinfo->fd, COL_INFO, "SPX"); if (tree) { 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"; 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); 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"; 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; @@ -681,7 +681,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "IPX SAP"; 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.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]); } else { - col_add_str(pinfo->fd, COL_INFO, "Unknown Packet Type"); + col_set_str(pinfo->fd, COL_INFO, "Unknown Packet Type"); } } diff --git a/packet-irc.c b/packet-irc.c index ac62239922..7a33f199f5 100644 --- a/packet-irc.c +++ b/packet-irc.c @@ -1,7 +1,7 @@ /* packet-irc.c * 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 * By Gerald Combs @@ -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); 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)) { diff --git a/packet-isakmp.c b/packet-isakmp.c index e0c760e785..eef796900c 100644 --- a/packet-isakmp.c +++ b/packet-isakmp.c @@ -3,7 +3,7 @@ * (ISAKMP) (RFC 2408) * Brad Robel-Forrest * - * $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 * By Gerald Combs @@ -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); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "ISAKMP"); + col_set_str(fd, COL_PROTOCOL, "ISAKMP"); len = pntohl(&hdr->length); diff --git a/packet-isis.c b/packet-isis.c index b91369fe16..0f815bb2e5 100644 --- a/packet-isis.c +++ b/packet-isis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * 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 * * 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); 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))) { isis_dissect_unknown(offset, sizeof(*ihdr), tree, fd, diff --git a/packet-isl.c b/packet-isl.c index 7bae35db44..34353d6cdc 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,7 +1,7 @@ /* packet-isl.c * 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 * By Gerald Combs @@ -154,7 +154,7 @@ dissect_isl(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } 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)) col_add_fstr(fd, COL_INFO, "VLAN ID: 0x%04X", pntohs(&pd[offset+20]) >> 1); diff --git a/packet-kerberos.c b/packet-kerberos.c index 4f30658fa9..e60b8c1d37 100644 --- a/packet-kerberos.c +++ b/packet-kerberos.c @@ -3,7 +3,7 @@ * Wes Hardaker (c) 2000 * 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 * By Gerald Combs @@ -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); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "KRB5"); + col_set_str(fd, COL_PROTOCOL, "KRB5"); if (tree) { item = proto_tree_add_item(tree, proto_kerberos, NullTVB, offset, diff --git a/packet-l2tp.c b/packet-l2tp.c index 6d40f8c0b5..4f698efcee 100644 --- a/packet-l2tp.c +++ b/packet-l2tp.c @@ -7,7 +7,7 @@ * Laurent Cazalet * Thomas Parvais * - * $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 * By Gerald Combs @@ -298,7 +298,7 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "L2TP"; 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); diff --git a/packet-lapb.c b/packet-lapb.c index 7396f6d054..732b5833dc 100644 --- a/packet-lapb.c +++ b/packet-lapb.c @@ -2,7 +2,7 @@ * Routines for lapb frame disassembly * Olivier Abad * - * $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 * By Gerald Combs @@ -62,19 +62,19 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "LAPB"; 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(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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); } else { 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)) - 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); @@ -82,7 +82,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (byte0 != 0x01 && byte0 != 0x03) /* invalid LAPB frame */ { 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) ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, tvb_length(tvb), "Invalid LAPB frame"); diff --git a/packet-lapd.c b/packet-lapd.c index 671d50bb3d..592c8f5ed6 100644 --- a/packet-lapd.c +++ b/packet-lapd.c @@ -2,7 +2,7 @@ * Routines for LAPD frame disassembly * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -99,7 +99,7 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "LAPD"; 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); 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) { is_response = cr ? TRUE : FALSE; 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "User"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "User"); } else { is_response = cr ? FALSE : TRUE; 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "Network"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "Network"); } diff --git a/packet-ldap.c b/packet-ldap.c index 6b9d7fa66d..b75e2e7d67 100644 --- a/packet-ldap.c +++ b/packet-ldap.c @@ -1,7 +1,7 @@ /* packet-ldap.c * 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 * By Gerald Combs @@ -924,7 +924,7 @@ dissect_ldap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (first_time) { 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)) col_add_fstr(fd, COL_INFO, "MsgId=%u MsgType=%s", diff --git a/packet-llc.c b/packet-llc.c index f1481cff29..e1dba55387 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -284,7 +284,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "LLC"; 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); diff --git a/packet-lpd.c b/packet-lpd.c index 6b48224204..1a521f108c 100644 --- a/packet-lpd.c +++ b/packet-lpd.c @@ -2,7 +2,7 @@ * Routines for LPR and LPRng packet disassembly * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -92,16 +92,16 @@ dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } 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 (lpr_packet_type == request) { col_add_str(fd, COL_INFO, lpd_client_code[pd[offset]]); } else if (lpr_packet_type == response) { - col_add_str(fd, COL_INFO, "LPD response"); + col_set_str(fd, COL_INFO, "LPD response"); } else { - col_add_str(fd, COL_INFO, "LPD continuation"); + col_set_str(fd, COL_INFO, "LPD continuation"); } } diff --git a/packet-mapi.c b/packet-mapi.c index 191a9e19d3..716e59afcc 100644 --- a/packet-mapi.c +++ b/packet-mapi.c @@ -1,7 +1,7 @@ /* packet-mapi.c * 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 * By Gerald Combs @@ -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); 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)) { diff --git a/packet-mip.c b/packet-mip.c index c6913b8d53..a6d398d20e 100644 --- a/packet-mip.c +++ b/packet-mip.c @@ -2,7 +2,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab * - * $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 * By Gerald Combs @@ -153,14 +153,14 @@ dissect_mip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) pinfo->current_proto = "Mobile IP"; 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); if (type==1) { 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) { 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 (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) { ti = proto_tree_add_item(tree, proto_mip, tvb, 0, tvb_length(tvb), FALSE); diff --git a/packet-mpls.c b/packet-mpls.c index 719d26f11d..846ce723f9 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $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 * By Gerald Combs @@ -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); 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)) { diff --git a/packet-msproxy.c b/packet-msproxy.c index 1a94a76d41..dfd162ea37 100644 --- a/packet-msproxy.c +++ b/packet-msproxy.c @@ -2,7 +2,7 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster * - * $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 * By Gerald Combs @@ -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; 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)) 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)) - col_add_str(fd, COL_PROTOCOL, "MSproxy"); + col_set_str(fd, COL_PROTOCOL, "MSproxy"); /* display packet info */ diff --git a/packet-nbipx.c b/packet-nbipx.c index fc9c265aec..ae67f2a8c9 100644 --- a/packet-nbipx.c +++ b/packet-nbipx.c @@ -2,7 +2,7 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -120,7 +120,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NBIPX"; 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 @@ -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); 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)) { /* @@ -344,7 +344,7 @@ dissect_nwlink_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - col_add_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)"); + col_set_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)"); break; } } diff --git a/packet-nbns.c b/packet-nbns.c index 9638543e8d..30c3f414bf 100644 --- a/packet-nbns.c +++ b/packet-nbns.c @@ -4,7 +4,7 @@ * Gilbert Ramirez * Much stuff added by Guy Harris * - * $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 * By Gerald Combs @@ -1138,11 +1138,11 @@ dissect_nbns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) nbns_data_offset = offset; 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 (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); 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)) - col_add_str(fd, COL_PROTOCOL, "NBDS"); + col_set_str(fd, COL_PROTOCOL, "NBDS"); if (check_col(fd, COL_INFO)) { 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))) { 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)) { 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 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)) { col_add_fstr(fd, COL_INFO, val_to_str(msg_type, message_types, "Unknown (%x)")); diff --git a/packet-ncp.c b/packet-ncp.c index 830d9213bd..bafd1852fd 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -3,7 +3,7 @@ * Gilbert Ramirez * Modified to allow NCP over TCP/IP decodes by James Coe * - * $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 * By Gerald Combs @@ -263,7 +263,7 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NCP"; 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 ) { ncpiph.signature = tvb_get_ntohl(tvb, 0); diff --git a/packet-netbios.c b/packet-netbios.c index c242f028d4..de036a7768 100644 --- a/packet-netbios.c +++ b/packet-netbios.c @@ -5,7 +5,7 @@ * * 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 * By Gerald Combs @@ -995,7 +995,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* load the display labels */ pinfo->current_proto = "NetBIOS"; 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 */ @@ -1006,7 +1006,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( 0xefff != tvb_get_letohs(tvb, 3)){ 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 */ } diff --git a/packet-nntp.c b/packet-nntp.c index 4ca64f616a..fcb99fe719 100644 --- a/packet-nntp.c +++ b/packet-nntp.c @@ -2,7 +2,7 @@ * Routines for nntp packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -71,7 +71,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NNTP"; 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)) { /* diff --git a/packet-ntp.c b/packet-ntp.c index 05add48272..7291e8b484 100644 --- a/packet-ntp.c +++ b/packet-ntp.c @@ -2,7 +2,7 @@ * Routines for NTP packet dissection * Copyright 1999, Nathan Neulinger * - * $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 * By Gerald Combs @@ -248,10 +248,10 @@ dissect_ntp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) pkt = (struct ntp_packet *) &pd[offset]; 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)) - col_add_str(fd, COL_INFO, "NTP"); + col_set_str(fd, COL_INFO, "NTP"); if (tree) { /* Adding NTP item and subtree */ diff --git a/packet-null.c b/packet-null.c index ce18431cca..b86401e5dd 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * 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 * By Gerald Combs @@ -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 the next protocol in the stack */ 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)) - 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)) - 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)) - 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. diff --git a/packet-osi.c b/packet-osi.c index b424fc029b..7f0bff2207 100644 --- a/packet-osi.c +++ b/packet-osi.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * 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 * Ralf Schneider * @@ -243,19 +243,19 @@ void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case NLPID_ISO9542X25_ESIS: 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); break; case NLPID_ISO10747_IDRP: 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); break; default: 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)) { col_add_fstr(pinfo->fd, COL_INFO, "Unknown ISO protocol (%02x)", nlpid); diff --git a/packet-ospf.c b/packet-ospf.c index b8675c8597..ca4d2292d9 100644 --- a/packet-ospf.c +++ b/packet-ospf.c @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm * - * $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 * 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); 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 (packet_type != NULL) col_add_str(fd, COL_INFO, packet_type); diff --git a/packet-pop.c b/packet-pop.c index 7ef52d47aa..0aa5dd7b9f 100644 --- a/packet-pop.c +++ b/packet-pop.c @@ -2,7 +2,7 @@ * Routines for pop packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -73,7 +73,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "POP"; 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. @@ -97,7 +97,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Otherwise, just call it a continuation. */ if (is_continuation) - col_add_str(pinfo->fd, COL_INFO, "Continuation"); + col_set_str(pinfo->fd, COL_INFO, "Continuation"); else col_add_fstr(pinfo->fd, COL_INFO, "%s: %s", is_request ? "Request" : "Response", diff --git a/packet-ppp.c b/packet-ppp.c index 5c6464d932..a96e6cf55c 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,7 +1,7 @@ /* packet-ppp.c * 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 * By Gerald Combs @@ -1138,11 +1138,11 @@ dissect_ppp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { the next protocol in the stack */ 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)) - 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)) - col_add_str(pinfo->fd, COL_PROTOCOL, "PPP" ); + col_set_str(pinfo->fd, COL_PROTOCOL, "PPP" ); if(tree) { ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, 4, FALSE); diff --git a/packet-pppoe.c b/packet-pppoe.c index 0cd00a0868..4c5dfa1773 100644 --- a/packet-pppoe.c +++ b/packet-pppoe.c @@ -1,7 +1,7 @@ /* packet-pppoe.c * 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 * By Gerald Combs @@ -170,7 +170,7 @@ dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pppoe_length = tvb_get_ntohs(tvb, 4); 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)) { @@ -219,7 +219,7 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pppoe_length = tvb_get_ntohs(tvb, 4); 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)) { diff --git a/packet-pptp.c b/packet-pptp.c index de7a2aaa87..3abdd8ab91 100644 --- a/packet-pptp.c +++ b/packet-pptp.c @@ -2,7 +2,7 @@ * Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637) * Brad Robel-Forrest * - * $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 * By Gerald Combs @@ -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); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "PPTP"); + col_set_str(fd, COL_PROTOCOL, "PPTP"); len = pntohs(&hdr->len); cntrl_type = pntohs(&hdr->cntrl_type); diff --git a/packet-q2931.c b/packet-q2931.c index 56ff590c4e..41fb70762e 100644 --- a/packet-q2931.c +++ b/packet-q2931.c @@ -2,7 +2,7 @@ * Routines for Q.2931 frame disassembly * Guy Harris * - * $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 * By Gerald Combs @@ -1993,7 +1993,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "Q.2931"; 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) { ti = proto_tree_add_item(tree, proto_q2931, tvb, offset, diff --git a/packet-q931.c b/packet-q931.c index 7f940d100c..28cac41a44 100644 --- a/packet-q931.c +++ b/packet-q931.c @@ -2,7 +2,7 @@ * Routines for Q.931 frame disassembly * Guy Harris * - * $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 * @@ -2218,7 +2218,7 @@ q931_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } 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) { ti = proto_tree_add_item(tree, proto_q931, tvb, offset, diff --git a/packet-quake.c b/packet-quake.c index 4389b5ff28..8162c4b5c9 100644 --- a/packet-quake.c +++ b/packet-quake.c @@ -4,7 +4,7 @@ * Uwe Girlich * 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 * By Gerald Combs @@ -525,7 +525,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length &= NETFLAG_LENGTH_MASK; 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) { quake_item = proto_tree_add_item(tree, proto_quake, diff --git a/packet-radius.c b/packet-radius.c index 7e355c6c45..a0f676dca5 100644 --- a/packet-radius.c +++ b/packet-radius.c @@ -1,7 +1,7 @@ /* packet-radius.c * 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 * By Johan Feyaerts @@ -695,7 +695,7 @@ proto_tree codestrval="Unknown Packet"; } 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)) { sprintf(textbuffer,"%s(%d) (id=%d, l=%d)", diff --git a/packet-raw.c b/packet-raw.c index 472fe480f7..41b815c6e8 100644 --- a/packet-raw.c +++ b/packet-raw.c @@ -1,7 +1,7 @@ /* packet-raw.c * 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 * By Gerald Combs @@ -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 the next protocol in the stack */ 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)) - 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)) - 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)) - 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 layer (ie none) */ diff --git a/packet-rlogin.c b/packet-rlogin.c index 26cc030a80..e0b2558c6e 100644 --- a/packet-rlogin.c +++ b/packet-rlogin.c @@ -2,7 +2,7 @@ * Routines for unix rlogin packet dissection * Copyright 2000, Jeffrey C. Foster * - * $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 * By Gerald Combs @@ -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 */ - col_add_str(fd, COL_PROTOCOL, "Rlogin"); + col_set_str(fd, COL_PROTOCOL, "Rlogin"); if (check_col(fd, COL_INFO)){ /* display packet info*/ diff --git a/packet-rpc.c b/packet-rpc.c index e279cb42b3..0064cc92af 100644 --- a/packet-rpc.c +++ b/packet-rpc.c @@ -2,7 +2,7 @@ * Routines for rpc dissection * Copyright 1999, Uwe Girlich * - * $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 * By Gerald Combs @@ -1158,7 +1158,7 @@ dissect_rpc( const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "RPC"); + col_set_str(fd, COL_PROTOCOL, "RPC"); if (tree) { rpc_item = proto_tree_add_item(tree, proto_rpc, NullTVB, offset, END_OF_FRAME, FALSE); diff --git a/packet-rsh.c b/packet-rsh.c index 06536f61fd..93e0eb196a 100644 --- a/packet-rsh.c +++ b/packet-rsh.c @@ -4,7 +4,7 @@ * Robert Tsai * Liberally copied from packet-http.c, by Guy Harris * - * $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 * By Gerald Combs @@ -62,7 +62,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "RSH"; 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)) { /* Put the first line from the buffer into the summary. */ tvb_find_line_end(tvb, offset, -1, &next_offset); diff --git a/packet-rsvp.c b/packet-rsvp.c index 4203ac0f03..79cf9eae76 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $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 * By Gerald Combs @@ -852,7 +852,7 @@ dissect_rsvp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) hdr = (rsvp_header *)&pd[offset]; packet_type = match_strval(hdr->message_type, message_type_vals); 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 (packet_type != NULL) col_add_str(fd, COL_INFO, packet_type); diff --git a/packet-rtcp.c b/packet-rtcp.c index 4774282db4..481ce9304d 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -633,7 +633,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) pinfo->current_proto = "RTCP"; 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) ) { @@ -641,28 +641,28 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* switch ( pd[ offset + 1 ] ) { */ switch ( tvb_get_guint8( tvb, 1 ) ) { case RTCP_SR: - col_add_str( pinfo->fd, COL_INFO, "Sender Report"); + col_set_str( pinfo->fd, COL_INFO, "Sender Report"); break; case RTCP_RR: - col_add_str( pinfo->fd, COL_INFO, "Receiver Report"); + col_set_str( pinfo->fd, COL_INFO, "Receiver Report"); break; case RTCP_SDES: - col_add_str( pinfo->fd, COL_INFO, "Source Description"); + col_set_str( pinfo->fd, COL_INFO, "Source Description"); break; case RTCP_BYE: - col_add_str( pinfo->fd, COL_INFO, "Goodbye"); + col_set_str( pinfo->fd, COL_INFO, "Goodbye"); break; case RTCP_APP: - col_add_str( pinfo->fd, COL_INFO, "Application defined"); + col_set_str( pinfo->fd, COL_INFO, "Application defined"); break; 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; 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; default: - col_add_str( pinfo->fd, COL_INFO, "Unknown packet type"); + col_set_str( pinfo->fd, COL_INFO, "Unknown packet type"); break; } } diff --git a/packet-rtp.c b/packet-rtp.c index 045d1cd6a1..628b19dbec 100644 --- a/packet-rtp.c +++ b/packet-rtp.c @@ -307,7 +307,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) sync_src = tvb_get_ntohl( tvb, offset + 8 ); 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) ) { diff --git a/packet-rtsp.c b/packet-rtsp.c index 869672e02b..9bc81276b0 100644 --- a/packet-rtsp.c +++ b/packet-rtsp.c @@ -4,7 +4,7 @@ * Jason Lango * Liberally copied from packet-http.c, by Guy Harris * - * $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 * By Gerald Combs @@ -207,7 +207,7 @@ dissect_rtsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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)) { /* * 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; default: - col_add_str(pinfo->fd, COL_INFO, "Continuation"); + col_set_str(pinfo->fd, COL_INFO, "Continuation"); break; } } diff --git a/packet-rx.c b/packet-rx.c index d36715b504..8561d58366 100644 --- a/packet-rx.c +++ b/packet-rx.c @@ -4,7 +4,7 @@ * Based on routines from tcpdump patches by * Ken Hornstein * - * $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 * By Gerald Combs @@ -112,7 +112,7 @@ dissect_rx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) return; if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "RX"); + col_set_str(fd, COL_PROTOCOL, "RX"); if (tree) { diff --git a/packet-sap.c b/packet-sap.c index 5575bedf38..758c319259 100644 --- a/packet-sap.c +++ b/packet-sap.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $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 * By Gerald Combs @@ -155,7 +155,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "SAP"; 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)) { col_add_fstr(pinfo->fd, COL_INFO, "%s (v%u)", diff --git a/packet-sctp.c b/packet-sctp.c index 5390e97fb6..f7c1c06b16 100644 --- a/packet-sctp.c +++ b/packet-sctp.c @@ -2,7 +2,7 @@ * Routines for Stream Control Transmission Protocol dissection * Copyright 2000, Michael Tüxen * - * $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 * By Gerald Combs @@ -1523,7 +1523,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ 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 */ if (check_col(pinfo->fd, COL_INFO)) diff --git a/packet-sip.c b/packet-sip.c index 304df56253..c83d3eed7e 100644 --- a/packet-sip.c +++ b/packet-sip.c @@ -7,7 +7,7 @@ * * Copyright 2000, Heikki Vatiainen * - * $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 * By Gerald Combs @@ -79,7 +79,7 @@ static void dissect_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "SIP"; 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; is_request = sip_is_request(tvb, 0); diff --git a/packet-smb-browse.c b/packet-smb-browse.c index ce0e7ecf96..f0b09cec0c 100644 --- a/packet-smb-browse.c +++ b/packet-smb-browse.c @@ -2,7 +2,7 @@ * Routines for smb packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -154,10 +154,10 @@ dissect_mailslot_browse(const u_char *pd, int offset, frame_data *fd, proto_tree return 0; 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 */ - col_add_str(fd, COL_INFO, "Browse Announcement"); + col_set_str(fd, COL_INFO, "Browse Announcement"); /* * Now, decode the browse request diff --git a/packet-smb-logon.c b/packet-smb-logon.c index 888cd1a75e..47bcb20936 100644 --- a/packet-smb-logon.c +++ b/packet-smb-logon.c @@ -2,7 +2,7 @@ * Routines for smb net logon packet dissection * Copyright 2000, Jeffrey C. Foster * - * $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 * By Gerald Combs @@ -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); 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)) diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c index fa966e86d3..ebbb8f065c 100644 --- a/packet-smb-mailslot.c +++ b/packet-smb-mailslot.c @@ -2,7 +2,7 @@ * Routines for smb mailslot packet dissection * Copyright 2000, Jeffrey C. Foster * - * $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 * By Gerald Combs @@ -85,7 +85,7 @@ dissect_mailslot_smb(const u_char *pd, int offset, frame_data *fd, Temp16 = GSHORT(pd, offset); /* get Op code */ 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)) col_add_fstr(fd, COL_INFO, "%s", diff --git a/packet-smb.c b/packet-smb.c index 930e5d3f8b..3f836aa104 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -2,7 +2,7 @@ * Routines for smb packet dissection * Copyright 1999, Richard Sharpe * - * $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 * By Gerald Combs @@ -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]; 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 */ diff --git a/packet-smtp.c b/packet-smtp.c index 45a5f6d87a..dc4384cfe9 100644 --- a/packet-smtp.c +++ b/packet-smtp.c @@ -1,7 +1,7 @@ /* packet-smtp.c * 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 * @@ -364,7 +364,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ 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 */ @@ -380,7 +380,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (frame_data->pdu_type) { case SMTP_PDU_MESSAGE: - col_add_str(pinfo->fd, COL_INFO, "Message Body"); + col_set_str(pinfo->fd, COL_INFO, "Message Body"); break; case SMTP_PDU_EOM: diff --git a/packet-sna.c b/packet-sna.c index 39db5d82e8..121762664e 100644 --- a/packet-sna.c +++ b/packet-sna.c @@ -2,7 +2,7 @@ * Routines for SNA * Gilbert Ramirez * - * $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 * By Gerald Combs @@ -326,7 +326,7 @@ dissect_sna(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { /* Summary information */ 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)) col_add_str(fd, COL_INFO, val_to_str(th_fid, sna_th_fid_vals, "Unknown FID: %01x")); diff --git a/packet-snmp.c b/packet-snmp.c index 40ffb672a0..ecb0422a12 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -2,7 +2,7 @@ * Routines for SNMP (simple network management protocol) * 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 * By Gerald Combs @@ -1563,7 +1563,7 @@ dissect_snmp_pdu(const u_char *pd, int offset, frame_data *fd, "Encrypted PDU (%d bytes)", length); g_free(cryptpdu); if (check_col(fd, COL_INFO)) - col_add_str(fd, COL_INFO, "Encrypted PDU"); + col_set_str(fd, COL_INFO, "Encrypted PDU"); return; } 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; if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "SMUX"); + col_set_str(fd, COL_PROTOCOL, "SMUX"); if (tree) { item = proto_tree_add_item(tree, proto, NullTVB, offset, diff --git a/packet-socks.c b/packet-socks.c index 2387ac2fca..1d7b489fe7 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster * - * $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 * By Gerald Combs @@ -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; 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)) 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 */ 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 (( 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); } 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) diff --git a/packet-srvloc.c b/packet-srvloc.c index 988beb9c41..2c94a0f1af 100644 --- a/packet-srvloc.c +++ b/packet-srvloc.c @@ -6,7 +6,7 @@ * In particular I have not had an opportunity to see how it * 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 * By Gerald Combs @@ -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); 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)) col_add_str(fd, COL_INFO, val_to_str(pd[offset + 1], srvloc_functions, "Unknown Function (%d)")); diff --git a/packet-sscop.c b/packet-sscop.c index 259460e88e..3be2922ac4 100644 --- a/packet-sscop.c +++ b/packet-sscop.c @@ -2,7 +2,7 @@ * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly * Guy Harris * - * $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 * By Gerald Combs @@ -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); pdu_type = sscop_pdu_type & SSCOP_TYPE_MASK; 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)) col_add_str(pinfo->fd, COL_INFO, val_to_str(pdu_type, sscop_type_vals, "Unknown PDU type (0x%02x)")); diff --git a/packet-syslog.c b/packet-syslog.c index 5cd5f334b8..722997589c 100644 --- a/packet-syslog.c +++ b/packet-syslog.c @@ -3,7 +3,7 @@ * * Copyright 2000, Gerald Combs * - * $Id: packet-syslog.c,v 1.6 2000/08/13 14:07:53 deniel Exp $ + * $Id: packet-syslog.c,v 1.7 2000/11/19 08:54:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -175,7 +175,7 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "Syslog"); + col_set_str(pinfo->fd, COL_PROTOCOL, "Syslog"); if (check_col(pinfo->fd, COL_INFO)) { if (pri >= 0) { diff --git a/packet-tacacs.c b/packet-tacacs.c index 00eb58f92f..d2df1b034c 100644 --- a/packet-tacacs.c +++ b/packet-tacacs.c @@ -1,7 +1,7 @@ /* packet-tacacs.c * Routines for cisco tacacs/tacplus/AAA packet dissection * - * $Id: packet-tacacs.c,v 1.7 2000/08/13 14:09:05 deniel Exp $ + * $Id: packet-tacacs.c,v 1.8 2000/11/19 08:54:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -60,7 +60,7 @@ dissect_tacacs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) OLD_CHECK_DISPLAY_AS_DATA(proto_tacacs, pd, offset, fd, tree); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "TACACS"); + col_set_str(fd, COL_PROTOCOL, "TACACS"); if (check_col(fd, COL_INFO)) { @@ -98,7 +98,7 @@ dissect_tacplus(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) proto_tree *tacacs_tree, *ti; if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "TACACS"); + col_set_str(fd, COL_PROTOCOL, "TACACS"); if (check_col(fd, COL_INFO)) { diff --git a/packet-tcp.c b/packet-tcp.c index d37600cad6..090cf3974e 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.88 2000/11/18 10:38:25 guy Exp $ + * $Id: packet-tcp.c,v 1.89 2000/11/19 08:54:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -486,7 +486,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nxtseq = th.th_seq + seglen; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "TCP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "TCP"); if (check_col(pinfo->fd, COL_INFO)) { /* Copy the data into info_str in case one of the option handling routines needs to append to it. */ diff --git a/packet-telnet.c b/packet-telnet.c index 52869eabd4..fd08a28ae8 100644 --- a/packet-telnet.c +++ b/packet-telnet.c @@ -2,7 +2,7 @@ * Routines for telnet packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-telnet.c,v 1.20 2000/11/13 08:58:15 guy Exp $ + * $Id: packet-telnet.c,v 1.21 2000/11/19 08:54:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -368,7 +368,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "TELNET"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "TELNET"); + col_set_str(pinfo->fd, COL_PROTOCOL, "TELNET"); if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "Telnet Data ..."); diff --git a/packet-tftp.c b/packet-tftp.c index bc9e11b09a..cf43f262e7 100644 --- a/packet-tftp.c +++ b/packet-tftp.c @@ -5,7 +5,7 @@ * Craig Newell * RFC2347 TFTP Option Extension * - * $Id: packet-tftp.c,v 1.17 2000/11/13 08:58:17 guy Exp $ + * $Id: packet-tftp.c,v 1.18 2000/11/19 08:54:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -126,7 +126,7 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "TFTP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "TFTP"); opcode = tvb_get_ntohs(tvb, offset); diff --git a/packet-time.c b/packet-time.c index a38750564f..0321db2ae5 100644 --- a/packet-time.c +++ b/packet-time.c @@ -5,7 +5,7 @@ * Craig Newell * RFC2347 TIME Option Extension * - * $Id: packet-time.c,v 1.8 2000/08/13 14:09:06 deniel Exp $ + * $Id: packet-time.c,v 1.9 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -50,7 +50,7 @@ dissect_time(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) OLD_CHECK_DISPLAY_AS_DATA(proto_time, pd, offset, fd, tree); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "TIME"); + col_set_str(fd, COL_PROTOCOL, "TIME"); if (check_col(fd, COL_INFO)) { col_add_fstr(fd, COL_INFO, "TIME %s", pi.srcport == UDP_PORT_TIME? "Response":"Request"); diff --git a/packet-tns.c b/packet-tns.c index dd4fb8e14d..c79442c719 100644 --- a/packet-tns.c +++ b/packet-tns.c @@ -1,7 +1,7 @@ /* packet-tns.c * Routines for MSX tns packet dissection * - * $Id: packet-tns.c,v 1.9 2000/08/13 14:09:06 deniel Exp $ + * $Id: packet-tns.c,v 1.10 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -196,7 +196,7 @@ dissect_tns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) OLD_CHECK_DISPLAY_AS_DATA(proto_tns, pd, offset, fd, tree); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "TNS"); + col_set_str(fd, COL_PROTOCOL, "TNS"); if (check_col(fd, COL_INFO)) { diff --git a/packet-tpkt.c b/packet-tpkt.c index fb71911573..6de5742021 100644 --- a/packet-tpkt.c +++ b/packet-tpkt.c @@ -98,7 +98,7 @@ dissect_tpkt( tvbuff_t *tvb, unsigned int* offset, packet_info *pinfo, proto_tre ( tvb_get_guint8( tvb, ( *offset ) + 1 ) == 0 ) ) ) return -1; if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { - col_add_str( pinfo->fd, COL_PROTOCOL, "TPKT" ); + col_set_str( pinfo->fd, COL_PROTOCOL, "TPKT" ); } if ( check_col( pinfo->fd, COL_INFO) ) { diff --git a/packet-tr.c b/packet-tr.c index 1a2cdafa93..16060cfad0 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez * - * $Id: packet-tr.c,v 1.50 2000/11/17 21:00:36 gram Exp $ + * $Id: packet-tr.c,v 1.51 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -328,7 +328,7 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "Token-Ring"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "TR"); + col_set_str(pinfo->fd, COL_PROTOCOL, "TR"); if ((x = check_for_old_linux_tvb((tvbuff_t*) tvb))) { /* Actually packet starts x bytes into what we have got but with all diff --git a/packet-trmac.c b/packet-trmac.c index 066a4fa558..b6f2f4f91f 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez * - * $Id: packet-trmac.c,v 1.25 2000/11/17 21:00:36 gram Exp $ + * $Id: packet-trmac.c,v 1.26 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -284,7 +284,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "TR MAC"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "TR MAC"); + col_set_str(pinfo->fd, COL_PROTOCOL, "TR MAC"); mv_val = tvb_get_guint8(tvb, 3); diff --git a/packet-udp.c b/packet-udp.c index cd39e75914..3560b9eac7 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.78 2000/11/18 10:38:25 guy Exp $ + * $Id: packet-udp.c,v 1.79 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -158,7 +158,7 @@ dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) uh_sum = ntohs(uh.uh_sum); if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "UDP"); + col_set_str(pinfo->fd, COL_PROTOCOL, "UDP"); if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "Source port: %s Destination port: %s", get_udp_port(uh_sport), get_udp_port(uh_dport)); diff --git a/packet-v120.c b/packet-v120.c index 41485ecde4..3847180bb5 100644 --- a/packet-v120.c +++ b/packet-v120.c @@ -2,7 +2,7 @@ * Routines for v120 frame disassembly * Bert Driehuis * - * $Id: packet-v120.c,v 1.13 2000/11/16 07:35:38 guy Exp $ + * $Id: packet-v120.c,v 1.14 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -71,7 +71,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "V.120"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "V.120"); + col_set_str(pinfo->fd, COL_PROTOCOL, "V.120"); byte0 = tvb_get_guint8(tvb, 0); @@ -83,7 +83,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((byte0 & 0x01) != 0x00 && (byte1 && 0x01) != 0x01) { if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "Invalid V.120 frame"); + col_set_str(pinfo->fd, COL_INFO, "Invalid V.120 frame"); if (tree) ti = proto_tree_add_protocol_format(tree, proto_v120, tvb, 0, tvb_length(tvb), "Invalid V.120 frame"); @@ -92,15 +92,15 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pinfo->pseudo_header->x25.flags & FROM_DCE) { 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "DCE"); } else { 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)) - col_add_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); + col_set_str(pinfo->fd, COL_RES_DL_SRC, "DTE"); } if (((pinfo->pseudo_header->x25.flags & FROM_DCE) && byte0 & 0x02) || diff --git a/packet-vines.c b/packet-vines.c index 3429337805..2788fd4fa4 100644 --- a/packet-vines.c +++ b/packet-vines.c @@ -1,7 +1,7 @@ /* packet-vines.c * Routines for Banyan VINES protocol packet disassembly * - * $Id: packet-vines.c,v 1.19 2000/11/17 21:00:36 gram Exp $ + * $Id: packet-vines.c,v 1.20 2000/11/19 08:54:10 guy Exp $ * * Don Lafontaine * @@ -85,7 +85,7 @@ dissect_vines_frp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree vines_frp_seqno = pd[offset+1]; if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines FRP"); + col_set_str(fd, COL_PROTOCOL, "Vines FRP"); /* * 1: first fragment of vines packet * 2: last fragment of vines packet @@ -171,37 +171,37 @@ dissect_vines(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { switch (viph.vip_proto) { case VIP_PROTO_IPC: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines IPC"); + col_set_str(fd, COL_PROTOCOL, "Vines IPC"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "IPC (%02x)", viph.vip_proto); break; case VIP_PROTO_SPP: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines SPP"); + col_set_str(fd, COL_PROTOCOL, "Vines SPP"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "SPP (%02x)", viph.vip_proto); break; case VIP_PROTO_ARP: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines ARP"); + col_set_str(fd, COL_PROTOCOL, "Vines ARP"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "ARP (%02x)", viph.vip_proto); break; case VIP_PROTO_RTP: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines RTP"); + col_set_str(fd, COL_PROTOCOL, "Vines RTP"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "RTP (%02x)", viph.vip_proto); break; case VIP_PROTO_ICP: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines ICP"); + col_set_str(fd, COL_PROTOCOL, "Vines ICP"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "ICP (%02x)", viph.vip_proto); break; default: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "Vines IP"); + col_set_str(fd, COL_PROTOCOL, "Vines IP"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "Unknown VIP protocol (%02x)", viph.vip_proto); @@ -301,23 +301,23 @@ void dissect_vines_spp(const u_char *pd, int offset, frame_data *fd, proto_tree switch (viph.vspp_pkttype) { case VSPP_PKTTYPE_DATA: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VSPP Data"); + col_set_str(fd, COL_PROTOCOL, "VSPP Data"); break; case VSPP_PKTTYPE_DISC: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VSPP Disconnect"); + col_set_str(fd, COL_PROTOCOL, "VSPP Disconnect"); break; case VSPP_PKTTYPE_PROBE: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VSPP Probe"); + col_set_str(fd, COL_PROTOCOL, "VSPP Probe"); break; case VSPP_PKTTYPE_ACK: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VSPP Ack"); + col_set_str(fd, COL_PROTOCOL, "VSPP Ack"); break; default: if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VSPP Unknown"); + col_set_str(fd, COL_PROTOCOL, "VSPP Unknown"); } if (check_col(fd, COL_INFO)) diff --git a/packet-vlan.c b/packet-vlan.c index c0ffdcff7b..60e76f037d 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.24 2000/11/18 10:38:25 guy Exp $ + * $Id: packet-vlan.c,v 1.25 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -86,7 +86,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "VLAN"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "VLAN"); + col_set_str(pinfo->fd, COL_PROTOCOL, "VLAN"); tci = tvb_get_ntohs( tvb, 0 ); encap_proto = tvb_get_ntohs( tvb, 2 ); diff --git a/packet-vrrp.c b/packet-vrrp.c index 65c41684f4..f534139c6f 100644 --- a/packet-vrrp.c +++ b/packet-vrrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $Id: packet-vrrp.c,v 1.8 2000/08/13 14:09:08 deniel Exp $ + * $Id: packet-vrrp.c,v 1.9 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -112,7 +112,7 @@ dissect_vrrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VRRP"); + col_set_str(fd, COL_PROTOCOL, "VRRP"); if (check_col(fd, COL_INFO)) { if (short_hdr) diff --git a/packet-vtp.c b/packet-vtp.c index ba59d31977..08c06a4d93 100644 --- a/packet-vtp.c +++ b/packet-vtp.c @@ -1,7 +1,7 @@ /* packet-vtp.c * Routines for the disassembly of Cisco's Virtual Trunking Protocol * - * $Id: packet-vtp.c,v 1.6 2000/08/13 14:09:08 deniel Exp $ + * $Id: packet-vtp.c,v 1.7 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -104,9 +104,9 @@ dissect_vtp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) OLD_CHECK_DISPLAY_AS_DATA(proto_vtp, pd, offset, fd, tree); if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "VTP"); + col_set_str(fd, COL_PROTOCOL, "VTP"); if (check_col(fd, COL_INFO)) - col_add_str(fd, COL_INFO, "Virtual Trunking Protocol"); + col_set_str(fd, COL_INFO, "Virtual Trunking Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_vtp, NullTVB, offset, END_OF_FRAME, diff --git a/packet-wccp.c b/packet-wccp.c index 3cbc6f6e66..3de6b9ca47 100644 --- a/packet-wccp.c +++ b/packet-wccp.c @@ -2,7 +2,7 @@ * Routines for Web Cache Coordination Protocol dissection * Jerry Talkington * - * $Id: packet-wccp.c,v 1.11 2000/11/17 21:00:36 gram Exp $ + * $Id: packet-wccp.c,v 1.12 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -106,7 +106,7 @@ dissect_wccp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) OLD_CHECK_DISPLAY_AS_DATA(proto_wccp, pd, offset, fd, tree); if(check_col(fd, COL_PROTOCOL)) { - col_add_str(fd, COL_PROTOCOL, "WCCP"); + col_set_str(fd, COL_PROTOCOL, "WCCP"); } wccp_message_type = pntohl(&pd[offset]); diff --git a/packet-who.c b/packet-who.c index 81458635c5..b45a0001df 100644 --- a/packet-who.c +++ b/packet-who.c @@ -2,7 +2,7 @@ * Routines for who protocol (see man rwhod) * Gilbert Ramirez * - * $Id: packet-who.c,v 1.10 2000/11/17 21:00:36 gram Exp $ + * $Id: packet-who.c,v 1.11 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -107,7 +107,7 @@ dissect_who(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) /* Summary information */ if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "WHO"); + col_set_str(fd, COL_PROTOCOL, "WHO"); /* Figure out if we have enough bytes in the packet * to retrieve the data that we want to put into the summary diff --git a/packet-wsp.c b/packet-wsp.c index cf3e66a159..e5721b1bb9 100644 --- a/packet-wsp.c +++ b/packet-wsp.c @@ -3,7 +3,7 @@ * * Routines to dissect WSP component of WAP traffic. * - * $Id: packet-wsp.c,v 1.3 2000/11/05 09:30:11 guy Exp $ + * $Id: packet-wsp.c,v 1.4 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -402,9 +402,7 @@ dissect_wsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking - at the list of packets can tell what type of packet it is. - "col_add_fstr()" can be used instead of "col_add_str()"; it takes - "printf()"-like arguments. */ + at the list of packets can tell what type of packet it is. */ /* Display protocol type depending on the port */ if (check_col(fdata, COL_PROTOCOL)) @@ -412,10 +410,10 @@ dissect_wsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch ( pinfo->match_port ) { case UDP_PORT_WSP: - col_add_fstr(fdata, COL_PROTOCOL, "WSP" ); + col_set_str(fdata, COL_PROTOCOL, "WSP" ); break; case UDP_PORT_WTLS_WSP: - col_add_fstr(fdata, COL_PROTOCOL, "WTLS+WSP" ); + col_set_str(fdata, COL_PROTOCOL, "WTLS+WSP" ); break; } } @@ -439,20 +437,8 @@ dissect_wsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { -/* NOTE: The offset and length values in the previous call to - "proto_tree_add_item()" define what data bytes to highlight in the hex - display window when the line in the protocol tree display - corresponding to that item is selected. - - END_OF_FRAME is a handy way to highlight all data from the offset to - the end of the packet. */ -/* ti = proto_tree_add_item(tree, proto_wsp, NullTVB, offset, END_OF_FRAME, NULL); */ -/* - ti = proto_tree_add_item(tree, proto_wsp, tvb, offset, END_OF_FRAME, NULL); - wsp_tree = proto_item_add_subtree(ti, ett_wsp); -*/ - - ti = proto_tree_add_item(tree, proto_wsp, tvb, 0, END_OF_FRAME, bo_little_endian); + ti = proto_tree_add_item(tree, proto_wsp, tvb, 0, + tvb_length(tvb), bo_little_endian); wsp_tree = proto_item_add_subtree(ti, ett_wsp); /* Code to process the packet goes here */ diff --git a/packet-wtp.c b/packet-wtp.c index eab342b6be..99566bf7aa 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -3,7 +3,7 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c,v 1.3 2000/11/05 09:30:11 guy Exp $ + * $Id: packet-wtp.c,v 1.4 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -264,9 +264,7 @@ dissect_wtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking - at the list of packets can tell what type of packet it is. - "col_add_fstr()" can be used instead of "col_add_str()"; it takes - "printf()"-like arguments. */ + at the list of packets can tell what type of packet it is. */ if (check_col(fdata, COL_INFO)) { #ifdef DEBUG fprintf( stderr, "dissect_wtp: (6) About to set info_col header to %s\n", szInfo ); @@ -276,13 +274,6 @@ dissect_wtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { -/* NOTE: The offset and length values in the previous call to - "proto_tree_add_item()" define what data bytes to highlight in the hex - display window when the line in the protocol tree display - corresponding to that item is selected. - - END_OF_FRAME is a handy way to highlight all data from the offset to - the end of the packet. */ #ifdef DEBUG fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader ); #endif diff --git a/packet-x11.c b/packet-x11.c index a43e4383a7..e1082f7a29 100644 --- a/packet-x11.c +++ b/packet-x11.c @@ -2,7 +2,7 @@ * Routines for X11 dissection * Copyright 2000, Christophe Tronche * - * $Id: packet-x11.c,v 1.12 2000/11/19 02:48:24 guy Exp $ + * $Id: packet-x11.c,v 1.13 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -2844,13 +2844,13 @@ dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "X11"); + col_set_str(pinfo->fd, COL_PROTOCOL, "X11"); /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking at the list of packets can tell what type of packet it is. */ if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "X11 request"); + col_set_str(pinfo->fd, COL_INFO, "X11 request"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ @@ -2875,13 +2875,13 @@ dissect_x11_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "X11"); + col_set_str(pinfo->fd, COL_PROTOCOL, "X11"); /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking at the list of packets can tell what type of packet it is. */ if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "X11 event"); + col_set_str(pinfo->fd, COL_INFO, "X11 event"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/packet-x25.c b/packet-x25.c index d362c69425..a421ee3a4a 100644 --- a/packet-x25.c +++ b/packet-x25.c @@ -2,7 +2,7 @@ * Routines for x25 packet disassembly * Olivier Abad * - * $Id: packet-x25.c,v 1.38 2000/11/19 04:14:26 guy Exp $ + * $Id: packet-x25.c,v 1.39 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1405,7 +1405,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "X.25"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "X.25"); + col_set_str(pinfo->fd, COL_PROTOCOL, "X.25"); bytes0_1 = tvb_get_ntohs(tvb, 0); @@ -1425,7 +1425,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (x25_pkt_len < 3) /* packet too short */ { if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "Invalid/short X.25 packet"); + col_set_str(pinfo->fd, COL_INFO, "Invalid/short X.25 packet"); if (tree) proto_tree_add_protocol_format(tree, (modulo == 8 ? proto_x25 : proto_ex25), tvb, 0, @@ -1728,7 +1728,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case X25_RESTART_CONFIRMATION: if(check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "Restart conf."); + col_set_str(pinfo->fd, COL_INFO, "Restart conf."); if (x25_tree) proto_tree_add_uint(x25_tree, (modulo == 8) ? hf_x25_type : hf_ex25_type, tvb, 2, 1, X25_RESTART_CONFIRMATION); @@ -1736,7 +1736,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case X25_REGISTRATION_REQUEST: if(check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "Registration req."); + col_set_str(pinfo->fd, COL_INFO, "Registration req."); if (x25_tree) proto_tree_add_uint(x25_tree, (modulo == 8) ? hf_x25_type : hf_ex25_type, tvb, 2, 1, X25_REGISTRATION_REQUEST); @@ -1758,7 +1758,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case X25_REGISTRATION_CONFIRMATION: if(check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "Registration conf."); + col_set_str(pinfo->fd, COL_INFO, "Registration conf."); if (x25_tree) { proto_tree_add_uint(x25_tree, (modulo == 8) ? hf_x25_type : hf_ex25_type, tvb, 2, 1, X25_REGISTRATION_CONFIRMATION); diff --git a/packet-yhoo.c b/packet-yhoo.c index d66432c83c..2e57d80908 100644 --- a/packet-yhoo.c +++ b/packet-yhoo.c @@ -2,7 +2,7 @@ * Routines for yahoo messenger packet dissection * Copyright 1999, Nathan Neulinger * - * $Id: packet-yhoo.c,v 1.10 2000/08/13 14:09:15 deniel Exp $ + * $Id: packet-yhoo.c,v 1.11 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -136,7 +136,7 @@ dissect_yhoo(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) pkt = (struct yahoo_rawpacket *) &pd[offset]; if (check_col(fd, COL_PROTOCOL)) - col_add_str(fd, COL_PROTOCOL, "YHOO"); + col_set_str(fd, COL_PROTOCOL, "YHOO"); if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, diff --git a/packet-zebra.c b/packet-zebra.c index 02761b5e63..f3f1282a57 100644 --- a/packet-zebra.c +++ b/packet-zebra.c @@ -3,7 +3,7 @@ * * Jochen Friedrich * - * $Id: packet-zebra.c,v 1.3 2000/08/20 09:07:16 guy Exp $ + * $Id: packet-zebra.c,v 1.4 2000/11/19 08:54:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -479,7 +479,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) CHECK_DISPLAY_AS_DATA(proto_zebra, tvb, pinfo, tree); if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "ZEBRA"); + col_set_str(pinfo->fd, COL_PROTOCOL, "ZEBRA"); request = (pi.destport == TCP_PORT_ZEBRA); left = tvb_reported_length(tvb); diff --git a/tethereal.c b/tethereal.c index 00ab959084..7fccf3ff54 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.56 2000/11/09 07:29:59 guy Exp $ + * $Id: tethereal.c,v 1.57 2000/11/19 08:54:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -220,10 +220,10 @@ main(int argc, char *argv[]) /* Initialize the capture file struct */ cfile.plist = NULL; - cfile.plist_end = NULL; + cfile.plist_end = NULL; cfile.wth = NULL; - cfile.filename = NULL; - cfile.user_saved = FALSE; + cfile.filename = NULL; + cfile.user_saved = FALSE; cfile.is_tempfile = FALSE; cfile.rfcode = NULL; cfile.dfilter = NULL; @@ -232,16 +232,17 @@ main(int argc, char *argv[]) cfile.cfilter = g_strdup(""); #endif cfile.iface = NULL; - cfile.save_file = NULL; + cfile.save_file = NULL; cfile.save_file_fd = -1; cfile.snap = WTAP_MAX_PACKET_SIZE; cfile.count = 0; 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.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_buf = (gchar **) g_malloc(sizeof(gchar *) * cfile.cinfo.num_cols); /* Assemble the compile-time options */ snprintf(comp_info_str, 256, @@ -447,10 +448,11 @@ main(int argc, char *argv[]) cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) * NUM_COL_FMTS); 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) - 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 - 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) @@ -873,7 +875,8 @@ fill_in_fdata(frame_data *fdata, capture_file *cf, fdata->cinfo = &cf->cinfo; 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]; } }