diff options
501 files changed, 17490 insertions, 17490 deletions
diff --git a/acconfig.h b/acconfig.h index 21b1718645..7a814c295c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,22 +1,22 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.24 2002/04/08 01:34:38 guy Exp $ + * $Id: acconfig.h,v 1.25 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,7 +1,7 @@ /* afn.c * RFC 1700 address family numbers * - * $Id: afn.c,v 1.3 2002/08/24 10:22:29 guy Exp $ + * $Id: afn.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,7 +1,7 @@ /* afn.h * RFC 1700 address family numbers * - * $Id: afn.h,v 1.2 2002/08/24 10:22:29 guy Exp $ + * $Id: afn.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,24 +1,24 @@ /* aftypes.h * AF_ values on various flavors of BSD * - * $Id: aftypes.h,v 1.2 2002/07/30 07:25:29 guy Exp $ + * $Id: aftypes.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * * This file created and by Mike Hall <mlh@io.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/alignment.h b/alignment.h index 3a7c89cfe9..5918638885 100644 --- a/alignment.h +++ b/alignment.h @@ -1,15 +1,15 @@ /* * alignment.h, Copyright, 1998, Richard Sharpe, All Rights Reserved * - * $Id: alignment.h,v 1.3 1999/09/23 05:26:18 guy Exp $ + * $Id: alignment.h,v 1.4 2002/08/28 21:00:05 jmayer Exp $ * * Please see the file COPYING in the top level for details of copying - * this software. Use of this software is approved only under certain + * this software. Use of this software is approved only under certain * conditions. - * + * * This file implements the alignment macros for the Threaded SMB Server * - * For the moment we assume Intel style architecture, but can support + * For the moment we assume Intel style architecture, but can support * others. * * Modification History @@ -1,7 +1,7 @@ /* asn1.c * Routines for ASN.1 BER dissection * - * $Id: asn1.c,v 1.16 2002/08/02 23:35:45 jmayer Exp $ + * $Id: asn1.c,v 1.17 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,7 +29,7 @@ /* * MODULE INFORMATION - * ------------------ + * ------------------ * FILE NAME: g_asn1.c * SYSTEM NAME: ASN1 Basic Encoding * ORIGINAL AUTHOR(S): Dirk Wisse @@ -48,7 +48,7 @@ * asn1_int_decode (asn1, end_of_int, &integer); * asn1_eoc_decode (asn1, end_of_seq); * asn1_close (asn1, &offset); - * + * * For indefinite encoding end_of_seq and &end_of_seq in the * example above should be replaced by NULL. * For indefinite decoding nothing has to be changed. @@ -113,7 +113,7 @@ asn1_open(ASN1_SCK *asn1, tvbuff_t *tvb, int offset) * RETURNS: void */ -void +void asn1_close(ASN1_SCK *asn1, int *offset) { *offset = asn1->offset; @@ -332,7 +332,7 @@ asn1_eoc_decode (ASN1_SCK *asn1, int eoc) { int ret; guchar ch; - + if (eoc == -1) { ret = asn1_octet_decode (asn1, &ch); if (ret != ASN1_ERR_NOERROR) @@ -829,7 +829,7 @@ asn1_oid_value_decode ( ASN1_SCK *asn1, int enc_len, subid_t **oid, guint *len) size = enc_len + 1; *oid = g_malloc(size * sizeof(gulong)); optr = *oid; - + ret = asn1_subid_decode (asn1, &subid); if (ret != ASN1_ERR_NOERROR) { g_free(*oid); @@ -1,7 +1,7 @@ /* asn1.h * Definitions for ASN.1 BER dissection * - * $Id: asn1.h,v 1.9 2002/08/02 23:35:46 jmayer Exp $ + * $Id: asn1.h,v 1.10 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -127,7 +127,7 @@ int asn1_int32_value_decode (ASN1_SCK *asn1, int enc_len, gint32 *integer); int asn1_int32_decode (ASN1_SCK *asn1, gint32 *integer, guint *nbytes); int asn1_uint32_value_decode (ASN1_SCK *asn1, int enc_len, guint *integer); int asn1_uint32_decode (ASN1_SCK *asn1, guint32 *integer, guint *nbytes); -int asn1_bits_decode (ASN1_SCK *asn1, int eoc, guchar **bits, +int asn1_bits_decode (ASN1_SCK *asn1, int eoc, guchar **bits, guint *len, guchar *unused); int asn1_string_value_decode (ASN1_SCK *asn1, int enc_len, guchar **octets); diff --git a/bridged_pids.h b/bridged_pids.h index a0b331075e..db675c864a 100644 --- a/bridged_pids.h +++ b/bridged_pids.h @@ -2,23 +2,23 @@ * Definitions of protocol IDs for the 00-80-C2 OUI, used for * bridging various networks over ATM (RFC 2684) or Frame Relay (RFC 2427). * - * $Id: bridged_pids.h,v 1.1 2001/01/10 09:07:35 guy Exp $ + * $Id: bridged_pids.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 - 2000 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/capture-wpcap.c b/capture-wpcap.c index 746c77de98..98de62ab46 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -1,23 +1,23 @@ /* capture-wpcap.c * Try to load WinPcap DLL at run-time. * - * $Id: capture-wpcap.c,v 1.2 2002/08/02 23:35:46 jmayer Exp $ + * $Id: capture-wpcap.c,v 1.3 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 2001 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/capture-wpcap.h b/capture-wpcap.h index 83249805cd..66e3da2dd6 100644 --- a/capture-wpcap.h +++ b/capture-wpcap.h @@ -1,22 +1,22 @@ /* capture-wpcap.h * - * $Id: capture-wpcap.h,v 1.1 2001/04/03 05:26:26 gram Exp $ + * $Id: capture-wpcap.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 2001 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,22 +1,22 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.188 2002/08/13 18:12:11 guy Exp $ + * $Id: capture.c,v 1.189 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -735,7 +735,7 @@ cap_timer_cb(gpointer data) /* There's stuff to read from the sync pipe, meaning the child has sent us a message, or the sync pipe has closed, meaning the child has closed it (perhaps because it exited). */ -static void +static void cap_file_input_cb(gpointer data, gint source _U_, GdkInputCondition condition _U_) { @@ -756,7 +756,7 @@ cap_file_input_cb(gpointer data, gint source _U_, capturing any more packets. Pick up its exit status, and complain if it did anything other than exit with status 0. */ wait_for_child(FALSE); - + /* Read what remains of the capture file, and finish the capture. XXX - do something if this fails? */ switch (finish_tail_cap_file(cf, &err)) { @@ -835,7 +835,7 @@ cap_file_input_cb(gpointer data, gint source _U_, q++; nread--; break; - } + } } /* Read from the capture file the number of records the child told us @@ -970,7 +970,7 @@ signame(int sig) sigmsg = "Segmentation violation"; break; - /* http://metalab.unc.edu/pub/Linux/docs/HOWTO/GCC-HOWTO + /* http://metalab.unc.edu/pub/Linux/docs/HOWTO/GCC-HOWTO Linux is POSIX compliant. These are not POSIX-defined signals --- ISO/IEC 9945-1:1990 (IEEE Std 1003.1-1990), paragraph B.3.3.1.1 sez: @@ -1052,7 +1052,7 @@ adjust_header(loop_data *ld, struct pcap_hdr *hdr, struct pcaprec_hdr *rechdr) } } -/* Mimic pcap_open_live() for pipe captures +/* Mimic pcap_open_live() for pipe captures * We check if "pipename" is "-" (stdin) or a FIFO, open it, and read the * header. * N.B. : we can't read the libpcap formats used in RedHat 6.1 or SuSE 6.3 @@ -1306,9 +1306,9 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr, phdr.ts.tv_usec = rechdr->hdr.ts_usec; phdr.caplen = rechdr->hdr.incl_len; phdr.len = rechdr->hdr.orig_len; - + capture_pcap_cb((guchar *)ld, &phdr, data); - + ld->pipe_state = STATE_EXPECT_REC_HDR; return 1; @@ -1380,9 +1380,9 @@ capture(gboolean *stats_known, struct pcap_stat *stats) #define N_COUNTS (sizeof counts / sizeof counts[0]) -#ifdef _WIN32 - WORD wVersionRequested; - WSADATA wsaData; +#ifdef _WIN32 + WORD wVersionRequested; + WSADATA wsaData; #else static const char ppamsg[] = "can't find PPA for "; char *libpcap_warn; @@ -1400,18 +1400,18 @@ capture(gboolean *stats_known, struct pcap_stat *stats) signed/unsigned 64-bit int */ #define DECISIZE 20 - /* Initialize Windows Socket if we are in a WIN32 OS + /* Initialize Windows Socket if we are in a WIN32 OS This needs to be done before querying the interface for network/netmask */ -#ifdef _WIN32 - wVersionRequested = MAKEWORD( 1, 1 ); - err = WSAStartup( wVersionRequested, &wsaData ); - if (err!=0) { - snprintf(errmsg, sizeof errmsg, - "Couldn't initialize Windows Sockets."); - pch=NULL; - goto error; - } -#endif +#ifdef _WIN32 + wVersionRequested = MAKEWORD( 1, 1 ); + err = WSAStartup( wVersionRequested, &wsaData ); + if (err!=0) { + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets."); + pch=NULL; + goto error; + } +#endif ld.go = TRUE; ld.counts.total = 0; @@ -1574,7 +1574,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats) goto error; } if (capture_opts.ringbuffer_on) { - ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype, + ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype, file_snaplen, &err); } else { ld.pdh = wtap_dump_fdopen(cfile.save_file_fd, WTAP_FILE_PCAP, @@ -1705,12 +1705,12 @@ capture(gboolean *stats_known, struct pcap_stat *stats) if (capture_child) signal(SIGUSR1, stop_capture); #endif - /* initialize capture stop conditions */ + /* initialize capture stop conditions */ init_capture_stop_conditions(); /* create stop conditions */ if (capture_opts.has_autostop_filesize) cnd_stop_capturesize = - cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize * 1000); + cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize * 1000); if (capture_opts.has_autostop_duration) cnd_stop_timeout = cnd_new(CND_CLASS_TIMEOUT,(gint32)capture_opts.autostop_duration); @@ -1811,7 +1811,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats) if (inpkts > 0) { ld.sync_packets += inpkts; /* check capture stop conditons */ - if (cnd_stop_capturesize != NULL && cnd_eval(cnd_stop_capturesize, + if (cnd_stop_capturesize != NULL && cnd_eval(cnd_stop_capturesize, (guint32)wtap_get_bytes_dumped(ld.pdh))){ /* Capture file reached its maximum size. */ if (capture_opts.ringbuffer_on) { @@ -1841,12 +1841,12 @@ capture(gboolean *stats_known, struct pcap_stat *stats) for (i = 0; i < N_COUNTS; i++) { snprintf(label_str, sizeof(label_str), "%d", *counts[i].value_ptr); - + gtk_label_set(GTK_LABEL(counts[i].value), label_str); - + snprintf(label_str, sizeof(label_str), "(%.1f%%)", pct(*counts[i].value_ptr, ld.counts.total)); - + gtk_label_set(GTK_LABEL(counts[i].percent), label_str); } @@ -1872,7 +1872,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats) } } } /* while (ld.go) */ - + /* delete stop conditions */ if (cnd_stop_capturesize != NULL) cnd_delete(cnd_stop_capturesize); @@ -2096,7 +2096,7 @@ capture_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) { static void capture_stop_cb(GtkWidget *w _U_, gpointer data) { loop_data *ld = (loop_data *) data; - + ld->go = FALSE; } @@ -2133,7 +2133,7 @@ capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr, loop_data *ld = (loop_data *) user; int err; - if ((++ld->counts.total >= ld->max) && (ld->max > 0)) + if ((++ld->counts.total >= ld->max) && (ld->max > 0)) { ld->go = FALSE; } @@ -1,23 +1,23 @@ /* capture.h * Definitions for packet capture windows * - * $Id: capture.h,v 1.31 2002/02/24 09:25:34 guy Exp $ + * $Id: capture.h,v 1.32 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c index 18e68b02e5..1b1adff53c 100644 --- a/capture_stop_conditions.c +++ b/capture_stop_conditions.c @@ -1,22 +1,22 @@ /* capture_stop_conditions.c * Implementation for 'stop condition handler'. * - * $Id: capture_stop_conditions.c,v 1.3 2002/05/04 09:20:28 guy Exp $ + * $Id: capture_stop_conditions.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,12 +25,12 @@ #include <time.h> #include <string.h> #include <stdlib.h> -#include <sys/stat.h> +#include <sys/stat.h> #include <stdarg.h> #include "conditions.h" #include "capture_stop_conditions.h" -/* predefined classes function prototypes */ +/* predefined classes function prototypes */ static condition* _cnd_constr_timeout(condition*, va_list); static void _cnd_destr_timeout(condition*); static gboolean _cnd_eval_timeout(condition*, va_list); @@ -52,12 +52,12 @@ void init_capture_stop_conditions(void){ _cnd_destr_capturesize, _cnd_eval_capturesize, _cnd_reset_capturesize); -} /* END init_capture_stop_conditions() */ +} /* END init_capture_stop_conditions() */ void cleanup_capture_stop_conditions(void){ cnd_unregister_class(CND_CLASS_TIMEOUT); cnd_unregister_class(CND_CLASS_CAPTURESIZE); -} /* END cleanup_capture_stop_conditions() */ +} /* END cleanup_capture_stop_conditions() */ /*****************************************************************************/ /* Predefined condition 'timeout'. */ @@ -65,7 +65,7 @@ void cleanup_capture_stop_conditions(void){ /* class id */ const char* CND_CLASS_TIMEOUT = "cnd_class_timeout"; -/* structure that contains user supplied data for this condition */ +/* structure that contains user supplied data for this condition */ typedef struct _cnd_timeout_dat{ time_t start_time; gint32 timeout_s; @@ -76,8 +76,8 @@ typedef struct _cnd_timeout_dat{ * 'cnd_new()' in order to perform class specific initialization. * * parameter: cnd - Pointer to condition passed by 'cnd_new()'. - * ap - Pointer to user supplied arguments list for this - * constructor. + * ap - Pointer to user supplied arguments list for this + * constructor. * returns: Pointer to condition - Construction was successful. * NULL - Construction failed. */ @@ -109,8 +109,8 @@ static void _cnd_destr_timeout(condition* cnd){ * 'cnd_eval()' in order to perform class specific condition checks. * * parameter: cnd - The inititalized timeout condition. - * ap - Pointer to user supplied arguments list for this - * handler. + * ap - Pointer to user supplied arguments list for this + * handler. * returns: TRUE - Condition is true. * FALSE - Condition is false. */ @@ -118,7 +118,7 @@ static gboolean _cnd_eval_timeout(condition* cnd, va_list ap _U_){ cnd_timeout_dat* data = (cnd_timeout_dat*)cnd_get_user_data(cnd); gint32 elapsed_time; /* check timeout here */ - if(data->timeout_s == 0) return FALSE; /* 0 == infinite */ + if(data->timeout_s == 0) return FALSE; /* 0 == infinite */ elapsed_time = time(NULL) - data->start_time; if(elapsed_time > data->timeout_s) return TRUE; return FALSE; @@ -132,16 +132,16 @@ static gboolean _cnd_eval_timeout(condition* cnd, va_list ap _U_){ */ static void _cnd_reset_timeout(condition *cnd){ ((cnd_timeout_dat*)cnd_get_user_data(cnd))->start_time = time(NULL); -} /* END _cnd_reset_timeout() */ - +} /* END _cnd_reset_timeout() */ + /*****************************************************************************/ /* Predefined condition 'max. capturesize'. */ -/* class id */ +/* class id */ const char* CND_CLASS_CAPTURESIZE = "cnd_class_capturesize"; -/* structure that contains user supplied data for this condition */ +/* structure that contains user supplied data for this condition */ typedef struct _cnd_capturesize_dat{ long max_capture_size; }cnd_capturesize_dat; @@ -151,8 +151,8 @@ typedef struct _cnd_capturesize_dat{ * 'cnd_new()' in order to perform class specific initialization. * * parameter: cnd - Pointer to condition passed by 'cnd_new()'. - * ap - Pointer to user supplied arguments list for this - * constructor. + * ap - Pointer to user supplied arguments list for this + * constructor. * returns: Pointer to condition - Construction was successful. * NULL - Construction failed. */ @@ -183,15 +183,15 @@ static void _cnd_destr_capturesize(condition* cnd){ * 'cnd_eval()' in order to perform class specific condition checks. * * parameter: cnd - The inititalized capturesize condition. - * ap - Pointer to user supplied arguments list for this - * handler. + * ap - Pointer to user supplied arguments list for this + * handler. * returns: TRUE - Condition is true. * FALSE - Condition is false. */ static gboolean _cnd_eval_capturesize(condition* cnd, va_list ap){ cnd_capturesize_dat* data = (cnd_capturesize_dat*)cnd_get_user_data(cnd); /* check capturesize here */ - if(data->max_capture_size == 0) return FALSE; /* 0 == infinite */ + if(data->max_capture_size == 0) return FALSE; /* 0 == infinite */ if(va_arg(ap, long) >= data->max_capture_size){ return TRUE; } @@ -205,4 +205,4 @@ static gboolean _cnd_eval_capturesize(condition* cnd, va_list ap){ * parameter: cnd - Pointer to an initialized condition. */ static void _cnd_reset_capturesize(condition *cnd _U_){ -} /* END _cnd_reset_capturesize() */ +} /* END _cnd_reset_capturesize() */ diff --git a/capture_stop_conditions.h b/capture_stop_conditions.h index 4a11636373..c5e8dcfb83 100644 --- a/capture_stop_conditions.h +++ b/capture_stop_conditions.h @@ -1,22 +1,22 @@ /* capture_stop_conditions.h * Implementation for 'stop condition handler'. * - * $Id: capture_stop_conditions.h,v 1.1 2001/12/04 07:32:00 guy Exp $ + * $Id: capture_stop_conditions.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,23 +1,23 @@ /* color.h * Definitions for "toolkit-independent" colors * - * $Id: color.h,v 1.1 2000/11/21 23:54:08 guy Exp $ + * $Id: color.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,22 +1,22 @@ /* column.c * Routines for handling column preferences * - * $Id: column.c,v 1.36 2002/08/02 23:35:46 jmayer Exp $ + * $Id: column.c,v 1.37 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -53,10 +53,10 @@ col_format_to_string(gint fmt) { "%rd", "%ud", "%hd", "%rhd", "%uhd", "%nd", "%rnd", "%und", "%S", "%rS", "%uS", "%D", "%rD", "%uD", "%p", "%i", "%L" }; - + if (fmt < 0 || fmt > NUM_COL_FMTS) return NULL; - + return(slist[fmt]); } @@ -80,10 +80,10 @@ col_format_desc(gint fmt) { "Src port (unresolved)", "Destination port", "Dest port (resolved)", "Dest port (unresolved)", "Protocol", "Information", "Packet length (bytes)" }; - + if (fmt < 0 || fmt > NUM_COL_FMTS) return NULL; - + return(dlist[fmt]); } @@ -303,9 +303,9 @@ gint get_column_format(gint col) { GList *clp = g_list_nth(prefs.col_list, col); fmt_data *cfmt; - + cfmt = (fmt_data *) clp->data; - + return(get_column_format_from_str(cfmt->fmt)); } @@ -378,8 +378,8 @@ gchar * get_column_title(gint col) { GList *clp = g_list_nth(prefs.col_list, col); fmt_data *cfmt; - + cfmt = (fmt_data *) clp->data; - return(cfmt->title); + return(cfmt->title); } @@ -1,23 +1,23 @@ /* column.h * Definitions for column handling routines * - * $Id: column.h,v 1.8 2001/07/22 21:56:25 guy Exp $ + * $Id: column.h,v 1.9 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/conditions.c b/conditions.c index 6971462f42..b9ae406f27 100644 --- a/conditions.c +++ b/conditions.c @@ -1,22 +1,22 @@ /* conditions.c * Implementation for condition handler. * - * $Id: conditions.c,v 1.2 2002/05/04 09:19:09 guy Exp $ + * $Id: conditions.c,v 1.3 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ #include <stdarg.h> #include "conditions.h" -/* container for condition classes */ +/* container for condition classes */ static GHashTable* classes = NULL; /* condition data structure declaration */ @@ -35,7 +35,7 @@ struct condition{ char* class_id; void* user_data; _cnd_eval eval_func; - _cnd_reset reset_func; + _cnd_reset reset_func; }; /* structure used to store class functions in GHashTable */ @@ -51,21 +51,21 @@ static void _cnd_init(); static void _cnd_find_hash_key_for_class_id(gpointer, gpointer, gpointer); condition* cnd_new(const char* class_id, ...){ - va_list ap; + va_list ap; condition *cnd = NULL, *cnd_ref = NULL; _cnd_class *cls = NULL; char* id = NULL; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* get class structure for this id */ + /* get class structure for this id */ if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) == NULL) return NULL; - /* initialize the basic structure */ + /* initialize the basic structure */ if((cnd_ref = (condition*)malloc(sizeof(condition))) == NULL) return NULL; cnd_ref->user_data = NULL; cnd_ref->eval_func = cls->eval_func; cnd_ref->reset_func = cls->reset_func; - /* copy the class id */ + /* copy the class id */ if((id = (char*)malloc(strlen(class_id)+1)) == NULL){ free(cnd_ref); return NULL; @@ -89,11 +89,11 @@ void cnd_delete(condition *cnd){ const char* class_id = cnd->class_id; /* check for valid pointer */ if(cnd == NULL) return; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* get the condition class */ + /* get the condition class */ cls = (_cnd_class*)g_hash_table_lookup(classes, class_id); - /* call class specific destructor */ + /* call class specific destructor */ if(cls != NULL) (cls->destr_func)(cnd); /* free memory */ free(cnd->class_id); @@ -102,11 +102,11 @@ void cnd_delete(condition *cnd){ } /* END cnd_delete() */ gboolean cnd_eval(condition *cnd, ...){ - va_list ap; + va_list ap; gboolean ret_val = FALSE; /* validate cnd */ if(cnd == NULL) return FALSE; - /* call specific handler */ + /* call specific handler */ va_start(ap, cnd); ret_val = (cnd->eval_func)(cnd, ap); va_end(ap); @@ -119,11 +119,11 @@ void cnd_reset(condition *cnd){ void* cnd_get_user_data(condition *cnd){ return cnd->user_data; -} /* END cnd_get_user_data() */ +} /* END cnd_get_user_data() */ void cnd_set_user_data(condition *cnd, void* user_data){ cnd->user_data = user_data; -} /* END cnd_set_user_data() */ +} /* END cnd_set_user_data() */ gboolean cnd_register_class(const char* class_id, _cnd_constr constr_func, @@ -133,19 +133,19 @@ gboolean cnd_register_class(const char* class_id, char* key = NULL; _cnd_class *cls = NULL; /* check for valid parameters */ - if((constr_func == NULL) || (destr_func == NULL) || + if((constr_func == NULL) || (destr_func == NULL) || (eval_func == NULL) || (reset_func == NULL) || (class_id == NULL)) return FALSE; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* check for unique class id */ + /* check for unique class id */ if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) != NULL) return FALSE; /* GHashTable keys need to be persistent for the lifetime of the hash table. Allocate memory and copy the class id which we use as key. */ if((key = (char*)malloc(strlen(class_id)+1)) == NULL) return FALSE; strcpy(key, class_id); - /* initialize class structure */ + /* initialize class structure */ if((cls = (_cnd_class*)malloc(sizeof(_cnd_class))) == NULL){ free(key); return FALSE; @@ -163,20 +163,20 @@ static char* pkey = NULL; void cnd_unregister_class(const char* class_id){ char *key = (char*)class_id; _cnd_class *cls = NULL; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* find the key for this class id and store it in 'pkey' */ + /* find the key for this class id and store it in 'pkey' */ g_hash_table_foreach(classes, _cnd_find_hash_key_for_class_id, key); /* find the class structure for this class id */ cls = (_cnd_class*)g_hash_table_lookup(classes, class_id); /* remove constructor from hash table */ - g_hash_table_remove(classes, class_id); - /* free the key */ + g_hash_table_remove(classes, class_id); + /* free the key */ free(pkey); pkey = NULL; - /* free the value */ + /* free the value */ free(cls); } /* END cnd_unregister_class() */ @@ -185,13 +185,13 @@ void cnd_unregister_class(const char* class_id){ */ static void _cnd_init(){ if(classes != NULL) return; - /* create hash table, we use strings as keys */ + /* create hash table, we use strings as keys */ classes = g_hash_table_new(g_str_hash, g_str_equal); } /* END _cnd_init() */ /* * Callback for function 'g_hash_table_foreach()'. - * We don't keep references to hash table keys. Keys have memory allocated + * We don't keep references to hash table keys. Keys have memory allocated * which must be freed when they are not used anymore. This function finds * the reference to a key corresponding to a particular class id. The reference * to the key is stored in a global variable. @@ -200,6 +200,6 @@ void _cnd_find_hash_key_for_class_id(gpointer key, gpointer value _U_, gpointer user_data){ char* class_id = (char*)user_data; - char* key_value = (char*)key; + char* key_value = (char*)key; if(strcmp(class_id, key_value) == 0) pkey = key; -} /* END _cnd_find_hash_key_for_class_id() */ +} /* END _cnd_find_hash_key_for_class_id() */ diff --git a/conditions.h b/conditions.h index 1aceaf95cb..7254f4c98f 100644 --- a/conditions.h +++ b/conditions.h @@ -1,22 +1,22 @@ /* conditions.h * Header for condition handler. * - * $Id: conditions.h,v 1.1 2001/12/04 07:32:00 guy Exp $ + * $Id: conditions.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,19 +29,19 @@ #include <glib.h> -/* forward declaration for type 'condition' */ +/* forward declaration for type 'condition' */ typedef struct condition condition; -/* condition evaluation handler type */ +/* condition evaluation handler type */ typedef gboolean (*_cnd_eval)(condition*, va_list); -/* condition reset handler type */ +/* condition reset handler type */ typedef void (*_cnd_reset)(condition*); -/* condition class constructor type */ +/* condition class constructor type */ typedef condition* (*_cnd_constr)(condition*, va_list); -/* condition class destructor type */ +/* condition class destructor type */ typedef void (*_cnd_destr)(condition*); /* @@ -50,7 +50,7 @@ typedef void (*_cnd_destr)(condition*); * * parameter: const char* - Identification of a registered condition class. * ... - Any number of class specific initial values. - * returns: Pointer to a initialized condition of the particular class on + * returns: Pointer to a initialized condition of the particular class on * success or NULL on failure. */ condition* cnd_new(const char*, ...); @@ -129,6 +129,6 @@ void* cnd_get_user_data(condition*); * void* - Pointer to user specified data structure. * returns: - */ -void cnd_set_user_data(condition*, void*); +void cnd_set_user_data(condition*, void*); #endif /* CONDITIONS_H */ @@ -1,6 +1,6 @@ /* dftest.c.c * - * $Id: dftest.c,v 1.4 2002/07/17 00:42:39 guy Exp $ + * $Id: dftest.c,v 1.5 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -108,7 +108,7 @@ main(int argc, char **argv) text = get_args_as_string(argc, argv, 1); printf("Filter: \"%s\"\n", text); - + /* Compile it */ if (!dfilter_compile(text, &df)) { fprintf(stderr, "dftest: %s\n", dfilter_error_msg); @@ -1,7 +1,7 @@ /* Edit capture files. We can delete records, adjust timestamps, or * simply convert from one format to another format. * - * $Id: editcap.c,v 1.25 2002/08/02 23:35:46 jmayer Exp $ + * $Id: editcap.c,v 1.26 2002/08/28 21:00:06 jmayer Exp $ * * Originally written by Richard Sharpe. * Improved by Guy Harris. @@ -61,7 +61,7 @@ static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */ /* Add a selection item, a simple parser for now */ -static void add_selection(char *sel) +static void add_selection(char *sel) { char *locn; char *next; @@ -134,7 +134,7 @@ typedef struct { static void edit_callback(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_, - union wtap_pseudo_header *pseudo_header, const guchar *buf) + union wtap_pseudo_header *pseudo_header, const guchar *buf) { callback_arg *argp = (callback_arg *)user; int err; @@ -187,7 +187,7 @@ edit_callback(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_, } phdr = &snap_phdr; } - + if (!wtap_dump(argp->pdh, phdr, pseudo_header, buf, &err)) { fprintf(stderr, "editcap: Error writing to %s: %s\n", argp->filename, @@ -328,7 +328,7 @@ int main(int argc, char *argv[]) exit(1); } break; - + case 'F': out_file_type = wtap_short_string_to_file_type(optarg); if (out_file_type < 0) { @@ -443,4 +443,4 @@ int main(int argc, char *argv[]) return 0; } - + @@ -1,22 +1,22 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h,v 1.25 2002/06/13 07:18:47 guy Exp $ + * $Id: etypes.h,v 1.26 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,22 +1,22 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.286 2002/08/28 10:07:26 guy Exp $ + * $Id: file.c,v 1.287 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -178,7 +178,7 @@ open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf) cf->progbar_nextstep = 0; firstsec = 0, firstusec = 0; prevsec = 0, prevusec = 0; - + cf->plist_chunk = g_mem_chunk_new("frame_data_chunk", sizeof(frame_data), FRAME_DATA_CHUNK_SIZE * sizeof(frame_data), @@ -377,7 +377,7 @@ read_cap_file(capture_file *cf, int *err) g_free(load_msg); } if (progbar != NULL) { - g_snprintf(status_str, sizeof(status_str), + g_snprintf(status_str, sizeof(status_str), "%luKB of %luKB", file_pos / 1024, cf->f_len / 1024); update_progress_dlg(progbar, prog_val, status_str); } @@ -532,7 +532,7 @@ continue_tail_cap_file(capture_file *cf, int to_read, int *err) /* XXX - this cheats and looks inside the packet list to find the final row number. */ if (auto_scroll_live && cf->plist_end != NULL) - gtk_clist_moveto(GTK_CLIST(packet_list), + gtk_clist_moveto(GTK_CLIST(packet_list), GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0); if (cf->state == FILE_READ_ABORTED) { @@ -581,7 +581,7 @@ finish_tail_cap_file(capture_file *cf, int *err) if (auto_scroll_live && cf->plist_end != NULL) /* XXX - this cheats and looks inside the packet list to find the final row number. */ - gtk_clist_moveto(GTK_CLIST(packet_list), + gtk_clist_moveto(GTK_CLIST(packet_list), GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0); /* We're done reading sequentially through the file. */ @@ -740,7 +740,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, cf->esec = fdata->rel_secs; cf->eusec = fdata->rel_usecs; } - + /* Get the time elapsed between the previous displayed packet and this packet. */ compute_timestamp_diff(&fdata->del_secs, &fdata->del_usecs, @@ -827,7 +827,7 @@ read_packet(capture_file *cf, long offset) epan_dissect_run(edt, pseudo_header, buf, fdata, NULL); passed = dfilter_apply_edt(cf->rfcode, edt); epan_dissect_free(edt); - } + } if (passed) { plist_end = cf->plist_end; fdata->prev = plist_end; @@ -1057,7 +1057,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, if (fdata == selected_frame) selected_row = row; } - + if (redissect) { /* Clear out what remains of the visited flags and per-frame data pointers. @@ -1227,7 +1227,7 @@ print_packets(capture_file *cf, print_args_t *print_args) } count++; - /* Check to see if we are suppressing unmarked packets, if so, + /* Check to see if we are suppressing unmarked packets, if so, * suppress them and then proceed to check for visibility. */ if (((print_args->suppress_unmarked && fdata->flags.marked ) || @@ -1306,7 +1306,7 @@ print_packets(capture_file *cf, print_args_t *print_args) print_finale(cf->print_fh, print_args->format); close_print_dest(print_args->to_file, cf->print_fh); - + cf->print_fh = NULL; return TRUE; @@ -1489,7 +1489,7 @@ find_packet(capture_file *cf, dfilter_t *sfcode) if (progbar == NULL) progbar = delayed_create_progress_dlg("Searching", cf->sfilter, "Cancel", &stop_flag, &start_time, prog_val); - + if (progbar != NULL) { g_snprintf(status_str, sizeof(status_str), "%4u of %u frames", count, cf->count); @@ -1794,8 +1794,8 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered, statusbar_push_file_msg(save_msg); g_free(save_msg); - /* - * Check that the from file is not the same as to file + /* + * Check that the from file is not the same as to file * We do it here so we catch all cases ... * Unfortunately, the file requester gives us an absolute file * name and the read file name may be relative (if supplied on @@ -1806,7 +1806,7 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered, stat(cf->filename, &infile); stat(fname, &outfile); if (infile.st_ino == outfile.st_ino) { - simple_dialog(ESD_TYPE_CRIT, NULL, + simple_dialog(ESD_TYPE_CRIT, NULL, "Can't save over current capture file: %s!", cf->filename); goto fail; @@ -1,22 +1,22 @@ /* file.h * Definitions for file structures and routines * - * $Id: file.h,v 1.96 2002/08/02 23:35:46 jmayer Exp $ + * $Id: file.h,v 1.97 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -63,9 +63,9 @@ typedef struct _capture_file { gchar *save_file; /* File that user saved capture to */ int save_file_fd; /* File descriptor for saved file */ wtap *wth; /* Wiretap session */ - dfilter_t *rfcode; /* Compiled read filter program */ + dfilter_t *rfcode; /* Compiled read filter program */ gchar *dfilter; /* Display filter string */ - dfilter_t *dfcode; /* Compiled display filter program */ + dfilter_t *dfcode; /* Compiled display filter program */ #ifdef HAVE_LIBPCAP gchar *cfilter; /* Capture filter string */ #endif @@ -1,22 +1,22 @@ /* filters.c * Code for reading and writing the filters file. * - * $Id: filters.c,v 1.14 2002/01/21 07:36:31 guy Exp $ + * $Id: filters.c,v 1.15 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -247,7 +247,7 @@ read_filter_list(filter_list_type_t list, char **pref_path_return, line); continue; } - + /* Skip over separating white space, if any. */ while ((c = getc(ff)) != EOF && isspace(c)) { if (c == '\n') @@ -354,7 +354,7 @@ GList * get_filter_list_first(filter_list_type_t list) { GList **flp; - + flp = get_filter_list(list); return g_list_first(*flp); } @@ -368,7 +368,7 @@ add_to_filter_list(filter_list_type_t list, char *name, char *expression) { GList **flp; filter_def *filt; - + flp = get_filter_list(list); filt = (filter_def *) g_malloc(sizeof(filter_def)); filt->name = g_strdup(name); @@ -385,7 +385,7 @@ remove_from_filter_list(filter_list_type_t list, GList *fl_entry) { GList **flp; filter_def *filt; - + flp = get_filter_list(list); filt = (filter_def *) fl_entry->data; g_free(filt->name); @@ -412,7 +412,7 @@ save_filter_list(filter_list_type_t list, char **pref_path_return, filter_def *filt; FILE *ff; guchar *p, c; - + *pref_path_return = NULL; /* assume no error */ switch (list) { @@ -1,23 +1,23 @@ /* filters.c * Declarations of routines for reading and writing the filters file. * - * $Id: filters.h,v 1.2 2001/01/28 09:13:07 guy Exp $ + * $Id: filters.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,23 +1,23 @@ /* follow.c * - * $Id: follow.c,v 1.30 2002/08/02 23:35:46 jmayer Exp $ + * $Id: follow.c,v 1.31 2002/08/28 21:00:06 jmayer Exp $ * * Copyright 1998 Mike Hall <mlh@io.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -64,21 +64,21 @@ follow_tcp_stats(follow_tcp_stats_t* stats) } } -/* this will build libpcap filter text that will only - pass the packets related to the stream. There is a - chance that two streams could intersect, but not a +/* this will build libpcap filter text that will only + pass the packets related to the stream. There is a + chance that two streams could intersect, but not a very good one */ -char* +char* build_follow_filter( packet_info *pi ) { char* buf = g_malloc(1024); int len; if( pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4 && pi->ipproto == 6 ) { /* TCP over IPv4 */ - sprintf( buf, + sprintf( buf, "(ip.addr eq %s and ip.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", - ip_to_str( pi->net_src.data), - ip_to_str( pi->net_dst.data), + ip_to_str( pi->net_src.data), + ip_to_str( pi->net_dst.data), pi->srcport, pi->destport ); len = 4; is_ipv6 = FALSE; @@ -86,15 +86,15 @@ build_follow_filter( packet_info *pi ) { else if( pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6 && pi->ipproto == 6 ) { /* TCP over IPv6 */ - sprintf( buf, + sprintf( buf, "(ipv6.addr eq %s and ipv6.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", - ip6_to_str((struct e_in6_addr *)pi->net_src.data), - ip6_to_str((struct e_in6_addr *)pi->net_dst.data), + ip6_to_str((struct e_in6_addr *)pi->net_src.data), + ip6_to_str((struct e_in6_addr *)pi->net_dst.data), pi->srcport, pi->destport ); len = 16; is_ipv6 = TRUE; } - else { + else { g_free( buf ); return NULL; } @@ -106,7 +106,7 @@ build_follow_filter( packet_info *pi ) { } /* here we are going to try and reconstruct the data portion of a TCP - session. We will try and handle duplicates, TCP fragments, and out + session. We will try and handle duplicates, TCP fragments, and out of order packets in a smart way. */ static tcp_frag *frags[2] = { 0, 0 }; @@ -114,7 +114,7 @@ static gulong seq[2]; static guint8 src_addr[2][MAX_IPADDR_LEN]; static guint src_port[2] = { 0, 0 }; -void +void reassemble_tcp( gulong sequence, gulong length, const char* data, gulong data_length, int synflag, address *net_src, address *net_dst, guint srcport, guint dstport) { @@ -123,9 +123,9 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, gulong newseq; tcp_frag *tmp_frag; tcp_stream_chunk sc; - + src_index = -1; - + /* First, check if this packet should be processed. */ if ((net_src->type != AT_IPv4 && net_src->type != AT_IPv6) || @@ -140,7 +140,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, /* Now check if the packet is for this connection. */ memcpy(srcx, net_src->data, len); memcpy(dstx, net_dst->data, len); - if ((memcmp(srcx, ip_address[0], len) != 0 && + if ((memcmp(srcx, ip_address[0], len) != 0 && memcmp(srcx, ip_address[1], len) != 0) || (memcmp(dstx, ip_address[0], len) != 0 && memcmp(dstx, ip_address[1], len) != 0) || @@ -183,7 +183,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, incomplete_tcp_stream = TRUE; } - /* now that we have filed away the srcs, lets get the sequence number stuff + /* now that we have filed away the srcs, lets get the sequence number stuff figured out */ if( first ) { /* this is the first time we have seen this src's sequence number */ @@ -198,14 +198,14 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, /* if we are here, we have already seen this src, let's try and figure out if this packet is in the right place */ if( sequence < seq[src_index] ) { - /* this sequence number seems dated, but + /* this sequence number seems dated, but check the end to make sure it has no more info than we have already seen */ newseq = sequence + length; if( newseq > seq[src_index] ) { gulong new_len; - /* this one has more than we have seen. let's get the + /* this one has more than we have seen. let's get the payload that we have not seen. */ new_len = seq[src_index] - sequence; @@ -221,7 +221,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, sc.dlen = data_length; sequence = seq[src_index]; length = newseq - seq[src_index]; - + /* this will now appear to be right on time :) */ } } @@ -257,7 +257,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, /* here we search through all the frag we have collected to see if one fits */ -static int +static int check_fragments( int index, tcp_stream_chunk *sc ) { tcp_frag *prev = NULL; tcp_frag *current; @@ -286,7 +286,7 @@ check_fragments( int index, tcp_stream_chunk *sc ) { } /* this should always be called before we start to reassemble a stream */ -void +void reset_tcp_reassembly() { tcp_frag *current, *next; int i; @@ -301,7 +301,7 @@ reset_tcp_reassembly() { current = frags[i]; while( current ) { next = current->next; - free( current->data ); + free( current->data ); free( current ); current = next; } @@ -309,7 +309,7 @@ reset_tcp_reassembly() { } } -static void +static void write_packet_data( int index, tcp_stream_chunk *sc, const char *data ) { fwrite( sc, 1, sizeof(tcp_stream_chunk), data_out_file ); @@ -1,23 +1,23 @@ /* follow.h * - * $Id: follow.h,v 1.12 2002/08/02 23:35:46 jmayer Exp $ + * $Id: follow.h,v 1.13 2002/08/28 21:00:06 jmayer Exp $ * * Copyright 1998 Mike Hall <mlh@io.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -48,7 +48,7 @@ typedef struct _tcp_stream_chunk { } tcp_stream_chunk; char* build_follow_filter( packet_info * ); -void reassemble_tcp( gulong, gulong, const char*, gulong, int, +void reassemble_tcp( gulong, gulong, const char*, gulong, int, address *, address *, guint, guint ); void reset_tcp_reassembly( void ); diff --git a/format-oid.h b/format-oid.h index de6093f150..86f6c3694d 100644 --- a/format-oid.h +++ b/format-oid.h @@ -1,22 +1,22 @@ /* format-oid.h * Declare routine for formatting OIDs * - * $Id: format-oid.h,v 1.1 2002/03/11 01:48:08 guy Exp $ + * $Id: format-oid.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Didier Jorand - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,6 +1,6 @@ /* Getopt for GNU. - $Id: getopt.c,v 1.3 2000/11/08 19:57:39 guy Exp $ + $Id: getopt.c,v 1.4 2002/08/28 21:00:06 jmayer Exp $ NOTE: getopt is now part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu @@ -159,7 +159,7 @@ static enum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER } ordering; - + #ifdef __GNU_LIBRARY__ /* We want to avoid inclusion of string.h with non-GNU libraries because there are many ways it can cause trouble. @@ -202,7 +202,7 @@ extern size_t strlen (const char *); #endif #endif /* GNU C library. */ - + /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have @@ -276,7 +276,7 @@ exchange (argv) first_nonopt += (optind - last_nonopt); last_nonopt = optind; } - + /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. @@ -680,7 +680,7 @@ getopt (argc, argv, optstring) } #endif /* _LIBC or not __GNU_LIBRARY__. */ - + #ifdef TEST /* Compile with -DTEST to make an executable for use in testing @@ -1,22 +1,22 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.28 2002/01/21 07:36:31 guy Exp $ + * $Id: globals.h,v 1.29 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/greproto.h b/greproto.h index 1451752964..01150ae3a9 100644 --- a/greproto.h +++ b/greproto.h @@ -10,22 +10,22 @@ * definition for them; when this file is empty, get rid of all includes * of it, and get rid of it. * - * $Id: greproto.h,v 1.2 2002/01/21 07:36:31 guy Exp $ + * $Id: greproto.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 743eae4860..a6b5573496 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1,22 +1,22 @@ /* capture_dlg.c * Routines for packet capture windows * - * $Id: capture_dlg.c,v 1.70 2002/07/17 00:42:56 guy Exp $ + * $Id: capture_dlg.c,v 1.71 2002/08/28 21:03:45 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -185,7 +185,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) simple_dialog(ESD_TYPE_WARN, NULL, "Can't get list of interfaces: %s", err_str); } - + cap_open_w = dlg_window_new("Ethereal: Capture Options"); gtk_signal_connect(GTK_OBJECT(cap_open_w), "destroy", GTK_SIGNAL_FUNC(capture_prep_destroy_cb), NULL); @@ -195,12 +195,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) Ctrl+<key> is an accelerator). */ accel_group = gtk_accel_group_new(); gtk_window_add_accel_group(GTK_WINDOW(cap_open_w), accel_group); - + main_vb = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb); gtk_widget_show(main_vb); - + /* Capture-related options frame */ capture_fr = gtk_frame_new("Capture"); gtk_container_add(GTK_CONTAINER(main_vb), capture_fr); @@ -218,7 +218,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) if_lb = gtk_label_new("Interface:"); gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 6); gtk_widget_show(if_lb); - + if_cb = gtk_combo_new(); if (if_list != NULL) gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), if_list); @@ -234,7 +234,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_list->data); gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 6); gtk_widget_show(if_cb); - + free_interface_list(if_list); /* Capture length row */ @@ -256,9 +256,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) snap_sb = gtk_spin_button_new (snap_adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE); gtk_widget_set_usize (snap_sb, 80, 0); - gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0); gtk_widget_show(snap_sb); - + snap_lb = gtk_label_new("bytes"); gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5); gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0); @@ -280,15 +280,15 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) filter_bt = gtk_button_new_with_label("Filter:"); gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked", GTK_SIGNAL_FUNC(capture_filter_construct_cb), NULL); - gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3); gtk_widget_show(filter_bt); - + filter_te = gtk_entry_new(); if (cfile.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.cfilter); gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te); - gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3); + gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3); gtk_widget_show(filter_te); - + /* Capture file-related options frame */ file_fr = gtk_frame_new("Capture file(s)"); gtk_container_add(GTK_CONTAINER(main_vb), file_fr); @@ -304,11 +304,11 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(file_hb); file_bt = gtk_button_new_with_label("File:"); - gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3); gtk_widget_show(file_bt); - + file_te = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3); + gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3); gtk_widget_show(file_te); gtk_signal_connect(GTK_OBJECT(file_bt), "clicked", @@ -332,7 +332,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) GTK_SIGNAL_FUNC(capture_prep_adjust_sensitivity), GTK_OBJECT(cap_open_w)); gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_on_tb, FALSE, FALSE, 0); gtk_widget_show(ringbuffer_on_tb); - + ringbuffer_nbf_lb = gtk_label_new("Number of files"); gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 1, 0.5); gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_nbf_lb, FALSE, FALSE, 6); @@ -343,9 +343,9 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) ringbuffer_nbf_sb = gtk_spin_button_new (ringbuffer_nbf_adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ringbuffer_nbf_sb), TRUE); gtk_widget_set_usize (ringbuffer_nbf_sb, 40, 0); - gtk_box_pack_start (GTK_BOX(ringbuffer_hb), ringbuffer_nbf_sb, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX(ringbuffer_hb), ringbuffer_nbf_sb, TRUE, TRUE, 0); gtk_widget_show(ringbuffer_nbf_sb); - + /* Display-related options frame */ display_fr = gtk_frame_new("Display options"); gtk_container_add(GTK_CONTAINER(main_vb), display_fr); @@ -399,14 +399,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) count_sb = gtk_spin_button_new (count_adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (count_sb), TRUE); gtk_widget_set_usize (count_sb, 80, 0); - gtk_box_pack_start (GTK_BOX(count_hb), count_sb, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(count_hb), count_sb, FALSE, FALSE, 0); gtk_widget_show(count_sb); - + count_lb = gtk_label_new("packet(s) captured"); gtk_misc_set_alignment(GTK_MISC(count_lb), 0, 0.5); gtk_box_pack_start(GTK_BOX(count_hb), count_lb, FALSE, FALSE, 0); gtk_widget_show(count_lb); - + /* Filesize row */ filesize_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(limit_vb), filesize_hb); @@ -425,14 +425,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) filesize_sb = gtk_spin_button_new (filesize_adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (filesize_sb), TRUE); gtk_widget_set_usize (filesize_sb, 80, 0); - gtk_box_pack_start (GTK_BOX(filesize_hb), filesize_sb, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(filesize_hb), filesize_sb, FALSE, FALSE, 0); gtk_widget_show(filesize_sb); - + filesize_lb = gtk_label_new(""); gtk_misc_set_alignment(GTK_MISC(filesize_lb), 0, 0.5); gtk_box_pack_start(GTK_BOX(filesize_hb), filesize_lb, FALSE, FALSE, 0); gtk_widget_show(filesize_lb); - + /* Duration row */ duration_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(limit_vb), duration_hb); @@ -451,14 +451,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) duration_sb = gtk_spin_button_new (duration_adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (duration_sb), TRUE); gtk_widget_set_usize (duration_sb, 80, 0); - gtk_box_pack_start (GTK_BOX(duration_hb), duration_sb, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(duration_hb), duration_sb, FALSE, FALSE, 0); gtk_widget_show(duration_sb); - + duration_lb = gtk_label_new("second(s)"); gtk_misc_set_alignment(GTK_MISC(duration_lb), 0, 0.5); gtk_box_pack_start(GTK_BOX(duration_hb), duration_lb, FALSE, FALSE, 0); gtk_widget_show(duration_lb); - + /* Resolution options frame */ resolv_fr = gtk_frame_new("Name resolution"); gtk_container_add(GTK_CONTAINER(main_vb), resolv_fr); @@ -488,7 +488,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) g_resolv_flags & RESOLV_TRANSPORT); gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb); gtk_widget_show(t_resolv_cb); - + /* Button row: OK and cancel buttons */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); @@ -618,7 +618,7 @@ capture_prep_file_cb(GtkWidget *w, gpointer file_te) the ESC key being pressed and act as if the "Cancel" button had been selected. */ dlg_set_cancel(fs, GTK_FILE_SELECTION(fs)->cancel_button); - + gtk_widget_show(fs); } @@ -635,7 +635,7 @@ static void cap_prep_fs_cancel_cb(GtkWidget *w _U_, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); -} +} static void cap_prep_fs_destroy_cb(GtkWidget *win, gpointer data _U_) @@ -735,7 +735,7 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { if (cfile.cfilter) g_free(cfile.cfilter); g_assert(filter_text != NULL); - cfile.cfilter = g_strdup(filter_text); + cfile.cfilter = g_strdup(filter_text); save_file = gtk_entry_get_text(GTK_ENTRY(file_te)); if (save_file && save_file[0]) { @@ -899,7 +899,7 @@ capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w) in real time" captures, so make its toggle button insensitive. */ gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), FALSE); } - + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb))) { /* Ring buffer mode enabled. Make the spin button for the number of ring buffer files, and its label, sensitive. */ diff --git a/gtk/capture_dlg.h b/gtk/capture_dlg.h index 6e35eb0e12..5a24ea677e 100644 --- a/gtk/capture_dlg.h +++ b/gtk/capture_dlg.h @@ -1,23 +1,23 @@ /* capture_dlg.h * Definitions for packet capture windows * - * $Id: capture_dlg.h,v 1.2 2000/10/11 06:01:16 guy Exp $ + * $Id: capture_dlg.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index 18d25c5907..c44640ed89 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -1,22 +1,22 @@ /* capture_prefs.c * Dialog box for capture preferences * - * $Id: capture_prefs.c,v 1.13 2002/07/17 00:22:30 guy Exp $ + * $Id: capture_prefs.c,v 1.14 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -76,7 +76,7 @@ capture_prefs_show(void) gtk_table_attach_defaults(GTK_TABLE(main_tb), if_lb, 0, 1, 0, 1); gtk_misc_set_alignment(GTK_MISC(if_lb), 1.0, 0.5); gtk_widget_show(if_lb); - + if_cb = gtk_combo_new(); /* * XXX - what if we can't get the list? @@ -90,7 +90,7 @@ capture_prefs_show(void) gtk_table_attach_defaults(GTK_TABLE(main_tb), if_cb, 1, 2, 0, 1); gtk_widget_show(if_cb); gtk_object_set_data(GTK_OBJECT(main_vb), DEVICE_KEY, if_cb); - + free_interface_list(if_list); /* Promiscuous mode */ diff --git a/gtk/capture_prefs.h b/gtk/capture_prefs.h index ba52a851dc..b6f7a70dc3 100644 --- a/gtk/capture_prefs.h +++ b/gtk/capture_prefs.h @@ -1,22 +1,22 @@ /* capture_prefs.h * Definitions for capture preferences window * - * $Id: capture_prefs.h,v 1.1 2002/01/10 07:43:39 guy Exp $ + * $Id: capture_prefs.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index e9c103e4e7..693d0b3ea5 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -1,22 +1,22 @@ /* color_dlg.c * Definitions for dialog boxes for color filters * - * $Id: color_dlg.c,v 1.15 2002/08/02 22:34:53 jmayer Exp $ + * $Id: color_dlg.c,v 1.16 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1141,14 +1141,14 @@ color_sel_ok_cb (GtkButton *button _U_, color_sel_win_destroy(color_dialog); /* now apply the change to the fore/background */ - + style = gtk_style_copy(gtk_widget_get_style(filt_name_entry)); if (is_bg) style->base[GTK_STATE_NORMAL] = new_color; else style->fg[GTK_STATE_NORMAL] = new_color; gtk_widget_set_style(filt_name_entry, style); - gtk_widget_set_style(filt_text_entry, style); + gtk_widget_set_style(filt_text_entry, style); } } diff --git a/gtk/color_dlg.h b/gtk/color_dlg.h index 78d57997b7..483237fd03 100644 --- a/gtk/color_dlg.h +++ b/gtk/color_dlg.h @@ -1,23 +1,23 @@ /* color_dlg.h * Definitions for dialog boxes for color filters * - * $Id: color_dlg.h,v 1.1 2000/02/12 08:31:47 guy Exp $ + * $Id: color_dlg.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/color_utils.c b/gtk/color_utils.c index 055a9356aa..39e4bbc25c 100644 --- a/gtk/color_utils.c +++ b/gtk/color_utils.c @@ -2,23 +2,23 @@ * Utilities for converting between "toolkit-independent" and GDK * notions of color * - * $Id: color_utils.c,v 1.1 2000/11/21 23:54:09 guy Exp $ + * $Id: color_utils.c,v 1.2 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/color_utils.h b/gtk/color_utils.h index e25fbc5549..7d4ed44dfa 100644 --- a/gtk/color_utils.h +++ b/gtk/color_utils.h @@ -2,23 +2,23 @@ * Declarations of utilities for converting between "toolkit-independent" * and GDK notions of color * - * $Id: color_utils.h,v 1.1 2000/11/21 23:54:09 guy Exp $ + * $Id: color_utils.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/colors.c b/gtk/colors.c index cad130077d..0aa4b5e119 100644 --- a/gtk/colors.c +++ b/gtk/colors.c @@ -1,22 +1,22 @@ /* colors.c * Definitions for color structures and routines * - * $Id: colors.c,v 1.22 2002/08/02 22:34:53 jmayer Exp $ + * $Id: colors.c,v 1.23 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -126,7 +126,7 @@ prime_edt(gpointer data, gpointer user_data) if (colorf->c_colorfilter != NULL) epan_dissect_prime_dfilter(edt, colorf->c_colorfilter); -} +} /* Prime the epan_dissect_t with all the compiler * color filters in 'filter_list'. */ @@ -171,7 +171,7 @@ read_filters(void) do { if (fgets(buf,sizeof buf, f) == NULL) break; - + if (strspn(buf," \t") == (size_t)((strchr(buf,'*') - buf))) { /* leading # comment */ continue; diff --git a/gtk/colors.h b/gtk/colors.h index 986c49301e..d259c80420 100644 --- a/gtk/colors.h +++ b/gtk/colors.h @@ -1,22 +1,22 @@ /* colors.h * Definitions for color structures and routines * - * $Id: colors.h,v 1.7 2002/05/27 22:00:37 guy Exp $ + * $Id: colors.h,v 1.8 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 6edf938831..0c0780fe37 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -1,22 +1,22 @@ /* column_prefs.c * Dialog box for column preferences * - * $Id: column_prefs.c,v 1.11 2002/04/23 06:25:37 guy Exp $ + * $Id: column_prefs.c,v 1.12 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -68,12 +68,12 @@ column_prefs_show() { gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_widget_show(main_vb); gtk_object_set_data(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE); - + /* Top row: Column list and buttons */ top_hb = gtk_hbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(main_vb), top_hb); gtk_widget_show(top_hb); - + list_bb = gtk_vbutton_box_new(); gtk_button_box_set_layout (GTK_BUTTON_BOX (list_bb), GTK_BUTTONBOX_START); gtk_container_add(GTK_CONTAINER(top_hb), list_bb); @@ -84,32 +84,32 @@ column_prefs_show() { GTK_SIGNAL_FUNC(column_list_new_cb), NULL); gtk_container_add(GTK_CONTAINER(list_bb), new_bt); gtk_widget_show(new_bt); - + del_bt = gtk_button_new_with_label ("Delete"); gtk_widget_set_sensitive(del_bt, FALSE); gtk_signal_connect(GTK_OBJECT(del_bt), "clicked", GTK_SIGNAL_FUNC(column_list_delete_cb), NULL); gtk_container_add(GTK_CONTAINER(list_bb), del_bt); gtk_widget_show(del_bt); - + arrow_hb = gtk_hbox_new(TRUE, 3); gtk_container_add(GTK_CONTAINER(list_bb), arrow_hb); gtk_widget_show(arrow_hb); - + up_bt = gtk_button_new_with_label("Up"); gtk_widget_set_sensitive(up_bt, FALSE); gtk_signal_connect(GTK_OBJECT(up_bt), "clicked", GTK_SIGNAL_FUNC(column_arrow_cb), NULL); gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0); gtk_widget_show(up_bt); - + dn_bt = gtk_button_new_with_label("Down"); gtk_widget_set_sensitive(dn_bt, FALSE); gtk_signal_connect(GTK_OBJECT(dn_bt), "clicked", GTK_SIGNAL_FUNC(column_arrow_cb), NULL); gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0); gtk_widget_show(dn_bt); - + column_sc = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(column_sc), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -136,24 +136,24 @@ column_prefs_show() { while (clp) { cfmt = (fmt_data *) clp->data; col_ent[0] = cfmt->title; - col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt)); + col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt)); row = gtk_clist_append(GTK_CLIST(column_l), col_ent); gtk_clist_set_row_data(GTK_CLIST(column_l), row, clp); clp = clp->next; } - + /* Colunm name entry and format selection */ tb = gtk_table_new(2, 2, FALSE); gtk_container_add(GTK_CONTAINER(main_vb), tb); gtk_table_set_row_spacings(GTK_TABLE(tb), 10); gtk_table_set_col_spacings(GTK_TABLE(tb), 15); gtk_widget_show(tb); - + lb = gtk_label_new("Column title:"); gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5); gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1); gtk_widget_show(lb); - + title_te = gtk_entry_new(); gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1); gtk_signal_connect(GTK_OBJECT(title_te), "changed", @@ -184,12 +184,12 @@ column_prefs_show() { gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt); gtk_widget_set_sensitive(fmt_m, FALSE); gtk_box_pack_start(GTK_BOX(top_hb), fmt_m, FALSE, FALSE, 0); - gtk_widget_show(fmt_m); - + gtk_widget_show(fmt_m); + return(main_vb); } -/* For each selection, set the entry and option menu widgets to match +/* For each selection, set the entry and option menu widgets to match the currently selected item. Set the up/down button sensitivity. Draw focus to the entry widget. */ static void @@ -200,7 +200,7 @@ column_list_select_cb(GtkCList *clist, gpointer user_data _U_) { fmt_data *cfmt; GList *clp; - + clp = gtk_clist_get_row_data(clist, row); g_assert(clp != NULL); cfmt = (fmt_data *) clp->data; @@ -211,7 +211,7 @@ column_list_select_cb(GtkCList *clist, gtk_entry_set_text(GTK_ENTRY(title_te), cfmt->title); gtk_editable_select_region(GTK_EDITABLE(title_te), 0, -1); gtk_widget_grab_focus(title_te); - + gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt); gtk_widget_set_sensitive(del_bt, TRUE); @@ -227,10 +227,10 @@ column_list_unselect_cb(GtkCList *clist _U_, gint column _U_, GdkEvent *event _U_, gpointer user_data _U_) { - + cur_row = -1; gtk_editable_delete_text(GTK_EDITABLE(title_te), 0, -1); - + gtk_widget_set_sensitive(del_bt, FALSE); gtk_widget_set_sensitive(title_te, FALSE); gtk_widget_set_sensitive(fmt_m, FALSE); @@ -239,12 +239,12 @@ column_list_unselect_cb(GtkCList *clist _U_, } /* To do: add input checking to each of these callbacks */ - + static void column_list_new_cb(GtkWidget *w _U_, gpointer data _U_) { fmt_data *cfmt; gchar *title = "New Column", *col_ent[2]; - + cur_fmt = 0; cfmt = (fmt_data *) g_malloc(sizeof(fmt_data)); cfmt->title = g_strdup(title); @@ -281,9 +281,9 @@ static void column_entry_changed_cb(GtkEditable *te, gpointer data) { fmt_data *cfmt; GList *clp; - GtkCList *cl = data; + GtkCList *cl = data; gchar *title; - + if (cur_row >= 0) { title = gtk_editable_get_chars(te, 0, -1); clp = gtk_clist_get_row_data(cl, cur_row); @@ -300,7 +300,7 @@ static void column_menu_changed_cb(GtkWidget *w _U_, gpointer data) { fmt_data *cfmt; GList *clp; - + if (cur_row >= 0) { cur_fmt = (gint) data; clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row); @@ -317,15 +317,15 @@ column_arrow_cb(GtkWidget *w, gpointer data _U_) { GList *clp; fmt_data *cfmt; gint inc = 1; - - g_assert(cur_row >= 0); + + g_assert(cur_row >= 0); if (w == up_bt) inc = -1; - + /* This would end up appending to the list. We shouldn't have to check for appending past the end of the list. */ - g_assert((cur_row + inc) >= 0); + g_assert((cur_row + inc) >= 0); clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row); cfmt = (fmt_data *) clp->data; @@ -363,9 +363,9 @@ column_prefs_apply(GtkWidget *w _U_) { void column_prefs_destroy(GtkWidget *w) { - + /* Let the list cb know we're about to destroy the widget tree, so it */ - /* doesn't operate on widgets that don't exist. */ + /* doesn't operate on widgets that don't exist. */ gtk_object_set_data(GTK_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE); gtk_widget_destroy(GTK_WIDGET(w)); -} +} diff --git a/gtk/column_prefs.h b/gtk/column_prefs.h index 9671f11e1f..c3022e9552 100644 --- a/gtk/column_prefs.h +++ b/gtk/column_prefs.h @@ -1,23 +1,23 @@ /* gui_prefs.h * Definitions for column preferences window * - * $Id: column_prefs.h,v 1.2 2000/08/21 08:09:10 guy Exp $ + * $Id: column_prefs.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 5be198efa7..ce40e321b0 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -1,6 +1,6 @@ /* decode_as_dlg.c * - * $Id: decode_as_dlg.c,v 1.24 2002/08/02 22:34:53 jmayer Exp $ + * $Id: decode_as_dlg.c,v 1.25 2002/08/28 21:03:46 jmayer Exp $ * * Routines to modify dissector tables on the fly. * @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -326,7 +326,7 @@ decode_show_reset_cb (GtkWidget *reset_bt _U_, gpointer parent_w) { dissector_delete_item_t *item; GSList *tmp; - + dissector_all_tables_foreach_changed(decode_build_reset_list, NULL); for (tmp = dissector_reset_list; tmp; tmp = g_slist_next(tmp)) { @@ -405,7 +405,7 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_) GTK_SIGNAL_FUNC(decode_show_delete_cb), NULL); gtk_signal_connect(GTK_OBJECT(decode_show_w), "destroy", GTK_SIGNAL_FUNC(decode_show_destroy_cb), NULL); - + /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); @@ -1223,7 +1223,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_) GTK_SIGNAL_FUNC(decode_delete_cb), NULL); gtk_signal_connect(GTK_OBJECT(decode_w), "destroy", GTK_SIGNAL_FUNC(decode_destroy_cb), NULL); - + /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 2); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); diff --git a/gtk/decode_as_dlg.h b/gtk/decode_as_dlg.h index b230c92fff..aa289b91c7 100644 --- a/gtk/decode_as_dlg.h +++ b/gtk/decode_as_dlg.h @@ -1,6 +1,6 @@ /* decode_as_dlg.c * - * $Id: decode_as_dlg.h,v 1.2 2001/02/11 23:02:05 guy Exp $ + * $Id: decode_as_dlg.h,v 1.3 2002/08/28 21:03:46 jmayer Exp $ * * Routines to modify dissector tables on the fly. * @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index ab0727f33d..b661b2a73c 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c,v 1.26 2002/08/02 22:34:53 jmayer Exp $ + * $Id: dfilter_expr_dlg.c,v 1.27 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -17,22 +17,22 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Todo - +/* Todo - * may want to check the enable field to decide if protocol should be in tree * improve speed of dialog box creation * - I believe this is slow because of tree widget creation. - * 1) could improve the widget + * 1) could improve the widget * 2) keep a copy in memory after the first time. * user can pop multiple tree dialogs by pressing the "Tree" button multiple * time. not a good thing. @@ -788,7 +788,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) g_free(value_str); return; } - + /* * Make sure the value is valid. * @@ -1004,7 +1004,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) range_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(col2_vb), range_entry, FALSE, FALSE, 0); - + /* * OK, show the relation label and range stuff as it would be * with everything turned on, so it'll request as much space @@ -1036,7 +1036,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) value_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(value_vb), value_entry, FALSE, FALSE, 0); gtk_widget_show(value_entry); - + value_list_scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(value_list_scrolled_win), GTK_POLICY_AUTOMATIC, diff --git a/gtk/dfilter_expr_dlg.h b/gtk/dfilter_expr_dlg.h index 21ea418e4e..047e8160f8 100644 --- a/gtk/dfilter_expr_dlg.h +++ b/gtk/dfilter_expr_dlg.h @@ -1,23 +1,23 @@ /* dfilter_expr_dlg.h * Definitions for dialog boxes for display filter expression construction * - * $Id: dfilter_expr_dlg.h,v 1.1 2001/01/02 01:32:21 guy Exp $ + * $Id: dfilter_expr_dlg.h,v 1.2 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/display_opts.c b/gtk/display_opts.c index 7e6b1f6500..3772d59a82 100644 --- a/gtk/display_opts.c +++ b/gtk/display_opts.c @@ -1,22 +1,22 @@ /* display_opts.c * Routines for packet display windows * - * $Id: display_opts.c,v 1.28 2002/08/02 22:34:53 jmayer Exp $ + * $Id: display_opts.c,v 1.29 2002/08/28 21:03:46 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -99,9 +99,9 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { initial_timestamp_type = timestamp_type; /* Save the current timestamp type so that we know whether it has changed; - we don't want to redisplay the time fields unless we've changed the way - they should be displayed (as redisplaying the time fields could be - expensive - we have to scan through all the packets and rebuild the + we don't want to redisplay the time fields unless we've changed the way + they should be displayed (as redisplaying the time fields could be + expensive - we have to scan through all the packets and rebuild the packet list).*/ current_timestamp_type = timestamp_type; @@ -120,7 +120,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(display_opt_w), main_vb); gtk_widget_show(main_vb); - + button = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Time of day", accel_group); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), @@ -128,7 +128,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_TIME_ABS_KEY, button); gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0); - + gtk_widget_show(button); button = dlg_radio_button_new_with_label_with_mnemonic( @@ -179,7 +179,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { button); gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0); gtk_widget_show(button); - + button = dlg_check_button_new_with_label_with_mnemonic( "Enable _network name resolution", accel_group); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), @@ -188,7 +188,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { button); gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0); gtk_widget_show(button); - + button = dlg_check_button_new_with_label_with_mnemonic( "Enable _transport name resolution", accel_group); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), @@ -197,7 +197,7 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { button); gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0); gtk_widget_show(button); - + /* Button row: OK, Apply, and Cancel buttons */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); diff --git a/gtk/display_opts.h b/gtk/display_opts.h index 3529ad7f67..67a6d1dcaa 100644 --- a/gtk/display_opts.h +++ b/gtk/display_opts.h @@ -1,23 +1,23 @@ /* display_opts.h * Definitions for display option window * - * $Id: display_opts.h,v 1.1 1999/10/18 12:48:13 gram Exp $ + * $Id: display_opts.h,v 1.2 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 773e2db026..1151814038 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -1,23 +1,23 @@ /* dlg_utils.c * Utilities to use when constructing dialogs * - * $Id: dlg_utils.c,v 1.7 2002/03/05 11:55:58 guy Exp $ + * $Id: dlg_utils.c,v 1.8 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -160,7 +160,7 @@ dlg_check_button_new_with_label_with_mnemonic(const gchar *label, GtkAccelGroup *accel_group) { GtkWidget *check_button; - + check_button = gtk_check_button_new_with_label (label); dlg_fix_button_label(check_button, accel_group); return check_button; diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h index 84a695aafc..ab8372e2c8 100644 --- a/gtk/dlg_utils.h +++ b/gtk/dlg_utils.h @@ -1,23 +1,23 @@ /* dlg_utils.h * Declarations of utilities to use when constructing dialogs * - * $Id: dlg_utils.h,v 1.5 2000/08/23 06:55:39 guy Exp $ + * $Id: dlg_utils.h,v 1.6 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index c2ace7912c..3a268c0598 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,22 +1,22 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.49 2002/03/05 11:55:58 guy Exp $ + * $Id: file_dlg.c,v 1.50 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -123,7 +123,7 @@ file_open_cmd_cb(GtkWidget *w, gpointer data _U_) GTK_SIGNAL_FUNC(display_filter_construct_cb), &args); gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0); gtk_widget_show(filter_bt); - + filter_te = gtk_entry_new(); gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te); gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3); @@ -158,7 +158,7 @@ file_open_cmd_cb(GtkWidget *w, gpointer data _U_) gtk_widget_show(t_resolv_cb); gtk_object_set_data(GTK_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button), E_FILE_T_RESOLVE_KEY, t_resolv_cb); - + /* Connect the ok_button to file_open_ok_cb function and pass along a pointer to the file selection box widget */ gtk_signal_connect(GTK_OBJECT (GTK_FILE_SELECTION(file_open_w)->ok_button), @@ -252,7 +252,7 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) { g_free(cf_name); return; } - + /* Save the name of the containing directory specified in the path name, if any; we can write over cf_name, which is a good thing, given that "get_dirname()" does write over its argument. */ @@ -323,7 +323,7 @@ can_save_with_wiretap(int ft) "filtered" is TRUE if we're to save only the packets that passed the display filter (in which case we have to save it using Wiretap) and FALSE if we're to save the entire file (in which case, if we're - saving it in the type it has already, we can just copy it). + saving it in the type it has already, we can just copy it). "marked" is TRUE if we have to save only the marked packets, the same remark as "filtered" applies. @@ -455,7 +455,7 @@ file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_) gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_save_as_w)->action_area), main_vb, FALSE, FALSE, 0); gtk_widget_show(main_vb); - + /* * XXX - should this be sensitive only if the current display filter * has rejected some packets, so that not all packets are currently @@ -495,7 +495,7 @@ file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_) ft_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(main_vb), ft_hb); gtk_widget_show(ft_hb); - + ft_lb = gtk_label_new("File type:"); gtk_box_pack_start(GTK_BOX(ft_hb), ft_lb, FALSE, FALSE, 0); gtk_widget_show(ft_lb); diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h index b7e5a7084a..8084dbff02 100644 --- a/gtk/file_dlg.h +++ b/gtk/file_dlg.h @@ -1,22 +1,22 @@ /* file_dlg.h * Definitions for dialog boxes for handling files * - * $Id: file_dlg.h,v 1.2 2001/12/06 02:21:26 guy Exp $ + * $Id: file_dlg.h,v 1.3 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c index 9ef6b49fd2..f6de5d8208 100644 --- a/gtk/filter_prefs.c +++ b/gtk/filter_prefs.c @@ -3,22 +3,22 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.c,v 1.37 2002/06/22 20:00:26 guy Exp $ + * $Id: filter_prefs.c,v 1.38 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -317,7 +317,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te, *ok_bt, /* "OK" button */ *apply_bt, /* "Apply" button */ *save_bt, /* "Save" button */ - *close_bt; /* "Cancel" button */ + *close_bt; /* "Cancel" button */ GtkWidget *filter_pg = NULL; /* filter settings box */ GtkWidget *top_hb, *list_bb, @@ -381,7 +381,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te, gtk_container_add(GTK_CONTAINER(main_w), main_vb); gtk_widget_show(main_vb); - /* Make sure everything is set up */ + /* Make sure everything is set up */ if (parent_filter_te) filter_te_str = gtk_entry_get_text(GTK_ENTRY(parent_filter_te)); @@ -501,11 +501,11 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te, middle_hb = gtk_hbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(filter_pg), middle_hb); gtk_widget_show(middle_hb); - + name_lb = gtk_label_new("Filter name:"); gtk_box_pack_start(GTK_BOX(middle_hb), name_lb, FALSE, FALSE, 3); gtk_widget_show(name_lb); - + name_te = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 3); gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te); @@ -517,11 +517,11 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te, bottom_hb = gtk_hbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(filter_pg), bottom_hb); gtk_widget_show(bottom_hb); - + filter_lb = gtk_label_new("Filter string:"); gtk_box_pack_start(GTK_BOX(bottom_hb), filter_lb, FALSE, FALSE, 3); gtk_widget_show(filter_lb); - + filter_te = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(bottom_hb), filter_te, TRUE, TRUE, 3); gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te); @@ -681,7 +681,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy) gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY); GtkWidget *filter_te; gchar *filter_string; - + if (parent_filter_te != NULL) { /* * We have a text entry widget associated with this dialog @@ -865,7 +865,7 @@ filter_sel_list_cb(GtkWidget *l, gpointer data _U_) sl = GTK_LIST(l)->selection; else sl = NULL; - + if (sl) { /* Something was selected */ l_item = GTK_OBJECT(sl->data); flp = (GList *) gtk_object_get_data(l_item, E_FILT_LIST_ITEM_MODEL_KEY); @@ -916,7 +916,7 @@ filter_list_destroy_cb(GtkWidget *l, gpointer data _U_) } /* To do: add input checking to each of these callbacks */ - + /* Structure containing arguments to be passed to "new_filter_cb()". "active_filter_l" is the list in the dialog box in which "New" or @@ -966,10 +966,10 @@ filter_new_bt_clicked_cb(GtkWidget *w, gpointer data) GList *fl_entry; gchar *name, *strval; new_filter_cb_args_t args; - + name = gtk_entry_get_text(GTK_ENTRY(name_te)); strval = gtk_entry_get_text(GTK_ENTRY(filter_te)); - + if (strlen(name) > 0 && strlen(strval) > 0) { /* Add a new entry to the filter list. */ fl_entry = add_to_filter_list(list, name, strval); @@ -1040,7 +1040,7 @@ filter_chg_bt_clicked_cb(GtkWidget *w, gpointer data) nl_lb = (GtkLabel *) gtk_object_get_data(l_item, E_FILT_LBL_KEY); if (fl_entry != NULL && nl_lb != NULL) { filt = (filter_def *) fl_entry->data; - + if (strlen(name) > 0 && strlen(strval) > 0 && filt) { g_free(filt->name); g_free(filt->strval); @@ -1137,7 +1137,7 @@ filter_del_bt_clicked_cb(GtkWidget *w, gpointer data) /* Update all the filter list widgets, not just the one in the dialog box in which we clicked on "Delete". */ g_list_foreach(get_filter_dialog_list(list), delete_filter_cb, &pos); - } + } } } diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h index b6b478c343..3fad8e2387 100644 --- a/gtk/filter_prefs.h +++ b/gtk/filter_prefs.h @@ -3,23 +3,23 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.h,v 1.11 2001/02/23 05:54:27 guy Exp $ + * $Id: filter_prefs.h,v 1.12 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 8404d7e99e..00de5fc244 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,22 +1,22 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.22 2002/05/03 21:55:14 guy Exp $ + * $Id: find_dlg.c,v 1.23 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -96,30 +96,30 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) Ctrl+<key> is an accelerator). */ accel_group = gtk_accel_group_new(); gtk_window_add_accel_group(GTK_WINDOW(find_frame_w), accel_group); - + /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(find_frame_w), main_vb); gtk_widget_show(main_vb); - + /* Filter row */ filter_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(main_vb), filter_hb); gtk_widget_show(filter_hb); - + filter_bt = gtk_button_new_with_label("Filter:"); gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked", GTK_SIGNAL_FUNC(display_filter_construct_cb), &args); gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0); gtk_widget_show(filter_bt); - + filter_te = gtk_entry_new(); if (cfile.sfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.sfilter); gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te); gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 0); gtk_widget_show(filter_te); - + /* Misc row: Forward and reverse radio buttons */ direction_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(main_vb), direction_hb); @@ -259,9 +259,9 @@ find_previous_next(GtkWidget *w, gpointer d, gboolean sens) dfilter_t *sfcode; if (cfile.sfilter) { - if (!dfilter_compile(cfile.sfilter, &sfcode)) + if (!dfilter_compile(cfile.sfilter, &sfcode)) return; - if (sfcode == NULL) + if (sfcode == NULL) return; cfile.sbackward = sens; find_packet(&cfile, sfcode); diff --git a/gtk/find_dlg.h b/gtk/find_dlg.h index b2bfc5bc85..240d4af92e 100644 --- a/gtk/find_dlg.h +++ b/gtk/find_dlg.h @@ -1,23 +1,23 @@ /* find_dlg.h * Definitions for "find frame" window * - * $Id: find_dlg.h,v 1.2 2002/05/03 21:55:15 guy Exp $ + * $Id: find_dlg.h,v 1.3 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index 1db5c579eb..4c9f8f56cf 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.24 2002/08/02 22:34:53 jmayer Exp $ + * $Id: follow_dlg.c,v 1.25 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -470,7 +470,7 @@ follow_read_stream(follow_info_t *follow_info, gboolean skip; iplen = (follow_info->is_ipv6) ? 16 : 4; - + data_out_file = fopen(follow_info->data_out_filename, "rb"); if (data_out_file) { char buffer[FLT_BUF_SIZE]; @@ -524,7 +524,7 @@ follow_read_stream(follow_info_t *follow_info, int i, cur; /* is_server indentation : put 63 spaces at the begenning * of the string */ - sprintf(hexbuf, (is_server && + sprintf(hexbuf, (is_server && follow_info->show_stream == BOTH_HOSTS) ? " " " %08X " : @@ -546,7 +546,7 @@ follow_read_stream(follow_info_t *follow_info, /* Fill it up if column isn't complete */ if (i < 16) { int j; - + for (j = i; j < 16; j++) { if (j == 7) hexbuf[cur++] = ' '; @@ -565,7 +565,7 @@ follow_read_stream(follow_info_t *follow_info, buffer[current_pos + i] : '.' ); if (i == 7) { hexbuf[cur++] = ' '; - } + } } current_pos += i; (*global_pos) += i; diff --git a/gtk/follow_dlg.h b/gtk/follow_dlg.h index 7c203b2137..c9555922bc 100644 --- a/gtk/follow_dlg.h +++ b/gtk/follow_dlg.h @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.h,v 1.3 2000/09/08 10:59:12 guy Exp $ + * $Id: follow_dlg.h,v 1.4 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index ba23ad7a0f..fb7ea759f9 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -1,22 +1,22 @@ /* goto_dlg.c * Routines for "go to frame" window * - * $Id: goto_dlg.c,v 1.15 2002/03/05 11:55:59 guy Exp $ + * $Id: goto_dlg.c,v 1.16 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -60,22 +60,22 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) *bbox, *ok_bt, *cancel_bt; goto_frame_w = dlg_window_new("Ethereal: Go To Frame"); - + /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 3); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(goto_frame_w), main_vb); gtk_widget_show(main_vb); - + /* Frame number row */ fnumber_hb = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(main_vb), fnumber_hb); gtk_widget_show(fnumber_hb); - + fnumber_lb = gtk_label_new("Frame number:"); gtk_box_pack_start(GTK_BOX(fnumber_hb), fnumber_lb, FALSE, FALSE, 0); gtk_widget_show(fnumber_lb); - + fnumber_te = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(fnumber_hb), fnumber_te, FALSE, FALSE, 0); gtk_widget_show(fnumber_te); diff --git a/gtk/goto_dlg.h b/gtk/goto_dlg.h index fa5e6c514e..c44c6906c3 100644 --- a/gtk/goto_dlg.h +++ b/gtk/goto_dlg.h @@ -1,23 +1,23 @@ /* goto_dlg.h * Definitions for "go to frame" window * - * $Id: goto_dlg.h,v 1.1 1999/11/08 01:03:40 guy Exp $ + * $Id: goto_dlg.h,v 1.2 2002/08/28 21:03:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index c3c76a7dea..5ff86b75ae 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -1,6 +1,6 @@ /* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, - * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org> + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, + * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #include "config.h" @@ -68,7 +68,7 @@ (((row) + 1) * CELL_SPACING) + \ (clist)->voffset) -/* returns the row index from a y pixel location in the +/* returns the row index from a y pixel location in the * context of the clist's voffset */ #define ROW_FROM_YPIXEL(clist, y) (((y) - (clist)->voffset) / \ ((clist)->row_height + CELL_SPACING)) @@ -78,7 +78,7 @@ #define COLUMN_LEFT_XPIXEL(clist, colnum) ((clist)->column[(colnum)].area.x + \ (clist)->hoffset) -/* returns the column index from a x pixel location in the +/* returns the column index from a x pixel location in the * context of the clist's hoffset */ static inline gint COLUMN_FROM_XPIXEL (GtkCList * clist, @@ -115,7 +115,7 @@ COLUMN_FROM_XPIXEL (GtkCList * clist, /* returns the total width of the list */ static inline gint -LIST_WIDTH (GtkCList * clist) +LIST_WIDTH (GtkCList * clist) { gint last_column; @@ -215,7 +215,7 @@ static gint gtk_clist_button_press (GtkWidget *widget, GdkEventButton *event); static gint gtk_clist_button_release (GtkWidget *widget, GdkEventButton *event); -static gint gtk_clist_motion (GtkWidget *widget, +static gint gtk_clist_motion (GtkWidget *widget, GdkEventMotion *event); static void gtk_clist_size_request (GtkWidget *widget, GtkRequisition *requisition); @@ -406,7 +406,7 @@ static void draw_drag_highlight (GtkCList *clist, GtkCListRow *dest_row, gint dest_row_number, GtkCListDragPos drag_pos); - + /* Size Allocation / Requisition */ static void size_allocate_title_buttons (GtkCList *clist); static void size_allocate_columns (GtkCList *clist, @@ -454,7 +454,7 @@ static gboolean title_focus (GtkCList *clist, static void real_row_move (GtkCList *clist, gint source_row, gint dest_row); -static gint column_title_passive_func (GtkWidget *widget, +static gint column_title_passive_func (GtkWidget *widget, GdkEvent *event, gpointer data); static void drag_dest_cell (GtkCList *clist, @@ -539,7 +539,7 @@ gtk_clist_class_init (GtkCListClass *klass) gtk_object_add_arg_type ("GtkCList::sort_type", GTK_TYPE_SORT_TYPE, GTK_ARG_READWRITE, - ARG_SORT_TYPE); + ARG_SORT_TYPE); object_class->set_arg = gtk_clist_set_arg; object_class->get_arg = gtk_clist_get_arg; object_class->destroy = gtk_clist_destroy; @@ -1021,21 +1021,21 @@ gtk_clist_construct (GtkCList *clist, clist->row_mem_chunk = g_mem_chunk_new ("clist row mem chunk", sizeof (GtkCListRow), sizeof (GtkCListRow) * - CLIST_OPTIMUM_SIZE, + CLIST_OPTIMUM_SIZE, G_ALLOC_AND_FREE); if (!clist->cell_mem_chunk) clist->cell_mem_chunk = g_mem_chunk_new ("clist cell mem chunk", sizeof (GtkCell) * columns, sizeof (GtkCell) * columns * - CLIST_OPTIMUM_SIZE, + CLIST_OPTIMUM_SIZE, G_ALLOC_AND_FREE); /* set number of columns, allocate memory */ clist->columns = columns; clist->column = columns_new (clist); - /* there needs to be at least one column button + /* there needs to be at least one column button * because there is alot of code that will break if it * isn't there*/ column_button_create (clist, 0); @@ -1043,7 +1043,7 @@ gtk_clist_construct (GtkCList *clist, if (titles) { gint i; - + GTK_CLIST_SET_FLAG (clist, CLIST_SHOW_TITLES); for (i = 0; i < columns; i++) gtk_clist_set_column_title (clist, i, titles[i]); @@ -1071,7 +1071,7 @@ gtk_clist_new (gint columns) { return gtk_clist_new_with_titles (columns, NULL); } - + GtkWidget* gtk_clist_new_with_titles (gint columns, gchar *titles[]) @@ -1094,10 +1094,10 @@ gtk_clist_set_hadjustment (GtkCList *clist, g_return_if_fail (GTK_IS_CLIST (clist)); if (adjustment) g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - + if (clist->hadjustment == adjustment) return; - + old_adjustment = clist->hadjustment; if (clist->hadjustment) @@ -1147,7 +1147,7 @@ gtk_clist_set_vadjustment (GtkCList *clist, if (clist->vadjustment == adjustment) return; - + old_adjustment = clist->vadjustment; if (clist->vadjustment) @@ -1297,7 +1297,7 @@ gtk_clist_column_titles_show (GtkCList *clist) } } -void +void gtk_clist_column_titles_hide (GtkCList *clist) { g_return_if_fail (clist != NULL); @@ -1617,7 +1617,7 @@ gtk_clist_set_column_visibility (GtkCList *clist, else gtk_widget_hide (clist->column[column].button); } - + gtk_widget_queue_resize (GTK_WIDGET(clist)); } @@ -1784,7 +1784,7 @@ gtk_clist_set_column_max_width (GtkCList *clist, clist->column[column].max_width = clist->column[column].min_width; else clist->column[column].max_width = max_width; - + if (clist->column[column].area.width > clist->column[column].max_width) gtk_clist_set_column_width (clist, column,clist->column[column].max_width); } @@ -1860,7 +1860,7 @@ real_resize_column (GtkCList *clist, if (column < 0 || column >= clist->columns) return; - + if (width < MAX (COLUMN_MIN_WIDTH, clist->column[column].min_width)) width = MAX (COLUMN_MIN_WIDTH, clist->column[column].min_width); if (clist->column[column].max_width >= 0 && @@ -1952,7 +1952,7 @@ size_allocate_title_buttons (GtkCList *clist) { gdk_window_show (clist->column[last_button].window); gdk_window_move_resize (clist->column[last_button].window, - button_allocation.x - (DRAG_WIDTH / 2), + button_allocation.x - (DRAG_WIDTH / 2), 0, DRAG_WIDTH, clist->column_title_area.height); } @@ -1973,7 +1973,7 @@ size_allocate_title_buttons (GtkCList *clist) gdk_window_show (clist->column[last_button].window); gdk_window_move_resize (clist->column[last_button].window, - button_allocation.x - (DRAG_WIDTH / 2), + button_allocation.x - (DRAG_WIDTH / 2), 0, DRAG_WIDTH, clist->column_title_area.height); } else @@ -2031,7 +2031,7 @@ size_allocate_columns (GtkCList *clist, } static gint -list_requisition_width (GtkCList *clist) +list_requisition_width (GtkCList *clist) { gint width = CELL_SPACING; gint i; @@ -2089,7 +2089,7 @@ new_column_width (GtkCList *clist, width = clist->column[column].max_width; cx = dx + clist->column[column].max_width; *x = cx + xthickness; - } + } if (cx < 0 || cx > clist->clist_window_width) *x = -1; @@ -2139,12 +2139,12 @@ column_button_clicked (GtkWidget *widget, } static gint -column_title_passive_func (GtkWidget *widget _U_, +column_title_passive_func (GtkWidget *widget _U_, GdkEvent *event, gpointer data _U_) { g_return_val_if_fail (event != NULL, FALSE); - + switch (event->type) { case GDK_MOTION_NOTIFY: @@ -2172,7 +2172,7 @@ column_title_passive_func (GtkWidget *widget _U_, * gtk_clist_get_pixtext * gtk_clist_set_shift */ -GtkCellType +GtkCellType gtk_clist_get_cell_type (GtkCList *clist, gint row, gint column) @@ -2267,11 +2267,11 @@ gtk_clist_set_pixmap (GtkCList *clist, return; clist_row = ROW_ELEMENT (clist, row)->data; - + gdk_pixmap_ref (pixmap); - + if (mask) gdk_pixmap_ref (mask); - + GTK_CLIST_CLASS_FW (clist)->set_cell_contents (clist, clist_row, column, GTK_CELL_PIXMAP, NULL, 0, pixmap, mask); @@ -2335,7 +2335,7 @@ gtk_clist_set_pixtext (GtkCList *clist, return; clist_row = ROW_ELEMENT (clist, row)->data; - + gdk_pixmap_ref (pixmap); if (mask) gdk_pixmap_ref (mask); GTK_CLIST_CLASS_FW (clist)->set_cell_contents @@ -2617,7 +2617,7 @@ gtk_clist_clear (GtkCList *clist) { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + GTK_CLIST_CLASS_FW (clist)->clear (clist); } @@ -2662,10 +2662,10 @@ real_insert_row (GtkCList *clist, if (GTK_CLIST_AUTO_SORT(clist)) /* override insertion pos */ { GList *work; - + row = 0; work = clist->row_list; - + if (clist->sort_type == GTK_SORT_ASCENDING) { while (row < clist->rows && @@ -2687,7 +2687,7 @@ real_insert_row (GtkCList *clist, } } } - + /* reset the row end pointer if we're inserting at the end of the list */ if (row == clist->rows) clist->row_list_end = (g_list_append (clist->row_list_end, @@ -2903,7 +2903,7 @@ real_row_move (GtkCList *clist, last >= GPOINTER_TO_INT (list->data)) list->data = GINT_TO_POINTER (GPOINTER_TO_INT (list->data) + d); } - + if (clist->focus_row == source_row) clist->focus_row = dest_row; else if (clist->focus_row > first) @@ -2954,7 +2954,7 @@ gtk_clist_moveto (GtkCList *clist, if (x < 0) gtk_adjustment_set_value (clist->hadjustment, 0.0); else if (x > LIST_WIDTH (clist) - clist->clist_window_width) - gtk_adjustment_set_value + gtk_adjustment_set_value (clist->hadjustment, LIST_WIDTH (clist) - clist->clist_window_width); else gtk_adjustment_set_value (clist->hadjustment, x); @@ -3000,7 +3000,7 @@ gtk_clist_set_row_height (GtkCList *clist, widget->style->font->ascent - widget->style->font->descent - 1) / 2; } - + CLIST_REFRESH (clist); } @@ -3030,7 +3030,7 @@ gtk_clist_set_row_data_full (GtkCList *clist, if (clist_row->destroy) clist_row->destroy (clist_row->data); - + clist_row->data = data; clist_row->destroy = destroy; } @@ -3068,9 +3068,9 @@ gtk_clist_find_row_from_data (GtkCList *clist, return -1; } -void +void gtk_clist_swap_rows (GtkCList *clist, - gint row1, + gint row1, gint row2) { gint first, last; @@ -3089,7 +3089,7 @@ gtk_clist_swap_rows (GtkCList *clist, gtk_clist_row_move (clist, last, first); gtk_clist_row_move (clist, first + 1, last); - + gtk_clist_thaw (clist); } @@ -3249,7 +3249,7 @@ gtk_clist_set_cell_style (GtkCList *clist, if (clist_row->cell[column].style) { gtk_style_ref (clist_row->cell[column].style); - + if (GTK_WIDGET_REALIZED (clist)) clist_row->cell[column].style = gtk_style_attach (clist_row->cell[column].style, @@ -3330,7 +3330,7 @@ gtk_clist_set_row_style (GtkCList *clist, if (clist_row->style) { gtk_style_ref (clist_row->style); - + if (GTK_WIDGET_REALIZED (clist)) clist_row->style = gtk_style_attach (clist_row->style, clist->clist_window); @@ -3407,7 +3407,7 @@ gtk_clist_set_selectable (GtkCList *clist, } gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], row, -1, NULL); - } + } } gboolean @@ -3555,12 +3555,12 @@ fake_toggle_row (GtkCList *clist, if (!work || !GTK_CLIST_ROW (work)->selectable) return; - + if (GTK_CLIST_ROW (work)->state == GTK_STATE_NORMAL) clist->anchor_state = GTK_CLIST_ROW (work)->state = GTK_STATE_SELECTED; else clist->anchor_state = GTK_CLIST_ROW (work)->state = GTK_STATE_NORMAL; - + if (CLIST_UNFROZEN (clist) && gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE) GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, @@ -3592,7 +3592,7 @@ toggle_focus_row (GtkCList *clist) clist->anchor = clist->focus_row; clist->drag_pos = clist->focus_row; clist->undo_anchor = clist->focus_row; - + if (GTK_CLIST_ADD_MODE(clist)) fake_toggle_row (clist, clist->focus_row); else @@ -3610,7 +3610,7 @@ toggle_add_mode (GtkCList *clist) { g_return_if_fail (clist != 0); g_return_if_fail (GTK_IS_CLIST (clist)); - + if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) || clist->selection_mode != GTK_SELECTION_EXTENDED) return; @@ -3665,13 +3665,13 @@ real_select_row (GtkCList *clist, if (row == sel_row) row_selected = TRUE; else - gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], + gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], sel_row, column, event); } if (row_selected) return; - + default: break; } @@ -3689,9 +3689,9 @@ real_select_row (GtkCList *clist, clist->selection_end = clist->selection; } else - clist->selection_end = + clist->selection_end = g_list_append (clist->selection_end, GINT_TO_POINTER (row))->next; - + if (CLIST_UNFROZEN (clist) && (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)) GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, clist_row); @@ -3717,13 +3717,13 @@ real_unselect_row (GtkCList *clist, { clist_row->state = GTK_STATE_NORMAL; - if (clist->selection_end && + if (clist->selection_end && clist->selection_end->data == GINT_TO_POINTER (row)) clist->selection_end = clist->selection_end->prev; clist->selection = g_list_remove (clist->selection, GINT_TO_POINTER (row)); - + if (CLIST_UNFROZEN (clist) && (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)) GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, clist_row); @@ -3735,7 +3735,7 @@ real_select_all (GtkCList *clist) { GList *list; gint i; - + g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); @@ -3753,7 +3753,7 @@ real_select_all (GtkCList *clist) g_list_free (clist->undo_unselection); clist->undo_selection = NULL; clist->undo_unselection = NULL; - + if (clist->rows && ((GtkCListRow *) (clist->row_list->data))->state != GTK_STATE_SELECTED) @@ -3783,7 +3783,7 @@ real_unselect_all (GtkCList *clist) { GList *list; gint i; - + g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); @@ -3839,12 +3839,12 @@ fake_unselect_all (GtkCList *clist, GTK_CLIST_ROW (work)->selectable) { GTK_CLIST_ROW (work)->state = GTK_STATE_SELECTED; - + if (CLIST_UNFROZEN (clist) && gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE) GTK_CLIST_CLASS_FW (clist)->draw_row (clist, NULL, row, GTK_CLIST_ROW (work)); - } + } } clist->undo_selection = clist->selection; @@ -3892,7 +3892,7 @@ real_undo_selection (GtkCList *clist) for (work = clist->undo_unselection; work; work = work->next) { /* g_print ("unselect %d\n",GPOINTER_TO_INT (work->data)); */ - gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], + gtk_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], GPOINTER_TO_INT (work->data), -1, NULL); } @@ -3904,9 +3904,9 @@ real_undo_selection (GtkCList *clist) } else clist->focus_row = clist->undo_anchor; - + clist->undo_anchor = -1; - + g_list_free (clist->undo_selection); g_list_free (clist->undo_unselection); clist->undo_selection = NULL; @@ -3927,7 +3927,7 @@ set_anchor (GtkCList *clist, { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + if (clist->selection_mode != GTK_SELECTION_EXTENDED || clist->anchor >= 0) return; @@ -3995,7 +3995,7 @@ resync_selection (GtkCList *clist, } } } - } + } if (clist->anchor < clist->drag_pos) { @@ -4053,7 +4053,7 @@ resync_selection (GtkCList *clist, } } } - + clist->undo_unselection = g_list_reverse (clist->undo_unselection); for (list = clist->undo_unselection; list; list = list->next) gtk_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], @@ -4288,7 +4288,7 @@ sync_selection (GtkCList *clist, d = 1; else d = -1; - + if (clist->focus_row >= row) { if (d > 0 || clist->focus_row > row) @@ -4431,7 +4431,7 @@ gtk_clist_realize (GtkWidget *widget) GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); border_width = GTK_CONTAINER (widget)->border_width; - + attributes.window_type = GDK_WINDOW_CHILD; attributes.x = widget->allocation.x + border_width; attributes.y = widget->allocation.y + border_width; @@ -4463,7 +4463,7 @@ gtk_clist_realize (GtkWidget *widget) attributes.y = clist->column_title_area.y; attributes.width = clist->column_title_area.width; attributes.height = clist->column_title_area.height; - + clist->title_window = gdk_window_new (widget->window, &attributes, attributes_mask); gdk_window_set_user_data (clist->title_window, clist); @@ -4486,7 +4486,7 @@ gtk_clist_realize (GtkWidget *widget) clist->column_title_area.height); attributes.width = clist->clist_window_width; attributes.height = clist->clist_window_height; - + clist->clist_window = gdk_window_new (widget->window, &attributes, attributes_mask); gdk_window_set_user_data (clist->clist_window, clist); @@ -4528,7 +4528,7 @@ gtk_clist_realize (GtkWidget *widget) /* GCs */ clist->fg_gc = gdk_gc_new (widget->window); clist->bg_gc = gdk_gc_new (widget->window); - + /* We'll use this gc to do scrolling as well */ gdk_gc_set_exposures (clist->fg_gc, TRUE); @@ -4563,7 +4563,7 @@ gtk_clist_realize (GtkWidget *widget) if (clist_row->bg_set) gdk_color_alloc (colormap, &clist_row->background); } - + for (j = 0; j < clist->columns; j++) if (clist_row->cell[j].style) clist_row->cell[j].style = @@ -4668,7 +4668,7 @@ gtk_clist_map (GtkWidget *widget) !GTK_WIDGET_MAPPED (clist->column[i].button)) gtk_widget_map (clist->column[i].button); } - + for (i = 0; i < clist->columns; i++) if (clist->column[i].window && clist->column[i].button) { @@ -4761,14 +4761,14 @@ gtk_clist_draw (GtkWidget *widget, border_width = GTK_CONTAINER (widget)->border_width; gdk_window_clear_area (widget->window, - area->x - border_width, + area->x - border_width, area->y - border_width, area->width, area->height); /* draw list shadow/border */ gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL, clist->shadow_type, - 0, 0, + 0, 0, clist->clist_window_width + (2 * widget->style->klass->xthickness), clist->clist_window_height + @@ -5032,7 +5032,7 @@ gtk_clist_button_press (GtkWidget *widget, row, column, event); break; } - + if (event->state & GDK_CONTROL_MASK) { if (event->state & GDK_SHIFT_MASK) @@ -5237,7 +5237,7 @@ gtk_clist_motion (GtkWidget *widget, gtk_widget_get_pointer (widget, &x, NULL); else x = event->x; - + new_width = new_column_width (clist, clist->drag_pos, &x); if (x != clist->x_drag) { @@ -5285,7 +5285,7 @@ gtk_clist_motion (GtkWidget *widget, y >= (ROW_TOP_YPIXEL (clist, clist->click_cell.row) + clist->row_height) || x < COLUMN_LEFT_XPIXEL (clist, clist->click_cell.column) || - x >= (COLUMN_LEFT_XPIXEL(clist, clist->click_cell.column) + + x >= (COLUMN_LEFT_XPIXEL(clist, clist->click_cell.column) + clist->column[clist->click_cell.column].area.width))) { GtkTargetList *target_list; @@ -5372,7 +5372,7 @@ gtk_clist_motion (GtkWidget *widget, break; } } - + if (ROW_TOP_YPIXEL(clist, row) < 0) move_vertical (clist, row, 0); else if (ROW_TOP_YPIXEL(clist, row) + clist->row_height > @@ -5405,7 +5405,7 @@ gtk_clist_size_request (GtkWidget *widget, if (clist->column[i].button) { GtkRequisition child_requisition; - + gtk_widget_size_request (clist->column[i].button, &child_requisition); clist->column_title_area.height = @@ -5459,22 +5459,22 @@ gtk_clist_size_allocate (GtkWidget *widget, border_width * 2); clist->internal_allocation.height = MAX (1, (gint)allocation->height - border_width * 2); - + /* allocate clist window assuming no scrollbars */ clist_allocation.x = (clist->internal_allocation.x + widget->style->klass->xthickness); clist_allocation.y = (clist->internal_allocation.y + widget->style->klass->ythickness + clist->column_title_area.height); - clist_allocation.width = MAX (1, (gint)clist->internal_allocation.width - + clist_allocation.width = MAX (1, (gint)clist->internal_allocation.width - (2 * (gint)widget->style->klass->xthickness)); clist_allocation.height = MAX (1, (gint)clist->internal_allocation.height - (2 * (gint)widget->style->klass->ythickness) - (gint)clist->column_title_area.height); - + clist->clist_window_width = clist_allocation.width; clist->clist_window_height = clist_allocation.height; - + if (GTK_WIDGET_REALIZED (widget)) { gdk_window_move_resize (clist->clist_window, @@ -5483,12 +5483,12 @@ gtk_clist_size_allocate (GtkWidget *widget, clist_allocation.width, clist_allocation.height); } - + /* position the window which holds the column title buttons */ clist->column_title_area.x = widget->style->klass->xthickness; clist->column_title_area.y = widget->style->klass->ythickness; clist->column_title_area.width = clist_allocation.width; - + if (GTK_WIDGET_REALIZED (widget)) { gdk_window_move_resize (clist->title_window, @@ -5497,7 +5497,7 @@ gtk_clist_size_allocate (GtkWidget *widget, clist->column_title_area.width, clist->column_title_area.height); } - + /* column button allocation */ size_allocate_columns (clist, FALSE); size_allocate_title_buttons (clist); @@ -5525,7 +5525,7 @@ gtk_clist_forall (GtkContainer *container, return; clist = GTK_CLIST (container); - + /* callback for the column buttons */ for (i = 0; i < clist->columns; i++) if (clist->column[i].button) @@ -5694,7 +5694,7 @@ draw_row (GtkCList *clist, cell_rectangle.height = CELL_SPACING; /* rectangle used to clip drawing operations, its y and height - * positions only need to be set once, so we set them once here. + * positions only need to be set once, so we set them once here. * the x and width are set withing the drawing loop below once per * column */ clip_rectangle.y = row_rectangle.y; @@ -5766,10 +5766,10 @@ draw_row (GtkCList *clist, cell_rectangle.x, cell_rectangle.y, cell_rectangle.width, - cell_rectangle.height); - } + cell_rectangle.height); + } } - + for (last_column = clist->columns - 1; last_column >= 0 && !clist->column[last_column].visible; last_column--) ; @@ -5799,7 +5799,7 @@ draw_row (GtkCList *clist, clip_rectangle.x -= COLUMN_INSET + CELL_SPACING; clip_rectangle.width += (2 * COLUMN_INSET + CELL_SPACING + (i == last_column) * CELL_SPACING); - + if (area && !gdk_rectangle_intersect (area, &clip_rectangle, &intersect_rectangle)) continue; @@ -5888,7 +5888,7 @@ draw_row (GtkCList *clist, gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle); gdk_draw_string (clist->clist_window, style->font, fg_gc, offset, - row_rectangle.y + row_center_offset + + row_rectangle.y + row_center_offset + clist_row->cell[i].vertical, (clist_row->cell[i].type == GTK_CELL_PIXTEXT) ? GTK_CELL_PIXTEXT (clist_row->cell[i])->text : @@ -5975,7 +5975,7 @@ draw_rows (GtkCList *clist, ROW_TOP_YPIXEL (clist, i), 0, 0); } -static void +static void draw_xor_line (GtkCList *clist) { GtkWidget *widget; @@ -5997,9 +5997,9 @@ clist_refresh (GtkCList *clist) { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + if (CLIST_UNFROZEN (clist)) - { + { adjust_adjustments (clist, FALSE); draw_rows (clist, NULL); } @@ -6021,7 +6021,7 @@ get_selection_info (GtkCList *clist, g_return_val_if_fail (clist != NULL, 0); g_return_val_if_fail (GTK_IS_CLIST (clist), 0); - /* bounds checking, return false if the user clicked + /* bounds checking, return false if the user clicked * on a blank area */ trow = ROW_FROM_YPIXEL (clist, y); if (trow >= clist->rows) @@ -6041,10 +6041,10 @@ get_selection_info (GtkCList *clist, } gint -gtk_clist_get_selection_info (GtkCList *clist, - gint x, - gint y, - gint *row, +gtk_clist_get_selection_info (GtkCList *clist, + gint x, + gint y, + gint *row, gint *column) { g_return_val_if_fail (clist != NULL, 0); @@ -6057,7 +6057,7 @@ gtk_clist_get_selection_info (GtkCList *clist, * vadjustment_changed * hadjustment_changed * vadjustment_value_changed - * hadjustment_value_changed + * hadjustment_value_changed * check_exposures */ static void @@ -6245,18 +6245,18 @@ hadjustment_value_changed (GtkAdjustment *adjustment, if (clist->column[i].button) { clist->column[i].button->allocation.x -= value + clist->hoffset; - + if (clist->column[i].button->window) { gdk_window_move (clist->column[i].button->window, clist->column[i].button->allocation.x, clist->column[i].button->allocation.y); - + if (clist->column[i].window) gdk_window_move (clist->column[i].window, clist->column[i].button->allocation.x + - clist->column[i].button->allocation.width - - (DRAG_WIDTH / 2), 0); + clist->column[i].button->allocation.width - + (DRAG_WIDTH / 2), 0); } } } @@ -6265,9 +6265,9 @@ hadjustment_value_changed (GtkAdjustment *adjustment, { /* scroll right */ diff = value + clist->hoffset; - + clist->hoffset = -value; - + /* we have to re-draw the whole screen here... */ if (diff >= clist->clist_window_width) { @@ -6279,7 +6279,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment, !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist)) { y = ROW_TOP_YPIXEL (clist, clist->focus_row); - + gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, 0, y, clist->clist_window_width - 1, clist->row_height - 1); @@ -6302,19 +6302,19 @@ hadjustment_value_changed (GtkAdjustment *adjustment, return; clist->hoffset = -value; - + /* we have to re-draw the whole screen here... */ if (diff >= clist->clist_window_width) { draw_rows (clist, NULL); return; } - + if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist)) { y = ROW_TOP_YPIXEL (clist, clist->focus_row); - + gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, 0, y, clist->clist_window_width - 1, clist->row_height - 1); @@ -6328,7 +6328,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment, 0, clist->clist_window_width - diff, clist->clist_window_height); - + area.x = 0; } @@ -6344,12 +6344,12 @@ hadjustment_value_changed (GtkAdjustment *adjustment, if (GTK_CLIST_ADD_MODE(clist)) { gint focus_row; - + focus_row = clist->focus_row; clist->focus_row = -1; draw_rows (clist, &area); clist->focus_row = focus_row; - + gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, 0, y, clist->clist_window_width - 1, clist->row_height - 1); @@ -6359,7 +6359,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment, { gint x0; gint x1; - + if (area.x == 0) { x0 = clist->clist_window_width - 1; @@ -6370,13 +6370,13 @@ hadjustment_value_changed (GtkAdjustment *adjustment, x0 = 0; x1 = area.x - 1; } - + y = ROW_TOP_YPIXEL (clist, clist->focus_row); gdk_draw_line (clist->clist_window, clist->xor_gc, x0, y + 1, x0, y + clist->row_height - 2); gdk_draw_line (clist->clist_window, clist->xor_gc, x1, y + 1, x1, y + clist->row_height - 2); - + } } draw_rows (clist, &area); @@ -6404,7 +6404,7 @@ check_exposures (GtkCList *clist) } } -/* PRIVATE +/* PRIVATE * Memory Allocation/Distruction Routines for GtkCList stuctures * * functions: @@ -6464,7 +6464,7 @@ columns_delete (GtkCList *clist) for (i = 0; i < clist->columns; i++) if (clist->column[i].title) g_free (clist->column[i].title); - + g_free (clist->column); } @@ -6549,7 +6549,7 @@ gtk_clist_focus (GtkContainer *container, if (!GTK_WIDGET_IS_SENSITIVE (container)) return FALSE; - + clist = GTK_CLIST (container); focus_child = container->focus_child; old_row = clist->focus_row; @@ -6595,7 +6595,7 @@ gtk_clist_focus (GtkContainer *container, if (tf) return TRUE; } - + GTK_CLIST_SET_FLAG (clist, CLIST_CHILD_HAS_FOCUS); break; case GTK_DIR_UP: @@ -6697,7 +6697,7 @@ gtk_clist_focus_out (GtkWidget *widget, GTK_CLIST_SET_FLAG (widget, CLIST_CHILD_HAS_FOCUS); gtk_widget_draw_focus (widget); - + clist = GTK_CLIST (widget); GTK_CLIST_CLASS_FW (widget)->resync_selection (clist, (GdkEvent *) event); @@ -6740,7 +6740,7 @@ title_focus (GtkCList *clist, for (last_column = clist->columns - 1; last_column >= 0 && !clist->column[last_column].visible; last_column--) ; - + switch (dir) { case GTK_DIR_TAB_BACKWARD: @@ -6779,11 +6779,11 @@ title_focus (GtkCList *clist, { if (clist->column[i].button == focus_child) { - if (clist->column[i].button && + if (clist->column[i].button && GTK_WIDGET_VISIBLE (clist->column[i].button) && GTK_IS_CONTAINER (clist->column[i].button) && !GTK_WIDGET_HAS_FOCUS(clist->column[i].button)) - if (gtk_container_focus + if (gtk_container_focus (GTK_CONTAINER (clist->column[i].button), dir)) { return_val = TRUE; @@ -6806,7 +6806,7 @@ title_focus (GtkCList *clist, GTK_WIDGET_VISIBLE (clist->column[j].button)) { if (GTK_IS_CONTAINER (clist->column[j].button) && - gtk_container_focus + gtk_container_focus (GTK_CONTAINER (clist->column[j].button), dir)) { return_val = TRUE; @@ -6821,7 +6821,7 @@ title_focus (GtkCList *clist, } j += d; } - + if (return_val) { if (COLUMN_LEFT_XPIXEL (clist, j) < CELL_SPACING + COLUMN_INSET) @@ -6882,7 +6882,7 @@ move_focus_row (GtkCList *clist, gtk_clist_draw_focus (widget); clist->focus_row = MAX (0, clist->focus_row - (2 * clist->clist_window_height - - clist->row_height - CELL_SPACING) / + clist->row_height - CELL_SPACING) / (2 * (clist->row_height + CELL_SPACING))); gtk_clist_draw_focus (widget); break; @@ -6890,9 +6890,9 @@ move_focus_row (GtkCList *clist, if (clist->focus_row >= clist->rows - 1) return; gtk_clist_draw_focus (widget); - clist->focus_row = MIN (clist->rows - 1, clist->focus_row + + clist->focus_row = MIN (clist->rows - 1, clist->focus_row + (2 * clist->clist_window_height - - clist->row_height - CELL_SPACING) / + clist->row_height - CELL_SPACING) / (2 * (clist->row_height + CELL_SPACING))); gtk_clist_draw_focus (widget); break; @@ -7132,7 +7132,7 @@ horizontal_timeout (GtkCList *clist) gtk_clist_motion (GTK_WIDGET (clist), &event); GDK_THREADS_LEAVE (); - + return FALSE; } @@ -7204,13 +7204,13 @@ gtk_clist_set_compare_func (GtkCList *clist, clist->compare = (cmp_func) ? cmp_func : default_compare; } -void +void gtk_clist_set_auto_sort (GtkCList *clist, gboolean auto_sort) { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + if (GTK_CLIST_AUTO_SORT(clist) && !auto_sort) GTK_CLIST_UNSET_FLAG (clist, CLIST_AUTO_SORT); else if (!GTK_CLIST_AUTO_SORT(clist) && auto_sort) @@ -7220,13 +7220,13 @@ gtk_clist_set_auto_sort (GtkCList *clist, } } -void +void gtk_clist_set_sort_type (GtkCList *clist, GtkSortType sort_type) { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + clist->sort_type = sort_type; } @@ -7271,7 +7271,7 @@ default_compare (GtkCList *clist, default: break; } - + switch (row2->cell[clist->sort_column].type) { case GTK_CELL_TEXT: @@ -7319,7 +7319,7 @@ real_sort_list (GtkCList *clist) clist->undo_selection = NULL; clist->undo_unselection = NULL; } - + clist->row_list = gtk_clist_mergesort (clist, clist->row_list, clist->rows); work = clist->selection; @@ -7331,7 +7331,7 @@ real_sort_list (GtkCList *clist) work->data = GINT_TO_POINTER (i); work = work->next; } - + if (i == clist->rows - 1) clist->row_list_end = list; } @@ -7475,7 +7475,7 @@ drag_dest_cell (GtkCList *clist, gint h = 0; y_delta = y - ROW_TOP_YPIXEL (clist, dest_info->cell.row); - + if (GTK_CLIST_DRAW_DRAG_RECT(clist)) { dest_info->insert_pos = GTK_CLIST_DRAG_INTO; @@ -7578,7 +7578,7 @@ gtk_clist_drag_leave (GtkWidget *widget, clist = GTK_CLIST (widget); dest_info = g_dataset_get_data (context, "gtk-clist-drag-dest"); - + if (dest_info) { if (dest_info->cell.row >= 0 && @@ -7668,7 +7668,7 @@ gtk_clist_drag_motion (GtkWidget *widget, } return TRUE; } - + if (new_info.cell.row != dest_info->cell.row || (new_info.cell.row == dest_info->cell.row && dest_info->insert_pos != new_info.insert_pos)) @@ -7682,7 +7682,7 @@ gtk_clist_drag_motion (GtkWidget *widget, dest_info->insert_pos = new_info.insert_pos; dest_info->cell.row = new_info.cell.row; dest_info->cell.column = new_info.cell.column; - + GTK_CLIST_CLASS_FW (clist)->draw_drag_highlight (clist, g_list_nth (clist->row_list, dest_info->cell.row)->data, @@ -7774,7 +7774,7 @@ gtk_clist_drag_data_received (GtkWidget *widget, } } -static void +static void gtk_clist_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, @@ -7838,7 +7838,7 @@ draw_drag_highlight (GtkCList *clist, } void -gtk_clist_set_reorderable (GtkCList *clist, +gtk_clist_set_reorderable (GtkCList *clist, gboolean reorderable) { GtkWidget *widget; @@ -7885,7 +7885,7 @@ gtk_clist_set_button_actions (GtkCList *clist, { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); - + if (button < MAX_BUTTON) { if (gdk_pointer_is_grabbed () || GTK_WIDGET_HAS_GRAB (clist)) diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index a6446ec317..06c724fb4b 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef __GTK_CLIST_H__ @@ -54,7 +54,7 @@ enum { GTK_CLIST_USE_DRAG_ICONS = 1 << 8, GTK_CLIST_DRAW_DRAG_LINE = 1 << 9, GTK_CLIST_DRAW_DRAG_RECT = 1 << 10 -}; +}; /* cell types */ typedef enum @@ -145,58 +145,58 @@ struct _GtkCListDestInfo struct _GtkCList { GtkContainer container; - + guint16 flags; - + /* mem chunks */ GMemChunk *row_mem_chunk; GMemChunk *cell_mem_chunk; guint freeze_count; - + /* allocation rectangle after the conatiner_border_width * and the width of the shadow border */ GdkRectangle internal_allocation; - + /* rows */ gint rows; gint row_center_offset; gint row_height; GList *row_list; GList *row_list_end; - + /* columns */ gint columns; GdkRectangle column_title_area; GdkWindow *title_window; - + /* dynamicly allocated array of column structures */ GtkCListColumn *column; - + /* the scrolling window and its height and width to * make things a little speedier */ GdkWindow *clist_window; gint clist_window_width; gint clist_window_height; - + /* offsets for scrolling */ gint hoffset; gint voffset; - + /* border shadow style */ GtkShadowType shadow_type; - + /* the list's selection mode (gtkenums.h) */ GtkSelectionMode selection_mode; - + /* list of selected rows */ GList *selection; GList *selection_end; - + GList *undo_selection; GList *undo_unselection; gint undo_anchor; - + /* mouse buttons */ guint8 button_actions[5]; @@ -208,30 +208,30 @@ struct _GtkCList /* scroll adjustments */ GtkAdjustment *hadjustment; GtkAdjustment *vadjustment; - + /* xor GC for the vertical drag line */ GdkGC *xor_gc; - + /* gc for drawing unselected cells */ GdkGC *fg_gc; GdkGC *bg_gc; - + /* cursor used to indicate dragging */ GdkCursor *cursor_drag; - + /* the current x-pixel location of the xor-drag line */ gint x_drag; - + /* focus handling */ gint focus_row; - + /* dragging the selection */ gint anchor; GtkStateType anchor_state; gint drag_pos; gint htimer; gint vtimer; - + GtkSortType sort_type; GtkCListCompareFunc compare; gint sort_column; @@ -240,7 +240,7 @@ struct _GtkCList struct _GtkCListClass { GtkContainerClass parent_class; - + void (*set_scroll_adjustments) (GtkCList *clist, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); @@ -320,16 +320,16 @@ struct _GtkCListColumn { gchar *title; GdkRectangle area; - + GtkWidget *button; GdkWindow *window; - + gint width; gint min_width; gint max_width; GtkJustification justification; - - guint visible : 1; + + guint visible : 1; guint width_set : 1; guint resizeable : 1; guint auto_resize : 1; @@ -340,15 +340,15 @@ struct _GtkCListRow { GtkCell *cell; GtkStateType state; - + GdkColor foreground; GdkColor background; - + GtkStyle *style; gpointer data; GtkDestroyNotify destroy; - + guint fg_set : 1; guint bg_set : 1; guint selectable : 1; @@ -358,10 +358,10 @@ struct _GtkCListRow struct _GtkCellText { GtkCellType type; - + gint16 vertical; gint16 horizontal; - + GtkStyle *style; gchar *text; @@ -370,10 +370,10 @@ struct _GtkCellText struct _GtkCellPixmap { GtkCellType type; - + gint16 vertical; gint16 horizontal; - + GtkStyle *style; GdkPixmap *pixmap; @@ -383,10 +383,10 @@ struct _GtkCellPixmap struct _GtkCellPixText { GtkCellType type; - + gint16 vertical; gint16 horizontal; - + GtkStyle *style; gchar *text; @@ -398,10 +398,10 @@ struct _GtkCellPixText struct _GtkCellWidget { GtkCellType type; - + gint16 vertical; gint16 horizontal; - + GtkStyle *style; GtkWidget *widget; @@ -410,27 +410,27 @@ struct _GtkCellWidget struct _GtkCell { GtkCellType type; - + gint16 vertical; gint16 horizontal; - + GtkStyle *style; union { gchar *text; - + struct { GdkPixmap *pixmap; GdkBitmap *mask; } pm; - + struct { gchar *text; guint8 spacing; GdkPixmap *pixmap; GdkBitmap *mask; } pt; - + GtkWidget *widget; } u; }; @@ -485,7 +485,7 @@ void gtk_clist_thaw (GtkCList *clist); void gtk_clist_column_titles_show (GtkCList *clist); void gtk_clist_column_titles_hide (GtkCList *clist); -/* set the column title to be a active title (responds to button presses, +/* set the column title to be a active title (responds to button presses, * prelights, and grabs keyboard focus), or passive where it acts as just * a title */ diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index 9693cd9d98..a8f6aa9e7f 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -1,22 +1,22 @@ /* gtkglobals.h * GTK-related Global defines, etc. * - * $Id: gtkglobals.h,v 1.17 2002/01/11 06:43:17 guy Exp $ + * $Id: gtkglobals.h,v 1.18 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 58fe1d15ce..b61c6347cd 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -1,22 +1,22 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: gui_prefs.c,v 1.34 2002/03/05 11:55:59 guy Exp $ + * $Id: gui_prefs.c,v 1.35 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -194,13 +194,13 @@ gui_prefs_show(void) prefs.gui_hex_dump_highlight_style); gtk_object_set_data(GTK_OBJECT(main_vb), HEX_DUMP_HIGHLIGHT_STYLE_KEY, highlight_style_om); - + /* Geometry prefs */ save_position_cb = create_preference_check_button(main_tb, 6, "Save window position:", NULL, prefs.gui_geometry_save_position); gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_POSITION_KEY, save_position_cb); - + save_size_cb = create_preference_check_button(main_tb, 7, "Save window size:", NULL, prefs.gui_geometry_save_size); gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_SIZE_KEY, @@ -282,7 +282,7 @@ font_browse_cb(GtkWidget *w, gpointer data _U_) /* Set the FONT_DIALOG_PTR_KEY for the caller to point to us */ gtk_object_set_data(GTK_OBJECT(caller), FONT_DIALOG_PTR_KEY, font_browse_w); - + /* Connect the ok_button to font_browse_ok_cb function and pass along a pointer to the font selection box widget */ gtk_signal_connect( @@ -407,10 +407,10 @@ gui_prefs_fetch(GtkWidget *w) prefs.gui_hex_dump_highlight_style = fetch_enum_value( gtk_object_get_data(GTK_OBJECT(w), HEX_DUMP_HIGHLIGHT_STYLE_KEY), highlight_style_vals); - prefs.gui_geometry_save_position = + prefs.gui_geometry_save_position = gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w), GEOMETRY_POSITION_KEY)); - prefs.gui_geometry_save_size = + prefs.gui_geometry_save_size = gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w), GEOMETRY_SIZE_KEY)); @@ -534,9 +534,9 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) GtkWidget *main_vb, *main_tb, *label, *optmenu, *menu, *menuitem; GtkWidget *sample, *colorsel, *bbox, *cancel_bt, *ok_bt, *color_w; int width, height, i; - gdouble scolor[4]; + gdouble scolor[4]; GtkWidget *caller = gtk_widget_get_toplevel(w); - + /* Has a color dialog box already been opened for that top-level widget? */ color_w = gtk_object_get_data(GTK_OBJECT(caller), @@ -570,7 +570,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) if any, that we've been destroyed. */ gtk_signal_connect(GTK_OBJECT(color_w), "destroy", GTK_SIGNAL_FUNC(color_destroy_cb), NULL); - + main_vb = gtk_vbox_new(FALSE, 5); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add (GTK_CONTAINER (color_w), main_vb); @@ -589,7 +589,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) menu = gtk_menu_new(); for (i = 0; i < MAX_HANDLED_COL; i++){ menuitem = gtk_menu_item_new_with_label(color_info[i].label); - gtk_object_set_data(GTK_OBJECT(menuitem), COLOR_SELECTION_PTR_KEY, + gtk_object_set_data(GTK_OBJECT(menuitem), COLOR_SELECTION_PTR_KEY, (gpointer) colorsel); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(update_current_color), @@ -606,18 +606,18 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) width = gdk_string_width(sample->style->font, SAMPLE_MARKED_TEXT); gtk_widget_set_usize(GTK_WIDGET(sample), width, height); gtk_text_set_editable(GTK_TEXT(sample), FALSE); - gtk_text_insert(GTK_TEXT(sample), NULL, - &color_info[MFG_IDX].color, + gtk_text_insert(GTK_TEXT(sample), NULL, + &color_info[MFG_IDX].color, &color_info[MBG_IDX].color, SAMPLE_MARKED_TEXT, -1); gtk_table_attach_defaults(GTK_TABLE(main_tb), sample, 2, 3, 0, 2); gtk_widget_show(sample); - gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), + gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), &scolor[CS_RED]); gtk_table_attach_defaults(GTK_TABLE(main_tb), colorsel, 0, 3, 2, 3); gtk_object_set_data(GTK_OBJECT(colorsel), COLOR_SAMPLE_PTR_KEY, (gpointer) sample); - gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed", + gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed", GTK_SIGNAL_FUNC(update_text_color), NULL); gtk_widget_show(colorsel); gtk_widget_show(main_vb); @@ -625,7 +625,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) gtk_object_set_data(GTK_OBJECT(color_w), COLOR_CALLER_PTR_KEY, caller); gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, color_w); - /* Ok, Cancel Buttons */ + /* Ok, Cancel Buttons */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); @@ -640,7 +640,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_) gtk_widget_grab_default(ok_bt); gtk_widget_show(ok_bt); cancel_bt = gtk_button_new_with_label ("Cancel"); - gtk_signal_connect_object(GTK_OBJECT(cancel_bt), "clicked", + gtk_signal_connect_object(GTK_OBJECT(cancel_bt), "clicked", (GtkSignalFunc)gtk_widget_destroy, GTK_OBJECT(color_w)); gtk_box_pack_start(GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0); @@ -656,16 +656,16 @@ update_text_color(GtkWidget *w, gpointer data _U_) { gdouble scolor[4]; gtk_color_selection_get_color(GTK_COLOR_SELECTION(w), &scolor[CS_RED]); - + curcolor->red = (gushort) (scolor[CS_RED] * 65535.0); curcolor->green = (gushort) (scolor[CS_GREEN] * 65535.0); curcolor->blue = (gushort) (scolor[CS_BLUE] * 65535.0); - + gtk_text_freeze(sample); gtk_text_set_point(sample, 0); gtk_text_forward_delete(sample, gtk_text_get_length(sample)); - gtk_text_insert(GTK_TEXT(sample), NULL, - &color_info[MFG_IDX].color, + gtk_text_insert(GTK_TEXT(sample), NULL, + &color_info[MFG_IDX].color, &color_info[MBG_IDX].color, SAMPLE_MARKED_TEXT, -1); gtk_text_thaw(sample); @@ -674,7 +674,7 @@ update_text_color(GtkWidget *w, gpointer data _U_) { static void update_current_color(GtkWidget *w, gpointer data) { - GtkColorSelection *colorsel; + GtkColorSelection *colorsel; gdouble scolor[4]; colorsel = GTK_COLOR_SELECTION(gtk_object_get_data(GTK_OBJECT(w), @@ -684,7 +684,7 @@ update_current_color(GtkWidget *w, gpointer data) scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0; scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0; scolor[CS_OPACITY] = 1.0; - + gtk_color_selection_set_color(colorsel, &scolor[CS_RED]); } @@ -722,7 +722,7 @@ color_delete_cb(GtkWidget *prefs_w _U_, gpointer dummy _U_) static void color_destroy_cb(GtkWidget *w, gpointer data _U_) { - GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w), + GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w), COLOR_CALLER_PTR_KEY); if (caller != NULL) { gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, NULL); diff --git a/gtk/gui_prefs.h b/gtk/gui_prefs.h index 3d8d70ce0d..a8615cdd8d 100644 --- a/gtk/gui_prefs.h +++ b/gtk/gui_prefs.h @@ -1,23 +1,23 @@ /* gui_prefs.h * Definitions for GUI preferences window * - * $Id: gui_prefs.h,v 1.3 2000/08/21 08:09:12 guy Exp $ + * $Id: gui_prefs.h,v 1.4 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index f44886e7ce..4ac71b4cb3 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -1,6 +1,6 @@ /* help_dlg.c * - * $Id: help_dlg.c,v 1.23 2002/08/02 22:34:53 jmayer Exp $ + * $Id: help_dlg.c,v 1.24 2002/08/28 21:03:48 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -77,13 +77,13 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) *proto_vb, *dfilter_tb, *dfilter_vsb, *cfilter_vb; - + if (help_w != NULL) { /* There's already a "Help" dialog box; reactivate it. */ reactivate_window(help_w); return; } - + help_w = gtk_window_new(GTK_WINDOW_DIALOG); gtk_widget_set_name(help_w, "Ethereal Help window" ); gtk_window_set_title(GTK_WINDOW(help_w), "Ethereal: Help"); @@ -93,7 +93,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL); gtk_widget_set_usize(GTK_WIDGET(help_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3); gtk_container_border_width(GTK_CONTAINER(help_w), 2); - + /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 1); @@ -109,7 +109,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) /* Overview panel */ overview_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(overview_vb), 1); + gtk_container_border_width(GTK_CONTAINER(overview_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(overview_vb), txt_scrollw, TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw), @@ -133,7 +133,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) proto_vb = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(proto_vb), 1); - + txt_scrollw = scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(proto_vb), txt_scrollw, TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw), @@ -144,22 +144,22 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) gtk_text_set_line_wrap(GTK_TEXT(proto_text), FALSE); set_help_text(proto_text, PROTOCOL_HELP); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(txt_scrollw), - proto_text); + proto_text); gtk_widget_show(txt_scrollw); gtk_widget_show(proto_text); gtk_widget_show(proto_vb); label = gtk_label_new("Protocols"); gtk_notebook_append_page(GTK_NOTEBOOK(help_nb), proto_vb, label); - + /* display filter help */ /* X windows have a maximum size of 32767. Since the height can easily exceed this, we have to jump through some hoops to have a functional vertical scroll bar. */ - + dfilter_tb = gtk_table_new(2, 2, FALSE); gtk_table_set_col_spacing (GTK_TABLE (dfilter_tb), 0, 3); gtk_table_set_row_spacing (GTK_TABLE (dfilter_tb), 0, 3); - gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1); + gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw), @@ -184,7 +184,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) gtk_text_set_line_wrap(GTK_TEXT(dfilter_text), FALSE); set_help_text(dfilter_text, DFILTER_HELP); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(txt_scrollw), - dfilter_text); + dfilter_text); gtk_widget_show(txt_scrollw); gtk_widget_show(dfilter_text); gtk_widget_show(dfilter_tb); @@ -195,7 +195,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) /* capture filter help (this one has no horizontal scrollbar) */ cfilter_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(cfilter_vb), 1); + gtk_container_border_width(GTK_CONTAINER(cfilter_vb), 1); txt_scrollw = scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(cfilter_vb), txt_scrollw, TRUE, TRUE, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw), @@ -217,7 +217,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) gtk_widget_show(help_nb); - /* Buttons (only one for now) */ + /* Buttons (only one for now) */ bbox = gtk_hbox_new(FALSE, 1); gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); @@ -229,7 +229,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_) gtk_container_add(GTK_CONTAINER(bbox), close_bt); gtk_widget_grab_default(close_bt); gtk_widget_show(close_bt); - + gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(help_w)); gtk_widget_show(help_w); @@ -251,15 +251,15 @@ static void set_text(GtkWidget *w, char *buffer, int nchars) gtk_text_insert(GTK_TEXT(w), m_r_font, NULL, NULL, buffer, nchars); } -static char *proto_help = +static char *proto_help = "The protocols (and packet types) currently supported by " "Ethereal are the following:\n\n"; -static char *dfilter_help = +static char *dfilter_help = "The following list shows all per-protocol fields that " "can be used in a display filter:\n"; -static char *cfilter_help = +static char *cfilter_help = "Packet capturing is performed with the pcap library. The capture filter " "syntax follows the rules of this library.\nSo this syntax is different " "from the display filter syntax: see manual page of tcpdump.\n" @@ -269,7 +269,7 @@ static char *cfilter_help = ; #endif -static char *overview_help = +static char *overview_help = "Ethereal is a GUI network protocol analyzer. It lets you interactively " "browse packet data from a live network or from a previously saved capture " "file. Ethereal knows how to read libpcap capture files, including those " @@ -319,7 +319,7 @@ static void set_help_text(GtkWidget *w, help_type_t type) set_text(w, overview_help, -1); break; - case PROTOCOL_HELP : + case PROTOCOL_HELP : /* first pass to know the maximum length of first field */ for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { @@ -333,7 +333,7 @@ static void set_help_text(GtkWidget *w, help_type_t type) maxlen2 = strlen(proto_help); width = gdk_string_width(m_r_font, proto_help); set_text(w, proto_help, maxlen2); - + /* ok, display the correctly aligned strings */ for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { @@ -378,7 +378,7 @@ static void set_help_text(GtkWidget *w, help_type_t type) set_text(w, dfilter_help, maxlen3); for (i = 0; i < proto_registrar_n() ; i++) { - hfinfo = proto_registrar_get_nth(i); + hfinfo = proto_registrar_get_nth(i); if (proto_registrar_is_protocol(i)) { snprintf(buffer, BUFF_LEN, "\n%s:\n", hfinfo->name); set_text(w, buffer, strlen(buffer)); @@ -387,7 +387,7 @@ static void set_help_text(GtkWidget *w, help_type_t type) type_name = ftype_pretty_name(hfinfo->type); snprintf(buffer, BUFF_LEN, "%s%s%s%s(%s)\n", - hfinfo->abbrev, + hfinfo->abbrev, &blanks[B_LEN - (maxlen - strlen(hfinfo->abbrev)) - 2], hfinfo->name, &blanks[B_LEN - (maxlen2 - strlen(hfinfo->name)) - 2], @@ -423,7 +423,7 @@ static void clear_help_text(GtkWidget *w) GtkText *txt = GTK_TEXT(w); gtk_text_set_point(txt, 0); - /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see + /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see http://www.ethereal.com/lists/ethereal-dev/199912/msg00312.html and http://www.gnome.org/mailing-lists/archives/gtk-devel-list/1999-October/0051.shtml for more information */ diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h index 88e6950b0f..4c4b36ee36 100644 --- a/gtk/help_dlg.h +++ b/gtk/help_dlg.h @@ -1,6 +1,6 @@ /* help_dlg.h * - * $Id: help_dlg.h,v 1.3 2000/09/08 10:59:14 guy Exp $ + * $Id: help_dlg.h,v 1.4 2002/08/28 21:03:48 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/keys.h b/gtk/keys.h index aaf788a2f6..86d0e6fcce 100644 --- a/gtk/keys.h +++ b/gtk/keys.h @@ -1,22 +1,22 @@ /* keys.h * Key definitions for various objects * - * $Id: keys.h,v 1.13 2002/05/03 03:24:47 guy Exp $ + * $Id: keys.h,v 1.14 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/main.c b/gtk/main.c index 5a1ebf5b03..5992e669ec 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.258 2002/08/24 01:17:08 guy Exp $ + * $Id: main.c,v 1.259 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -9,18 +9,18 @@ * Richard Sharpe, 13-Feb-1999, added support for initializing structures * needed by dissect routines * Jeff Foster, 2001/03/12, added support tabbed hex display windowss - * - * + * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -423,7 +423,7 @@ get_text_from_packet_list(gpointer data) epan_dissect_free(edt); } - + return buf; } @@ -534,10 +534,10 @@ filter_activate_cb(GtkWidget *w, gpointer data) gboolean add_filter = TRUE; gboolean free_filter = TRUE; char *s; - + g_assert(data); s = g_strdup(gtk_entry_get_text(GTK_ENTRY(data))); - + /* GtkCombos don't let us get at their list contents easily, so we maintain our own filter list, and feed it to gtk_combo_set_popdown_strings when a new filter is added. */ @@ -584,9 +584,9 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2) /* Attempt to convert to numbers */ double num1 = atof(text1); double num2 = atof(text2); - + gint col_fmt = cfile.cinfo.col_fmt[clist->sort_column]; - + if ((col_fmt == COL_NUMBER) || (col_fmt == COL_REL_TIME) || (col_fmt == COL_DELTA_TIME) || ((col_fmt == COL_CLS_TIME) && (timestamp_type == RELATIVE)) || ((col_fmt == COL_CLS_TIME) && (timestamp_type == DELTA)) || @@ -604,9 +604,9 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2) else return 0; } - + else { - + /* Compare text column */ if (!text2) return (text1 != NULL); @@ -619,19 +619,19 @@ packet_list_compare(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2) } /* What to do when a column is clicked */ -static void +static void packet_list_click_column_cb(GtkCList *clist, gint column, gpointer data) { column_arrows *col_arrows = (column_arrows *) data; int i; - + gtk_clist_freeze(clist); - + for (i = 0; i < cfile.cinfo.num_cols; i++) { gtk_widget_hide(col_arrows[i].ascend_pm); gtk_widget_hide(col_arrows[i].descend_pm); } - + if (column == clist->sort_column) { if (clist->sort_type == GTK_SORT_ASCENDING) { clist->sort_type = GTK_SORT_DESCENDING; @@ -652,7 +652,7 @@ packet_list_click_column_cb(GtkCList *clist, gint column, gpointer data) } /* mark packets */ -static void +static void set_frame_mark(gboolean set, frame_data *frame, gint row) { GdkColor fg, bg; @@ -674,7 +674,7 @@ set_frame_mark(gboolean set, frame_data *frame, gint row) { static void packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_) { - + GdkEventButton *event_button = (GdkEventButton *)event; gint row, column; @@ -693,8 +693,8 @@ void mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) { if (cfile.current_frame) { /* XXX hum, should better have a "cfile->current_row" here ... */ set_frame_mark(!cfile.current_frame->flags.marked, - cfile.current_frame, - gtk_clist_find_row_from_data(GTK_CLIST(packet_list), + cfile.current_frame, + gtk_clist_find_row_from_data(GTK_CLIST(packet_list), cfile.current_frame)); } } @@ -704,7 +704,7 @@ static void mark_all_frames(gboolean set) { for (fdata = cfile.plist; fdata != NULL; fdata = fdata->next) { set_frame_mark(set, fdata, - gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata)); + gtk_clist_find_row_from_data(GTK_CLIST(packet_list), fdata)); } } @@ -773,7 +773,7 @@ tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer set_menus_for_selected_tree_row(TRUE); if (finfo->hfinfo) { - if (finfo->hfinfo->blurb != NULL && + if (finfo->hfinfo->blurb != NULL && finfo->hfinfo->blurb[0] != '\0') { has_blurb = TRUE; length = strlen(finfo->hfinfo->blurb); @@ -791,7 +791,7 @@ tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer if (length) { length += strlen(finfo->hfinfo->abbrev) + strlen(len_str) + 10; help_str = g_malloc(sizeof(gchar) * length); - sprintf(help_str, "%s (%s)%s", + sprintf(help_str, "%s (%s)%s", (has_blurb) ? finfo->hfinfo->blurb : finfo->hfinfo->name, finfo->hfinfo->abbrev, len_str); statusbar_push_field_msg(help_str); @@ -829,7 +829,7 @@ tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_, { GtkWidget *byte_view; const guint8 *data; - guint len; + guint len; /* * Which byte view is displaying the current protocol tree @@ -906,7 +906,7 @@ set_plist_sel_browse(gboolean val) gtk_clist_set_selection_mode(GTK_CLIST(packet_list), GTK_SELECTION_BROWSE); } } - + /* Set the font of the packet list window. */ void set_plist_font(GdkFont *font) @@ -1066,13 +1066,13 @@ file_quit_cmd_cb (GtkWidget *widget _U_, gpointer data _U_) do_quit(); } -static void +static void print_usage(gboolean print_ver) { if (print_ver) { fprintf(stderr, "This is GNU " PACKAGE " " VERSION ", compiled %s\n", comp_info_str->str); - } + } #ifdef HAVE_LIBPCAP fprintf(stderr, "\n%s [ -vh ] [ -klpQS ] [ -a <capture autostop condition> ] ...\n", PACKAGE); @@ -1093,7 +1093,7 @@ print_usage(gboolean print_ver) { #endif } -static void +static void show_version(void) { #ifdef WIN32 @@ -1199,9 +1199,9 @@ main(int argc, char *argv[]) extern char pcap_version[]; #endif /* HAVE_PCAP_VERSION */ #endif /* HAVE_LIBPCAP */ - + #ifdef WIN32 - WSADATA wsaData; + WSADATA wsaData; #endif char *gpf_path, *cf_path, *df_path; @@ -1323,7 +1323,7 @@ main(int argc, char *argv[]) exit(0); } - /* Set the current locale according to the program environment. + /* Set the current locale according to the program environment. * We haven't localized anything, but some GTK widgets are localized * (the file selection dialogue, for example). * This also sets the C-language locale to the native environment. */ @@ -1331,7 +1331,7 @@ main(int argc, char *argv[]) /* Let GTK get its args */ gtk_init (&argc, &argv); - + /* Read the preference files. */ prefs = read_prefs(&gpf_open_errno, &gpf_path, &pf_open_errno, &pf_path); @@ -1458,7 +1458,7 @@ main(int argc, char *argv[]) #ifdef HAVE_LIBPCAP if (set_autostop_criterion(optarg) == FALSE) { fprintf(stderr, "ethereal: Invalid or unknown -a flag \"%s\"\n", optarg); - exit(1); + exit(1); } #else capture_option_specified = TRUE; @@ -1762,12 +1762,12 @@ main(int argc, char *argv[]) if_list = get_interface_list(&err, err_str); if (if_list == NULL) { switch (err) { - + case CANT_GET_INTERFACE_LIST: fprintf(stderr, "ethereal: Can't get list of interfaces: %s\n", err_str); break; - + case NO_INTERFACES_FOUND: fprintf(stderr, "ethereal: There are no interfaces on which a capture can be done\n"); break; @@ -1789,7 +1789,7 @@ main(int argc, char *argv[]) } #endif - /* Build the column format array */ + /* Build the column format array */ col_init(&cfile.cinfo, prefs->num_cols); for (i = 0; i < cfile.cinfo.num_cols; i++) { cfile.cinfo.col_fmt[i] = get_column_format(i); @@ -1813,14 +1813,14 @@ main(int argc, char *argv[]) else if (capture_opts.snaplen < MIN_PACKET_SIZE) capture_opts.snaplen = MIN_PACKET_SIZE; } - + /* Check the value range of the ringbuffer_num_files parameter */ if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES) capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES; else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES) capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES; #endif - + rc_file = get_persconffile_path(RC_FILE, FALSE); gtk_rc_parse(rc_file); @@ -2001,10 +2001,10 @@ main(int argc, char *argv[]) documentation correctly, gdk_window_get_deskrelative_origin applies mainly to Enlightenment and gdk_window_get_root_origin applies for all other WMs. - + The code below tries both routines, and picks the one that returns the upper-left-most coordinates. - + More info at: http://mail.gnome.org/archives/gtk-devel-list/2001-March/msg00289.html @@ -2035,7 +2035,7 @@ main(int argc, char *argv[]) prefs_write_needed = TRUE; } } - + if (prefs->gui_geometry_save_size) { if (top_level->window != NULL) { /* XXX - Is this the "approved" method? */ @@ -2050,7 +2050,7 @@ main(int argc, char *argv[]) prefs_write_needed = TRUE; } } - + if (prefs_write_needed) { write_prefs(&pf_path); } @@ -2058,7 +2058,7 @@ main(int argc, char *argv[]) /* Ignore errors silently */ g_free(pf_path); } - + epan_cleanup(); g_free(rc_file); @@ -2190,7 +2190,7 @@ static const struct { { "bold", "ultrabold" } }; #define N_WEIGHTS (sizeof weight_map / sizeof weight_map[0]) - + char * boldify(const char *font_name) { @@ -2262,11 +2262,11 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) TRUE, TRUE }; - - /* Main window */ + + /* Main window */ top_level = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_name(top_level, "main window"); - gtk_signal_connect(GTK_OBJECT(top_level), "delete_event", + gtk_signal_connect(GTK_OBJECT(top_level), "delete_event", GTK_SIGNAL_FUNC(main_window_delete_event_cb), NULL); gtk_signal_connect (GTK_OBJECT (top_level), "realize", GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL); @@ -2317,7 +2317,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_container_add(GTK_CONTAINER(pkt_scrollw), packet_list); col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * cfile.cinfo.num_cols); - + set_plist_sel_browse(prefs->gui_plist_sel_browse); set_plist_font(m_r_font); gtk_widget_set_name(packet_list, "packet list"); @@ -2333,12 +2333,12 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Right-justify the packet number column. */ if (cfile.cinfo.col_fmt[i] == COL_NUMBER) - gtk_clist_set_column_justification(GTK_CLIST(packet_list), i, + gtk_clist_set_column_justification(GTK_CLIST(packet_list), i, GTK_JUSTIFY_RIGHT); } gtk_widget_set_usize(packet_list, -1, pl_size); gtk_signal_connect(GTK_OBJECT(packet_list), "button_press_event", - GTK_SIGNAL_FUNC(popup_menu_handler), + GTK_SIGNAL_FUNC(popup_menu_handler), gtk_object_get_data(GTK_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY)); gtk_signal_connect(GTK_OBJECT(packet_list), "button_press_event", GTK_SIGNAL_FUNC(packet_list_button_pressed_cb), NULL); @@ -2377,7 +2377,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) GTK_SIGNAL_FUNC(display_filter_construct_cb), &args); gtk_box_pack_start(GTK_BOX(stat_hbox), filter_bt, FALSE, TRUE, 0); gtk_widget_show(filter_bt); - + filter_cm = gtk_combo_new(); filter_list = g_list_append (filter_list, ""); gtk_combo_set_popdown_strings(GTK_COMBO(filter_cm), filter_list); @@ -2453,7 +2453,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) GTK_SHRINK, GTK_SHRINK, 0, 0); gtk_widget_show(column_lb); col_arrows[i].ascend_pm = gtk_pixmap_new(ascend_pm, ascend_bm); - gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm, + gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm, 1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0); if (i == 0) { gtk_widget_show(col_arrows[i].ascend_pm); diff --git a/gtk/main.h b/gtk/main.h index f4e3ed63f7..9eb6a70ae7 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -1,22 +1,22 @@ /* main.h * Global defines, etc. * - * $Id: main.h,v 1.27 2002/08/24 01:17:09 guy Exp $ + * $Id: main.h,v 1.28 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/menu.c b/gtk/menu.c index 3ed5cf630e..75efbf876c 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,22 +1,22 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.65 2002/08/24 01:17:09 guy Exp $ + * $Id: menu.c,v 1.66 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -87,7 +87,7 @@ static void set_menu_sensitivity (gchar *, gint); <path> -> path of a radio item to link against "<Separator>" -> create a separator "<Branch>" -> create an item to hold sub items (optional) - "<LastBranch>" -> create a right justified branch + "<LastBranch>" -> create a right justified branch */ /* main menu */ @@ -207,7 +207,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] = {"/Colorize Display...", NULL, GTK_MENU_FUNC(color_display_cb), 0, NULL}, {"/Print...", NULL, GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL}, {"/Print Packet", NULL, GTK_MENU_FUNC(file_print_packet_cmd_cb), 0, NULL}, - {"/Show Packet In New Window", NULL, GTK_MENU_FUNC(new_window_cb), 0, NULL}, + {"/Show Packet In New Window", NULL, GTK_MENU_FUNC(new_window_cb), 0, NULL}, }; static GtkItemFactoryEntry tree_view_menu_items[] = @@ -293,7 +293,7 @@ menus_init(void) { gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2); gtk_object_set_data(GTK_OBJECT(popup_menu_object), PM_HEXDUMP_KEY, hexdump_menu_factory->widget); popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory); - + factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp); gtk_item_factory_create_items_ac(factory, nmenu_items, menu_items, NULL,2); set_menus_for_unsaved_capture_file(FALSE); @@ -314,7 +314,7 @@ menus_init(void) { void set_menu_sensitivity_meat(GtkItemFactory *ifactory, gchar *path, gint val) { GtkWidget *menu = NULL; - + if((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL) { gtk_widget_set_sensitive(menu,val); } @@ -360,7 +360,7 @@ void set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpointer data) { GtkWidget *menu = NULL; - + if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL) gtk_object_set_data(GTK_OBJECT(menu), key, data); } @@ -369,7 +369,7 @@ void set_menu_object_data (gchar *path, gchar *key, gpointer data) { GSList *menu_list = popup_menu_list; gchar *shortpath = strrchr(path, '/'); - + set_menu_object_data_meat(factory, path, key, data); while (menu_list != NULL) { set_menu_object_data_meat(menu_list->data, shortpath, key, data); @@ -388,7 +388,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data) if(widget == NULL || event == NULL || data == NULL) { return FALSE; } - + /* * If we ever want to make the menu differ based on what row * and/or column we're above, we'd use "gtk_clist_get_selection_info()" @@ -412,7 +412,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data) menu = (GtkWidget *)data; if(event->type == GDK_BUTTON_PRESS) { event_button = (GdkEventButton *) event; - + if(event_button->button == 3) { gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button->button, event_button->time); gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event"); @@ -488,7 +488,7 @@ set_menus_for_selected_packet(gboolean have_selected_packet) have_selected_packet ? (cfile.edt->pi.ipproto == 6) : FALSE); set_menu_sensitivity("/Tools/Decode As...", have_selected_packet && decode_as_ok()); - set_menu_sensitivity("/Resolve Name", + set_menu_sensitivity("/Resolve Name", have_selected_packet && g_resolv_flags == 0); set_menu_sensitivity("/Tools/TCP Stream Analysis", have_selected_packet ? (cfile.edt->pi.ipproto == 6) : FALSE); diff --git a/gtk/menu.h b/gtk/menu.h index b1e91719c4..0d97f54faa 100644 --- a/gtk/menu.h +++ b/gtk/menu.h @@ -1,23 +1,23 @@ /* menu.h * Menu definitions * - * $Id: menu.h,v 1.6 2000/08/21 12:33:21 deniel Exp $ + * $Id: menu.h,v 1.7 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index da8d1f2d64..8af3f92d76 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -1,22 +1,22 @@ /* nameres_prefs.c * Dialog box for name resolution preferences * - * $Id: nameres_prefs.c,v 1.4 2002/03/05 11:55:59 guy Exp $ + * $Id: nameres_prefs.c,v 1.5 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/nameres_prefs.h b/gtk/nameres_prefs.h index 22a216e556..a988e9422f 100644 --- a/gtk/nameres_prefs.h +++ b/gtk/nameres_prefs.h @@ -1,22 +1,22 @@ /* nameres_prefs.h * Definitions for name resolution preferences window * - * $Id: nameres_prefs.h,v 1.1 2002/01/13 20:35:12 guy Exp $ + * $Id: nameres_prefs.h,v 1.2 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/packet_win.c b/gtk/packet_win.c index e4c6c3e2ad..5a8e3ce0a7 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -3,22 +3,22 @@ * * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet_win.c,v 1.38 2002/06/04 07:48:57 guy Exp $ + * $Id: packet_win.c,v 1.39 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -184,8 +184,8 @@ destroy_new_window(GtkObject *object _U_, gpointer user_data) g_free(DataPtr); } - -/* called when a tree row is selected in the popup packet window */ + +/* called when a tree row is selected in the popup packet window */ static void new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer user_data) @@ -217,7 +217,7 @@ new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, DataPtr->frame, finfo, len); } -/* called when a tree row is unselected in the popup packet window */ +/* called when a tree row is unselected in the popup packet window */ static void new_tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_, gpointer user_data) @@ -225,7 +225,7 @@ new_tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column GtkWidget* byte_view; const guint8* data; guint len; - + struct PacketWinData *DataPtr = (struct PacketWinData*)user_data; DataPtr->finfo_selected = NULL; diff --git a/gtk/packet_win.h b/gtk/packet_win.h index 37a63c4031..331ba89845 100644 --- a/gtk/packet_win.h +++ b/gtk/packet_win.h @@ -3,7 +3,7 @@ * * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet_win.h,v 1.7 2001/03/24 02:14:56 guy Exp $ + * $Id: packet_win.h,v 1.8 2002/08/28 21:03:48 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index b44c8c12a6..334fe1a357 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -1,22 +1,22 @@ /* prefs_dlg.c * Routines for handling preferences * - * $Id: prefs_dlg.c,v 1.51 2002/08/02 22:34:54 jmayer Exp $ + * $Id: prefs_dlg.c,v 1.52 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -85,8 +85,8 @@ static void prefs_tree_select_cb(GtkCTree *, GtkCTreeNode *, gint, gpointer); #define FIRST_PROTO_PREFS_PAGE 6 -/* - * Keep a static pointer to the notebook to be able to choose the +/* + * Keep a static pointer to the notebook to be able to choose the * displayed page. */ static GtkWidget *notebook; @@ -230,7 +230,7 @@ module_prefs_show(module_t *module, gpointer user_data) gtk_notebook_append_page(GTK_NOTEBOOK(cts->notebook), frame, NULL); strcpy(label_str, module->title); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts->ctree), cts->node, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts->ctree), cts->node, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts->ctree), ct_node, GINT_TO_POINTER(cts->page)); @@ -269,7 +269,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) GTK_SIGNAL_FUNC(prefs_main_delete_cb), NULL); gtk_signal_connect(GTK_OBJECT(prefs_w), "destroy", GTK_SIGNAL_FUNC(prefs_main_destroy_cb), NULL); - + /* * Unfortunately, we can't arrange that a GtkTable widget wrap an event box * around a table row, so the spacing between the preference item's label @@ -283,7 +283,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(prefs_w), main_vb); gtk_widget_show(main_vb); - + /* Top row: Preferences tree and notebook */ top_hb = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(main_vb), top_hb); @@ -304,14 +304,14 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_signal_connect(GTK_OBJECT(cts.ctree), "tree-select-row", GTK_SIGNAL_FUNC(prefs_tree_select_cb), NULL); gtk_widget_show(cts.ctree); - + /* A notebook widget sans tabs is used to flip between prefs */ notebook = prefs_nb = gtk_notebook_new(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE); gtk_container_add(GTK_CONTAINER(top_hb), prefs_nb); gtk_widget_show(prefs_nb); - + /* Printing prefs */ frame = gtk_frame_new("Printing"); gtk_widget_show(GTK_WIDGET(frame)); @@ -320,12 +320,12 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "Printing"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); cts.page++; - + /* Column prefs */ frame = gtk_frame_new("Columns"); gtk_widget_show(GTK_WIDGET(frame)); @@ -334,12 +334,12 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "Columns"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); cts.page++; - + /* TCP Streams prefs */ frame = gtk_frame_new("TCP Streams"); gtk_widget_show(GTK_WIDGET(frame)); @@ -348,7 +348,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY, stream_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "TCP Streams"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); @@ -362,7 +362,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_GUI_PAGE_KEY, gui_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "User Interface"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); @@ -381,7 +381,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_CAPTURE_PAGE_KEY, capture_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "Capture"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); @@ -399,7 +399,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_object_set_data(GTK_OBJECT(prefs_w), E_NAMERES_PAGE_KEY, nameres_pg); gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL); strcpy(label_str, "Name resolution"); - ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, + ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.ctree), NULL, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE); gtk_ctree_node_set_row_data(GTK_CTREE(cts.ctree), ct_node, GINT_TO_POINTER(cts.page)); @@ -423,7 +423,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); - + ok_bt = gtk_button_new_with_label ("OK"); gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked", GTK_SIGNAL_FUNC(prefs_main_ok_cb), GTK_OBJECT(prefs_w)); @@ -445,7 +445,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT); gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0); gtk_widget_show(save_bt); - + cancel_bt = gtk_button_new_with_label ("Cancel"); gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked", GTK_SIGNAL_FUNC(prefs_main_cancel_cb), GTK_OBJECT(prefs_w)); @@ -1144,7 +1144,7 @@ module_search_properties(module_t *module, gpointer user_data) } void -properties_cb(GtkWidget *w, gpointer dummy) +properties_cb(GtkWidget *w, gpointer dummy) { gchar *title = NULL; struct properties_data p; @@ -1160,9 +1160,9 @@ properties_cb(GtkWidget *w, gpointer dummy) } else { return; } - + if (!title) return; - + if (prefs_w != NULL) { reactivate_window(prefs_w); } else { @@ -1177,13 +1177,13 @@ properties_cb(GtkWidget *w, gpointer dummy) } -/* Prefs tree selection callback. The node data has been loaded with +/* Prefs tree selection callback. The node data has been loaded with the proper notebook page to load. */ static void prefs_tree_select_cb(GtkCTree *ct, GtkCTreeNode *node, gint col _U_, gpointer dummy _U_) { gint page = GPOINTER_TO_INT(gtk_ctree_node_get_row_data(ct, node)); - - if (page >= 0) + + if (page >= 0) gtk_notebook_set_page(GTK_NOTEBOOK(notebook), page); } diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h index 275dc33df9..7d058ba287 100644 --- a/gtk/prefs_dlg.h +++ b/gtk/prefs_dlg.h @@ -1,22 +1,22 @@ /* prefs_dlg.h * Definitions for preference handling routines * - * $Id: prefs_dlg.h,v 1.8 2002/01/20 20:05:18 guy Exp $ + * $Id: prefs_dlg.h,v 1.9 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 2287247c22..a7402c6ae1 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -1,22 +1,22 @@ /* print_dlg.c * Dialog boxes for printing * - * $Id: print_dlg.c,v 1.34 2002/07/30 07:04:08 guy Exp $ + * $Id: print_dlg.c,v 1.35 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -117,7 +117,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) GSList *expand_grp; GtkWidget *bbox, *ok_bt, *cancel_bt; - + if (print_w != NULL) { /* There's already a "Print" dialog box; reactivate it. */ reactivate_window(print_w); @@ -139,7 +139,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(print_w), main_vb); gtk_widget_show(main_vb); - + main_tb = gtk_table_new(4, 2, FALSE); gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0); @@ -275,7 +275,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) GTK_SIGNAL_FUNC(print_cmd_toggle_detail), NULL); gtk_container_add(GTK_CONTAINER(print_type_vb), detail_rb); gtk_widget_show(detail_rb); - + /* "Print hex" check button. */ hex_cb = dlg_check_button_new_with_label_with_mnemonic("Print _hex data", accel_group); @@ -475,7 +475,7 @@ print_file_cb(GtkWidget *file_bt, gpointer file_te) static void print_fs_ok_cb(GtkWidget *w _U_, gpointer data) { - + gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data), PRINT_FILE_TE_KEY)), gtk_file_selection_get_filename (GTK_FILE_SELECTION(data))); @@ -519,7 +519,7 @@ void setup_mswin_print( print_args_t *print_args) { print_args->dest = g_strdup(path1); print_args->to_file = TRUE; } -#endif +#endif static void print_ok_cb(GtkWidget *ok_bt, gpointer parent_w) @@ -542,7 +542,7 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w) #ifdef _WIN32 win_printer_flag = TRUE; setup_mswin_print(&print_args); -#else +#else print_args.dest = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(ok_bt), PRINT_CMD_TE_KEY)))); #endif diff --git a/gtk/print_mswin.c b/gtk/print_mswin.c index 7eff5835eb..6b5f0a857f 100644 --- a/gtk/print_mswin.c +++ b/gtk/print_mswin.c @@ -6,17 +6,17 @@ * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,7 +41,7 @@ void init_doc_struct( DOCINFO* di, char* docname); void print_file( char* file_name, HDC hdc); - + void print_mswin(char *file_name) { @@ -49,16 +49,16 @@ void print_mswin(char *file_name) DOCINFO di; HWND hWndParent = HWND_DESKTOP; /* would be better to be a real window */ - + /* Need a printer DC to print to. */ hDC = get_printer_dc(); - + /* Did you get a good DC?, Cancel will return NULL also, so what to do? */ if( !hDC) { return; } - + /* You always have to use an AbortProc(). */ if( SetAbortProc( hDC, abort_proc ) == SP_ERROR ) { @@ -66,43 +66,43 @@ void print_mswin(char *file_name) "Error", MB_APPLMODAL | MB_OK); return; } - + /* Init the DOCINFO and start the document. */ init_doc_struct( &di, "MyDoc"); StartDoc( hDC, &di ); - + /* Print one page. */ StartPage( hDC ); print_file(file_name, hDC ); EndPage( hDC ); - + /* Indicate end of document. */ EndDoc( hDC ); - + /* Clean up */ DeleteDC( hDC ); } - + /*===============================*/ /* Obtain printer device context */ /* ==============================*/ HDC get_printer_dc(void) { PRINTDLG pdlg; - + /* Initialize the PRINTDLG structure. */ memset( &pdlg, 0, sizeof( PRINTDLG ) ); pdlg.lStructSize = sizeof( PRINTDLG ); /* Set the flag to return printer DC. */ pdlg.Flags = PD_RETURNDC; - + /* Invoke the printer dialog box. */ PrintDlg( &pdlg ); /* hDC member of the PRINTDLG structure contains the printer DC. */ return pdlg.hDC; } - + /*===============================*/ /* The Abort Procudure */ /* ==============================*/ @@ -116,7 +116,7 @@ void print_mswin(char *file_name) } return TRUE; } - + /*===============================*/ /* Initialize DOCINFO structure */ /* ==============================*/ @@ -128,7 +128,7 @@ void print_mswin(char *file_name) di->cbSize = sizeof( DOCINFO ); di->lpszDocName = docname; } - + /*===============================*/ /* Drawing on the DC */ /* ==============================*/ @@ -143,7 +143,7 @@ void print_file( char *file_name, HDC hdc) { int results, cnt=0, y_pos = y_offset, y_cnt = 0; char buf[ max_buf_size]; char ch; - TEXTMETRIC tm; + TEXTMETRIC tm; GetTextMetrics(hdc, &tm); SetMapMode (hdc, MM_TEXT); @@ -161,13 +161,13 @@ void print_file( char *file_name, HDC hdc) { if ( ch == 0x0a){ buf[ cnt] = 0; TextOut(hdc, x_offset,y_pos, buf, strlen(buf)); - y_pos += tm.tmHeight; + y_pos += tm.tmHeight; cnt = 0; if ( ++y_cnt == max_lines){ /* Print one page. */ EndPage( hdc ); StartPage( hdc ); - y_pos = y_offset; + y_pos = y_offset; y_cnt = 0; } @@ -175,18 +175,18 @@ void print_file( char *file_name, HDC hdc) { }else { if ( cnt == ( max_buf_size - 1)) { buf[ cnt] = 0; TextOut(hdc, x_offset, y_pos, buf, strlen(buf)); - y_pos += tm.tmHeight; + y_pos += tm.tmHeight; cnt = 0; if ( ++y_cnt == max_lines){ /* Print one page. */ EndPage( hdc ); StartPage( hdc ); - y_pos = y_offset; + y_pos = y_offset; y_cnt = 0; } } - + buf[ cnt++] = ch; } } diff --git a/gtk/print_mswin.h b/gtk/print_mswin.h index 3c42d97898..a7159e46c6 100644 --- a/gtk/print_mswin.h +++ b/gtk/print_mswin.h @@ -6,22 +6,22 @@ * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + void print_mswin(char *file_name); diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index 36f95dde48..29848695c9 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -1,22 +1,22 @@ /* print_prefs.c * Dialog boxes for preferences for printing * - * $Id: print_prefs.c,v 1.13 2002/08/13 07:54:37 guy Exp $ + * $Id: print_prefs.c,v 1.14 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -171,7 +171,7 @@ printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) { static void printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) { - + gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data), PRINT_FILE_TE_KEY)), gtk_file_selection_get_filename (GTK_FILE_SELECTION(data))); @@ -180,9 +180,9 @@ printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) { static void printer_opts_fs_cancel_cb(GtkWidget *w _U_, gpointer data) { - + gtk_widget_destroy(GTK_WIDGET(data)); -} +} static void printer_opts_fs_destroy_cb(GtkWidget *win, gpointer data _U_) diff --git a/gtk/print_prefs.h b/gtk/print_prefs.h index e09813866d..1b9b3b3734 100644 --- a/gtk/print_prefs.h +++ b/gtk/print_prefs.h @@ -1,23 +1,23 @@ /* print_prefs.h * Definitions for print preferences window * - * $Id: print_prefs.h,v 1.5 2000/08/21 08:09:15 guy Exp $ + * $Id: print_prefs.h,v 1.6 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 8e1ad889a7..6494356974 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -1,22 +1,22 @@ /* progress_dlg.c * Routines for progress-bar (modal) dialog * - * $Id: progress_dlg.c,v 1.12 2002/08/28 10:07:37 guy Exp $ + * $Id: progress_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -191,7 +191,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, const gcha bbox = gtk_hbutton_box_new(); gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); gtk_container_add(GTK_CONTAINER(main_vb), bbox); - + /* * Allow user to either click a "stop this operation" button, or * the close button on the window, to stop an operation in @@ -218,8 +218,8 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, const gcha } progdlg_t * -delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, - const gchar *stop_title, gboolean *stop_flag, +delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, + const gchar *stop_title, gboolean *stop_flag, GTimeVal *start_time, gfloat progress) { GTimeVal time_now; @@ -267,7 +267,7 @@ delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, else min_display = 2 * MIN_DISPLAY_DEFAULT - delta_time; /* = MIN_DISPLAY_DEFAULT - (delta_time - MIN_DISPLAY_DEFAULT) */ - + /* Assuming the progress increases linearly, see if the progress * dialog would be displayed for at least min_display microseconds if * we created it now. @@ -294,7 +294,7 @@ static gint delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) { gboolean *stop_flag = (gboolean *) data; - + *stop_flag = TRUE; return TRUE; } @@ -309,7 +309,7 @@ static void stop_cb(GtkWidget *w _U_, gpointer data) { gboolean *stop_flag = (gboolean *) data; - + *stop_flag = TRUE; } @@ -349,7 +349,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, gchar *status) g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_elapsed / 60, ul_elapsed % 60); gtk_label_set_text(dlg->elapsed_lb, tmp); - /* show "Time Left" only, + /* show "Time Left" only, * if at least 5% and 3 seconds running (to get a useful estimation) */ if (ul_percentage >= 5 && delta_time >= 3 * 1e6) { ul_left = (delta_time / percentage - delta_time) / 1000 / 1000; diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 94c2ee996d..b66863fd6b 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -1,6 +1,6 @@ /* proto_dlg.c * - * $Id: proto_dlg.c,v 1.12 2002/08/02 22:34:54 jmayer Exp $ + * $Id: proto_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -69,9 +69,9 @@ typedef struct protocol_data { void proto_cb(GtkWidget *w _U_, gpointer data _U_) { - GtkWidget *main_vb, *bbox, *proto_nb, *apply_bt, *cancel_bt, *ok_bt, + GtkWidget *main_vb, *bbox, *proto_nb, *apply_bt, *cancel_bt, *ok_bt, *label, *scrolled_w, *selection_vb, *button; - + if (proto_w != NULL) { reactivate_window(proto_w); return; @@ -92,7 +92,7 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_) gtk_widget_show(main_vb); /* Protocol topics container */ - + proto_nb = gtk_notebook_new(); gtk_container_add(GTK_CONTAINER(main_vb), proto_nb); /* XXX do not know why I need this to fill all space around buttons */ @@ -102,12 +102,12 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_) /* Protocol selection panel ("enable/disable" protocols) */ selection_vb = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(selection_vb), 1); + gtk_container_border_width(GTK_CONTAINER(selection_vb), 1); label = gtk_label_new("Button pressed: protocol decoding is enabled"); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(selection_vb), label, FALSE, FALSE, 0); - scrolled_w = scrolled_window_new(NULL, NULL); - gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1); + scrolled_w = scrolled_window_new(NULL, NULL); + gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_w), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -155,7 +155,7 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_) gtk_widget_show(proto_nb); - /* Ok, Apply, Cancel Buttons */ + /* Ok, Apply, Cancel Buttons */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); @@ -250,14 +250,14 @@ static void proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_) if (proto_w) gtk_widget_destroy(proto_w); proto_w = NULL; - + /* remove protocol list */ if (protocol_list) { for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { g_free(entry->data); } g_slist_free(protocol_list); - protocol_list = NULL; + protocol_list = NULL; } } @@ -271,7 +271,7 @@ static gboolean proto_delete_cb(GtkWidget *proto_w, gpointer dummy _U_) return FALSE; } -static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) +static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { gboolean redissect; @@ -281,13 +281,13 @@ static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) redissect_packets(&cfile); } -static void proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) +static void proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) { if (set_proto_selection(GTK_WIDGET(parent_w))) redissect_packets(&cfile); } -static void proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) +static void proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) { gboolean redissect; @@ -311,7 +311,7 @@ static gboolean set_proto_selection(GtkWidget *parent_w) if (proto_is_protocol_enabled(p->hfinfo_index) != GTK_TOGGLE_BUTTON (button)->active) { proto_set_decoding(p->hfinfo_index, GTK_TOGGLE_BUTTON (button)->active); need_redissect = TRUE; - } + } } return need_redissect; @@ -332,7 +332,7 @@ static gboolean revert_proto_selection(void) if (proto_is_protocol_enabled(p->hfinfo_index) != p->was_enabled) { proto_set_decoding(p->hfinfo_index, p->was_enabled); need_redissect = TRUE; - } + } } return need_redissect; @@ -341,7 +341,7 @@ static gboolean revert_proto_selection(void) gint protocol_data_compare(gconstpointer a, gconstpointer b) { - return strcmp(((protocol_data_t *)a)->abbrev, + return strcmp(((protocol_data_t *)a)->abbrev, ((protocol_data_t *)b)->abbrev); } @@ -367,8 +367,8 @@ static void show_proto_selection(GtkWidget *main, GtkWidget *container) p->abbrev = proto_get_protocol_filter_name(i); p->hfinfo_index = i; p->was_enabled = proto_is_protocol_enabled(i); - protocol_list = g_slist_insert_sorted(protocol_list, - p, protocol_data_compare); + protocol_list = g_slist_insert_sorted(protocol_list, + p, protocol_data_compare); nb_proto ++; } } diff --git a/gtk/proto_dlg.h b/gtk/proto_dlg.h index 187c8c311e..a775823b4a 100644 --- a/gtk/proto_dlg.h +++ b/gtk/proto_dlg.h @@ -1,6 +1,6 @@ /* proto_dlg.h * - * $Id: proto_dlg.h,v 1.1 2000/08/13 14:03:49 deniel Exp $ + * $Id: proto_dlg.h,v 1.2 2002/08/28 21:03:49 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 7d7ffeae83..0d06c78e54 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: proto_draw.c,v 1.56 2002/08/02 22:34:54 jmayer Exp $ + * $Id: proto_draw.c,v 1.57 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -9,17 +9,17 @@ * * Jeff Foster, 2001/03/12, added support for displaying named * data sources as tabbed hex windows - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -134,7 +134,7 @@ redraw_hex_dump(GtkWidget *nb, frame_data *fd, field_info *finfo) GtkWidget *bv; const guint8 *data; guint len; - + bv = get_notebook_bv_ptr(nb); if (bv != NULL) { data = get_byte_view_data_and_length(bv, &len); @@ -149,7 +149,7 @@ redraw_hex_dump_all(void) { if (cfile.current_frame != NULL) redraw_hex_dump( byte_nb_ptr, cfile.current_frame, finfo_selected); - + redraw_hex_dump_packet_wins(); } @@ -413,7 +413,7 @@ byte_view_button_press_cb(GtkWidget *widget, GdkEvent *event, gpointer data) if(widget == NULL || event == NULL || data == NULL) { return FALSE; } - + if(event->type == GDK_BUTTON_PRESS) { event_button = (GdkEventButton *) event; @@ -566,7 +566,7 @@ packet_hex_print_common(GtkText *bv, const guint8 *pd, int len, int bstart, /* Clear out the text */ gtk_text_set_point(bv, 0); - /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see + /* Keep GTK+ 1.2.3 through 1.2.6 from dumping core - see http://www.ethereal.com/lists/ethereal-dev/199912/msg00312.html and http://www.gnome.org/mailing-lists/archives/gtk-devel-list/1999-October/0051.shtml for more information */ @@ -605,7 +605,7 @@ packet_hex_print_common(GtkText *bv, const guint8 *pd, int len, int bstart, line[cur++] = ' '; line[cur++] = ' '; line[cur] = '\0'; - + /* Display with inverse video ? */ if (prefs.gui_hex_dump_highlight_style) { gtk_text_insert(bv, m_r_font, &BLACK, &WHITE, line, -1); @@ -902,7 +902,7 @@ set_ptree_style_cb(gpointer data, gpointer user_data) { gtk_widget_set_style((GtkWidget *)data, (GtkStyle *)user_data); } - + void set_ptree_font_all(GdkFont *font) { @@ -933,7 +933,7 @@ create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane, gtk_paned_pack1(GTK_PANED(pane), tv_scrollw, TRUE, TRUE); gtk_widget_set_usize(tv_scrollw, -1, tv_size); gtk_widget_show(tv_scrollw); - + tree_view = ctree_new(1, 0); gtk_signal_connect( GTK_OBJECT(tree_view), "key-press-event", (GtkSignalFunc) toggle_tree, NULL ); @@ -1037,7 +1037,7 @@ proto_tree_draw_node(GNode *node, gpointer data) is_leaf = TRUE; is_expanded = FALSE; } - + info.ctree = parent_info->ctree; parent = gtk_ctree_insert_node ( info.ctree, parent_info->ctree_node, NULL, &label_ptr, 5, NULL, NULL, NULL, NULL, diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h index 5b400a4bd9..28c8414110 100644 --- a/gtk/proto_draw.h +++ b/gtk/proto_draw.h @@ -1,22 +1,22 @@ /* proto_draw.h * Definitions for GTK+ packet display structures and routines * - * $Id: proto_draw.h,v 1.18 2002/06/04 07:03:57 guy Exp $ + * $Id: proto_draw.h,v 1.19 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index e9e53be1d5..4f058c38ba 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -1,6 +1,6 @@ /* proto_hier_stats_dlg.c * - * $Id: proto_hier_stats_dlg.c,v 1.9 2002/03/05 11:56:00 guy Exp $ + * $Id: proto_hier_stats_dlg.c,v 1.10 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -146,7 +146,7 @@ create_tree(GtkWidget *container, ph_stats_t *ps) for (i = 0; i < NUM_STAT_COLUMNS; i++) { gtk_clist_set_column_auto_resize(GTK_CLIST(tree), i, TRUE); } - + /* Right justify numeric columns */ for (i = 1; i <= 5; i++) { diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 62cd109921..5be59e3d69 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -1,23 +1,23 @@ /* simple_dialog.c * Simple message dialog box routines. * - * $Id: simple_dialog.c,v 1.10 2002/06/04 11:24:35 guy Exp $ + * $Id: simple_dialog.c,v 1.11 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -51,17 +51,17 @@ static const gchar bm_key[] = "button mask"; /* Simple dialog function - Displays a dialog box with the supplied message * text. - * + * * Args: * type : One of ESD_TYPE_*. * btn_mask : The address of a gint. The value passed in determines if - * the 'Cancel' button is displayed. The button pressed by the + * the 'Cancel' button is displayed. The button pressed by the * user is passed back. * msg_format : Sprintf-style format of the text displayed in the dialog. * ... : Argument list for msg_format * */ - + #define ESD_MAX_MSG_LEN 2048 void simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { @@ -109,7 +109,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { top_hb = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(main_vb), top_hb); gtk_widget_show(top_hb); - + style = gtk_widget_get_style(win); cmap = gdk_colormap_get_system(); pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask, @@ -128,7 +128,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_FILL); gtk_container_add(GTK_CONTAINER(top_hb), msg_label); gtk_widget_show(msg_label); - + /* Button row */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); @@ -137,7 +137,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { ok_btn = gtk_button_new_with_label ("OK"); gtk_signal_connect_object(GTK_OBJECT(ok_btn), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (win)); + GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (win)); gtk_container_add(GTK_CONTAINER(bbox), ok_btn); GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT); gtk_widget_grab_default(ok_btn); @@ -171,7 +171,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { static void simple_dialog_cancel_cb(GtkWidget *w _U_, gpointer win) { gint *btn_mask = (gint *) gtk_object_get_data(win, bm_key); - + if (btn_mask) *btn_mask = ESD_BTN_CANCEL; gtk_widget_destroy(GTK_WIDGET(win)); diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index d926c104a0..ffe09028ee 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -1,22 +1,22 @@ /* stream_prefs.c * Dialog boxes for preferences for the stream window * - * $Id: stream_prefs.c,v 1.11 2002/03/05 11:56:00 guy Exp $ + * $Id: stream_prefs.c,v 1.12 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -70,14 +70,14 @@ stream_prefs_show() color_t_to_gdkcolor(&tcolors[CBG_IDX], &prefs.st_client_bg); color_t_to_gdkcolor(&tcolors[SFG_IDX], &prefs.st_server_fg); color_t_to_gdkcolor(&tcolors[SBG_IDX], &prefs.st_server_bg); - + curcolor = &tcolors[CFG_IDX]; scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0; scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0; scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0; scolor[CS_OPACITY] = 1.0; - + /* Enclosing containers for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); @@ -100,7 +100,7 @@ stream_prefs_show() menu = gtk_menu_new (); for (i = 0; i < mcount; i++){ menuitem = gtk_menu_item_new_with_label (mt[i]); - gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY, + gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY, (gpointer) colorsel); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(update_current_color), &tcolors[i]); @@ -129,7 +129,7 @@ stream_prefs_show() gtk_object_set_data(GTK_OBJECT(colorsel), STREAM_SAMPLE_KEY, (gpointer) sample); - gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed", + gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed", GTK_SIGNAL_FUNC(update_text_color), NULL); gtk_widget_show(colorsel); @@ -143,11 +143,11 @@ update_text_color(GtkWidget *w, gpointer data _U_) { gdouble scolor[4]; gtk_color_selection_get_color(GTK_COLOR_SELECTION(w), &scolor[CS_RED]); - + curcolor->red = (gushort) (scolor[CS_RED] * 65535.0); curcolor->green = (gushort) (scolor[CS_GREEN] * 65535.0); curcolor->blue = (gushort) (scolor[CS_BLUE] * 65535.0); - + gtk_text_freeze(sample); gtk_text_set_point(sample, 0); gtk_text_forward_delete(sample, gtk_text_get_length(sample)); @@ -166,12 +166,12 @@ update_current_color(GtkWidget *w, gpointer data) gdouble scolor[4]; curcolor = (GdkColor *) data; - + scolor[CS_RED] = (gdouble) (curcolor->red) / 65535.0; scolor[CS_GREEN] = (gdouble) (curcolor->green) / 65535.0; scolor[CS_BLUE] = (gdouble) (curcolor->blue) / 65535.0; scolor[CS_OPACITY] = 1.0; - + gtk_color_selection_set_color(colorsel, &scolor[CS_RED]); } diff --git a/gtk/stream_prefs.h b/gtk/stream_prefs.h index b9ea1f9156..00d87bb8f7 100644 --- a/gtk/stream_prefs.h +++ b/gtk/stream_prefs.h @@ -1,23 +1,23 @@ /* stream_prefs.h * Definitions for stream preferences window * - * $Id: stream_prefs.h,v 1.3 2000/08/21 08:09:17 guy Exp $ + * $Id: stream_prefs.h,v 1.4 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1999 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 1913c29230..1f057f9c13 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -1,7 +1,7 @@ /* summary_dlg.c * Routines for capture file summary window * - * $Id: summary_dlg.c,v 1.12 2002/03/05 11:56:00 guy Exp $ + * $Id: summary_dlg.c,v 1.13 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -62,7 +62,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) { summary_tally summary; GtkWidget *sum_open_w, - *main_vb, *file_fr, *data_fr, *capture_fr, *file_box, + *main_vb, *file_fr, *data_fr, *capture_fr, *file_box, *data_box, *capture_box, *bbox, *close_bt; gchar string_buff[SUM_STR_MAX]; diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 2fc7c5ab9f..7c816867f9 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -3,22 +3,22 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c,v 1.19 2002/08/02 22:34:54 jmayer Exp $ + * $Id: tcp_graph.c,v 1.20 2002/08/28 21:03:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -773,7 +773,7 @@ static void create_drawing_area (struct graph *g) * and we don't have the GC's at all. so we just postpone installation * of configure handler until we're ready to deal with it. * - * !!! NEMÌLO BY TO BÝT NA KONCI graph_init_sequence()? !!! + * !!! NEMÌLO BY TO BÝT NA KONCI graph_init_sequence()? !!! * */ gtk_signal_connect (GTK_OBJECT(g->drawing_area),"configure_event", @@ -978,7 +978,7 @@ static void callback_create_help (GtkWidget *widget _U_, gpointer data) gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (close), "clicked", (GtkSignalFunc )callback_close_help, toplevel); - + gtk_widget_show_all (toplevel); } @@ -1166,9 +1166,9 @@ static void callback_zoom_flags (GtkWidget *toggle, gpointer data) int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag"); if (GTK_TOGGLE_BUTTON (toggle)->active) - g->zoom.flags |= flag; + g->zoom.flags |= flag; else - g->zoom.flags &= ~flag; + g->zoom.flags &= ~flag; } static void update_zoom_spins (struct graph *g) @@ -1381,9 +1381,9 @@ static void callback_mag_flags (GtkWidget *toggle, gpointer data) int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag"); if (GTK_TOGGLE_BUTTON (toggle)->active) - g->magnify.flags |= flag; + g->magnify.flags |= flag; else - g->magnify.flags &= ~flag; + g->magnify.flags &= ~flag; } static GtkWidget *control_panel_create_zoomlock_group (struct graph *g) @@ -1419,9 +1419,9 @@ static void callback_zoomlock_h (GtkWidget *toggle, gpointer data) struct graph *g = (struct graph * )data; if (GTK_TOGGLE_BUTTON (toggle)->active) - g->zoom.flags |= ZOOM_HLOCK; + g->zoom.flags |= ZOOM_HLOCK; else - g->zoom.flags &= ~ZOOM_HLOCK; + g->zoom.flags &= ~ZOOM_HLOCK; } static void callback_zoomlock_v (GtkWidget *toggle, gpointer data) @@ -1429,9 +1429,9 @@ static void callback_zoomlock_v (GtkWidget *toggle, gpointer data) struct graph *g = (struct graph * )data; if (GTK_TOGGLE_BUTTON (toggle)->active) - g->zoom.flags |= ZOOM_VLOCK; + g->zoom.flags |= ZOOM_VLOCK; else - g->zoom.flags &= ~ZOOM_VLOCK; + g->zoom.flags &= ~ZOOM_VLOCK; } static GtkWidget *control_panel_create_cross_group (struct graph *g) @@ -1523,9 +1523,9 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g) (gpointer )0); gtk_object_set_data (GTK_OBJECT (graph_tseqttrace), "new-graph-type", (gpointer )1); - gtk_object_set_data (GTK_OBJECT (graph_tput), "new-graph-type", + gtk_object_set_data (GTK_OBJECT (graph_tput), "new-graph-type", (gpointer )2); - gtk_object_set_data (GTK_OBJECT (graph_rtt), "new-graph-type", + gtk_object_set_data (GTK_OBJECT (graph_rtt), "new-graph-type", (gpointer )3); gtk_signal_connect (GTK_OBJECT (graph_tseqttrace), "toggled", @@ -2207,7 +2207,7 @@ static void h_axis_pixmap_draw (struct axis *axis) gdk_draw_rectangle (axis->pixmap[not_disp], g->bg_gc, TRUE, 0, 0, axis->p.width, axis->p.height); /* axis */ - gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0, + gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0, axis->s.width + (axis->p.width-axis->s.width)/2.0, 0); offset = g->wp.x - g->geom.x; @@ -2341,10 +2341,10 @@ static void axis_compute_ticks (struct axis *axis, double x0, double xmax, int d axis->minor = steps[jj] * pow (10, ii); check_needed = TRUE; diminished = TRUE; - + debug(DBS_AXES_TICKS) printf ("axis->minor diminished to %.1f\n", axis->minor); - + if (axis->minor*zoom < 10) { debug(DBS_AXES_TICKS) printf ("refusing axis->minor of %f: " "axis->minor*zoom == %f\n", axis->minor, axis->minor*zoom); @@ -2892,7 +2892,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event) y = event->y; state = event->state; } - + /* Testing just (state & GDK_BUTTON1_MASK) is not enough since when button1 * is pressed while pointer is in motion, we will receive one more motion * notify *before* we get the button press. This last motion notify works @@ -2929,7 +2929,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event) if (g->cross.draw) cross_draw (g, x, y); } - + return TRUE; } @@ -3583,7 +3583,7 @@ static void rtt_initialize (struct graph *g) for (tmp=g->segments; tmp; tmp=tmp->next) { if (compare_headers (g->current, tmp, COMPARE_CURR_DIR)) { unsigned int seqno = g_ntohl (tmp->tcphdr.seq); - + if (!first) first= tmp; diff --git a/gtk/tcp_graph.h b/gtk/tcp_graph.h index ea302f0450..c9e5374221 100644 --- a/gtk/tcp_graph.h +++ b/gtk/tcp_graph.h @@ -3,22 +3,22 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.h,v 1.1 2001/12/08 09:27:51 guy Exp $ + * $Id: tcp_graph.h,v 1.2 2002/08/28 21:03:50 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/gtk/ui_util.c b/gtk/ui_util.c index f1e2d86609..6327f245ea 100644 --- a/gtk/ui_util.c +++ b/gtk/ui_util.c @@ -1,22 +1,22 @@ /* ui_util.c * UI utility routines * - * $Id: ui_util.c,v 1.9 2002/03/05 11:56:00 guy Exp $ + * $Id: ui_util.c,v 1.10 2002/08/28 21:03:50 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -75,8 +75,8 @@ reactivate_window(GtkWidget *win) /* Set our window icon. The GDK documentation doesn't provide any actual documentation for gdk_window_set_icon(), so we'll steal libgimp/gimpdialog.c:gimp_dialog_realize_callback() from the Gimp - sources and assume it's safe. - + sources and assume it's safe. + XXX - The current icon size is fixed at 16x16 pixels, which looks fine with kwm (KDE 1.x's window manager), Sawfish (the "default" window manager for GNOME?), and under Windows with Exceed putting X windows @@ -116,7 +116,7 @@ reactivate_window(GtkWidget *win) part of the installation of Ethereal. */ void -window_icon_realize_cb (GtkWidget *win, gpointer data _U_) +window_icon_realize_cb (GtkWidget *win, gpointer data _U_) { #ifndef WIN32 static GdkPixmap *icon_pmap = NULL; diff --git a/gtk/ui_util.h b/gtk/ui_util.h index 259662e6e5..757e7703e9 100644 --- a/gtk/ui_util.h +++ b/gtk/ui_util.h @@ -1,22 +1,22 @@ /* ui_util.h * Definitions for UI utility routines * - * $Id: ui_util.h,v 1.4 2002/01/11 07:40:32 guy Exp $ + * $Id: ui_util.h,v 1.5 2002/08/28 21:03:50 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/in_cksum.c b/in_cksum.c index 492ba64fe5..4bf224e6a9 100644 --- a/in_cksum.c +++ b/in_cksum.c @@ -2,7 +2,7 @@ * 4.4-Lite-2 Internet checksum routine, modified to take a vector of * pointers/lengths giving the pieces to be checksummed. * - * $Id: in_cksum.c,v 1.8 2002/08/03 20:01:13 guy Exp $ + * $Id: in_cksum.c,v 1.9 2002/08/28 21:00:06 jmayer Exp $ */ /* @@ -81,7 +81,7 @@ in_cksum(const vec_t *vec, int veclen) * of a word spanning between this chunk and the * last chunk. * - * s_util.c[0] is already saved when scanning previous + * s_util.c[0] is already saved when scanning previous * chunk. */ s_util.c[1] = *(const guint8 *)w; @@ -1,22 +1,22 @@ /* ipproto.c * Routines for converting IPv4 protocol/v6 nxthdr field into string * - * $Id: ipproto.c,v 1.18 2002/08/02 23:35:46 jmayer Exp $ + * $Id: ipproto.c,v 1.19 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -2,22 +2,22 @@ * Declarations of IP protocol numbers, and of routines for converting * IP protocol numbers into strings. * - * $Id: ipproto.h,v 1.5 2002/05/02 08:51:47 guy Exp $ + * $Id: ipproto.h,v 1.6 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,23 +1,23 @@ /* llcsaps.h * Defines LLC SAP values. * - * $Id: llcsaps.h,v 1.2 2001/01/05 19:07:37 guy Exp $ + * $Id: llcsaps.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -2,22 +2,22 @@ * Definitions for menu routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: menu.h,v 1.9 2001/06/05 07:38:33 guy Exp $ + * $Id: menu.h,v 1.10 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/mergecap.c b/mergecap.c index f8bff1f103..a8dc435822 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.10 2002/08/02 23:35:46 jmayer Exp $ + * $Id: mergecap.c,v 1.11 2002/08/28 21:00:06 jmayer Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -36,7 +36,7 @@ */ static int verbose = 0; /* Not so verbose */ -/* +/* * Structures to manage our files */ typedef struct in_file_t { @@ -62,12 +62,12 @@ static out_file_t out_file; */ static void write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_, - union wtap_pseudo_header *pseudo_header, const guchar *buf) + union wtap_pseudo_header *pseudo_header, const guchar *buf) { wtap_dumper *pdh = (wtap_dumper*)user; int err; struct wtap_pkthdr snap_phdr; - + if (verbose) printf("Record: %u\n", out_file.count++); @@ -110,7 +110,7 @@ append(int count, in_file_t in_files[], out_file_t *out_file) * returns TRUE if first argument is earlier than second */ static gboolean -is_earlier(struct timeval *l, struct timeval *r) { +is_earlier(struct timeval *l, struct timeval *r) { if (l->tv_sec > r->tv_sec) { /* left is later */ return FALSE; } else if (l->tv_sec < r->tv_sec) { /* left is earlier */ @@ -121,7 +121,7 @@ is_earlier(struct timeval *l, struct timeval *r) { /* either one < two or one == two * either way, return one */ - return TRUE; + return TRUE; } @@ -145,7 +145,7 @@ earliest(int count, in_file_t in_files[]) { } return ei; } - + /* * actually merge the files */ @@ -162,7 +162,7 @@ merge(int count, in_file_t in_files[], out_file_t *out_file) /* now keep writing the earliest frame until we're out of frames */ while ( -1 != (i = earliest(count, in_files))) { - + /* write out earliest frame, and fetch another from its * input file */ @@ -190,9 +190,9 @@ select_frame_type(int count, in_file_t files[]) { int i; int selected_frame_type; - + selected_frame_type = wtap_file_encap(files[0].wth); - + for (i = 1; i < count; i++) { int this_frame_type = wtap_file_encap(files[i].wth); if (selected_frame_type != this_frame_type) { @@ -212,7 +212,7 @@ select_frame_type(int count, in_file_t files[]) break; } } - + if (verbose) { fprintf(stderr, "mergecap: selected frame_type %s (%s)\n", wtap_encap_string(selected_frame_type), @@ -221,7 +221,7 @@ select_frame_type(int count, in_file_t files[]) return selected_frame_type; } - + /* * Close the output file @@ -310,7 +310,7 @@ open_in_files(int argc, char *argv[], in_file_t *in_files[]) int err; in_file_t *files; int files_size = argc * sizeof(in_file_t); - + files = malloc(files_size); if (!files) { @@ -347,7 +347,7 @@ open_in_files(int argc, char *argv[], in_file_t *in_files[]) /* * Show the usage - */ + */ static void usage() { @@ -391,9 +391,9 @@ main(int argc, char *argv[]) gboolean do_append = FALSE; int in_file_count = 0; in_file_t *in_files = NULL; - + /* initialize out_file */ - out_file.filename = NULL; + out_file.filename = NULL; out_file.pdh = NULL; /* wiretap dumpfile */ out_file.file_type = WTAP_FILE_PCAP; /* default to "libpcap" */ out_file.frame_type = -2; /* leave type alone */ @@ -407,11 +407,11 @@ main(int argc, char *argv[]) case 'w': out_file.filename = optarg; break; - + case 'a': do_append = !do_append; break; - + case 'T': out_file.frame_type = wtap_short_string_to_encap(optarg); if (out_file.frame_type < 0) { @@ -478,7 +478,7 @@ main(int argc, char *argv[]) /* set the outfile frame type */ if (out_file.frame_type == -2) out_file.frame_type = select_frame_type(in_file_count, in_files); - + /* open the outfile */ if (!open_outfile(&out_file, max_snapshot_length(in_file_count, in_files))) { close_in_files(in_file_count, in_files); @@ -34,7 +34,7 @@ #endif #ifndef __set_errno -#define __set_errno(x) errno=(x) +#define __set_errno(x) errno=(x) #endif #ifndef O_BINARY #define O_BINARY 0 @@ -2,7 +2,7 @@ * Definitions of OSI NLPIDs (Network Layer Protocol IDs) * Laurent Deniel <deniel@worldnet.fr> * - * $Id: nlpid.h,v 1.10 2001/12/02 00:07:46 guy Exp $ + * $Id: nlpid.h,v 1.11 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,23 +1,23 @@ /* oui.h * Definitions of OUIs * - * $Id: oui.h,v 1.11 2001/11/13 23:55:29 gram Exp $ + * $Id: oui.h,v 1.12 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 - 2000 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-aarp.c b/packet-aarp.c index da74bd58e6..fa0aa223c1 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.36 2002/08/02 23:35:46 jmayer Exp $ + * $Id: packet-aarp.c,v 1.37 2002/08/28 21:00:06 jmayer Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -57,7 +57,7 @@ static gint ett_aarp = -1; #ifndef AARP_REPLY #define AARP_REPLY 0x0002 #endif -#ifndef AARP_PROBE +#ifndef AARP_PROBE #define AARP_PROBE 0x0003 #endif @@ -107,15 +107,15 @@ atalkid_to_str(const guint8 *ad) { gint node; static gchar str[3][16]; static gchar *cur; - + if (cur == &str[0][0]) { cur = &str[1][0]; - } else if (cur == &str[1][0]) { + } else if (cur == &str[1][0]) { cur = &str[2][0]; - } else { + } else { cur = &str[0][0]; } - + node=ad[1]<<8|ad[2]; sprintf(cur, "%d.%d",node,ad[3]); return cur; @@ -139,7 +139,7 @@ aarpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) { } return bytes_to_str(ad, ad_len); } - + /* Offsets of fields within an AARP packet. */ #define AR_HRD 0 #define AR_PRO 2 @@ -215,17 +215,17 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tree) { if ((op_str = match_strval(ar_op, op_vals))) ti = proto_tree_add_protocol_format(tree, proto_aarp, tvb, 0, - MIN_AARP_HEADER_SIZE + 2*ar_hln + + MIN_AARP_HEADER_SIZE + 2*ar_hln + 2*ar_pln, "AppleTalk Address Resolution Protocol (%s)", op_str); else ti = proto_tree_add_protocol_format(tree, proto_aarp, tvb, 0, - MIN_AARP_HEADER_SIZE + 2*ar_hln + + MIN_AARP_HEADER_SIZE + 2*ar_hln + 2*ar_pln, "AppleTalk Address Resolution Protocol (opcode 0x%04x)", ar_op); aarp_tree = proto_item_add_subtree(ti, ett_aarp); proto_tree_add_uint(aarp_tree, hf_aarp_hard_type, tvb, AR_HRD, 2, ar_hrd); - proto_tree_add_uint(aarp_tree, hf_aarp_proto_type, tvb, AR_PRO, 2, + proto_tree_add_uint(aarp_tree, hf_aarp_proto_type, tvb, AR_PRO, 2, ar_pro); proto_tree_add_uint(aarp_tree, hf_aarp_hard_size, tvb, AR_HLN, 1, ar_hln); @@ -244,7 +244,7 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_bytes_format(aarp_tree, hf_aarp_src_proto_id, tvb, spa_offset, ar_pln, spa_val, "Sender ID: %s", spa_str); - } else { + } else { proto_tree_add_bytes_format(aarp_tree, hf_aarp_src_proto, tvb, spa_offset, ar_pln, spa_val, "Sender protocol address: %s", spa_str); @@ -276,22 +276,22 @@ proto_register_aarp(void) { static hf_register_info hf[] = { { &hf_aarp_hard_type, - { "Hardware type", "aarp.hard.type", + { "Hardware type", "aarp.hard.type", FT_UINT16, BASE_HEX, VALS(hrd_vals), 0x0, "", HFILL }}, { &hf_aarp_proto_type, - { "Protocol type", "aarp.proto.type", + { "Protocol type", "aarp.proto.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, - "", HFILL }}, + "", HFILL }}, { &hf_aarp_hard_size, - { "Hardware size", "aarp.hard.size", + { "Hardware size", "aarp.hard.size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_aarp_proto_size, - { "Protocol size", "aarp.proto.size", + { "Protocol size", "aarp.proto.size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, diff --git a/packet-afp.c b/packet-afp.c index 66ffdecb5a..4d8950e164 100644 --- a/packet-afp.c +++ b/packet-afp.c @@ -2,7 +2,7 @@ * Routines for afp packet dissection * Copyright 2002, Didier Gautheron <dgautheron@magic.fr> * - * $Id: packet-afp.c,v 1.20 2002/08/02 23:35:46 jmayer Exp $ + * $Id: packet-afp.c,v 1.21 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -15,12 +15,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -48,9 +48,9 @@ AFP 2.1 & 2.2.pdf contained in AppleShare_IP_6.3_SDK available from http://www.apple.com - + AFP3.0.pdf from http://www.apple.com - + The netatalk source code by Wesley Craig & Adrian Sun http://netatalk.sf.net */ @@ -67,7 +67,7 @@ #define AFPSRVRINFO_SRVMSGS (1<<3) /* supports server messages */ #define AFPSRVRINFO_SRVSIGNATURE (1<<4) /* supports server signature */ #define AFPSRVRINFO_TCPIP (1<<5) /* supports tcpip */ -#define AFPSRVRINFO_SRVNOTIFY (1<<6) /* supports server notifications */ +#define AFPSRVRINFO_SRVNOTIFY (1<<6) /* supports server notifications */ #define AFPSRVRINFO_FASTBOZO (1<<15) /* fast copying */ /* AFP Attention Codes -- 4 bits */ @@ -76,7 +76,7 @@ #define AFPATTN_MESG (1 << 13) /* server has message */ #define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */ /* server notification */ -#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT) +#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT) /* extended bitmap -- 12 bits. volchanged is only useful w/ a server * notification, and time is only useful for shutdown. */ @@ -151,10 +151,10 @@ static int proto_afp = -1; static int hf_afp_reserved = -1; static int hf_afp_command = -1; /* CommandCode */ -static int hf_afp_AFPVersion = -1; -static int hf_afp_UAM = -1; -static int hf_afp_user = -1; -static int hf_afp_passwd = -1; +static int hf_afp_AFPVersion = -1; +static int hf_afp_UAM = -1; +static int hf_afp_user = -1; +static int hf_afp_passwd = -1; static int hf_afp_pad = -1; static int hf_afp_vol_flag_passwd = -1; @@ -364,7 +364,7 @@ static const value_string CommandCode_vals[] = { /* volume bitmap - from Apple AFP3.0.pdf + from Apple AFP3.0.pdf Table 1-2 p. 20 */ #define kFPVolAttributeBit (1 << 0) @@ -505,7 +505,7 @@ static const value_string map_id_type_vals[] = { {0, NULL } }; /* - volume attribute from Apple AFP3.0.pdf + volume attribute from Apple AFP3.0.pdf Table 1-3 p. 22 */ #define kReadOnly (1 << 0) @@ -517,7 +517,7 @@ static const value_string map_id_type_vals[] = { #define kSupportsUTF8Names (1 << 6) /* - directory bitmap from Apple AFP3.0.pdf + directory bitmap from Apple AFP3.0.pdf Table 1-4 p. 31 */ #define kFPAttributeBit (1 << 0) @@ -555,7 +555,7 @@ static const value_string map_id_type_vals[] = { #define AR_U_SEARCH (1 << 24) /* user has search access */ #define AR_U_READ (1 << 25) /* user has read access */ -#define AR_U_WRITE (1 << 26) /* user has write access */ +#define AR_U_WRITE (1 << 26) /* user has write access */ #define AR_BLANK (1 << 28) /* Blank Access Privileges (use parent dir privileges) */ #define AR_U_OWN (1 << 31) /* user is the owner */ @@ -591,7 +591,7 @@ static const value_string user_flag_vals[] = { {0, NULL } }; /* - file bitmap AFP3.0.pdf + file bitmap AFP3.0.pdf Table 1-7 p. 36 same as dir kFPAttributeBit (bit 0) @@ -616,7 +616,7 @@ kFPUTF8NameBit (bit 13) #define kFPUnixPrivsBit_file (1 << 15) /* :( */ /* - file attribute AFP3.0.pdf + file attribute AFP3.0.pdf Table 1-8 p. 37 */ #define kFPInvisibleBit (1 << 0) @@ -641,18 +641,18 @@ kFPUTF8NameBit (bit 13) /* Hash functions */ static gint afp_equal (gconstpointer v, gconstpointer v2); static guint afp_hash (gconstpointer v); - + static guint afp_packet_init_count = 200; typedef struct { guint32 conversation; guint16 seq; } afp_request_key; - + typedef struct { guint8 command; } afp_request_val; - + static GHashTable *afp_request_hash = NULL; static GMemChunk *afp_request_keys = NULL; static GMemChunk *afp_request_vals = NULL; @@ -676,7 +676,7 @@ static guint afp_hash (gconstpointer v) return afp_key->seq; } -/* -------------------------- +/* -------------------------- */ #define PAD(x) { proto_tree_add_item(tree, hf_afp_pad, tvb, offset, x, FALSE); offset += x; } @@ -692,7 +692,7 @@ decode_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) item = proto_tree_add_item(tree, hf_afp_vol_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_vol_bitmap); } - + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2,FALSE); @@ -729,19 +729,19 @@ decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset) proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2,FALSE); - - return bitmap; -} -/* -------------------------- + return bitmap; +} + +/* -------------------------- cf AFP3.0.pdf page 38 date are number of seconds from 12:00am on 01.01.2000 GMT backup : 0x8000000 not set - from netatalk adouble.h + from netatalk adouble.h */ -#define DATE_NOT_SET 0x80000000 -#define AD_DATE_DELTA 946684800 -#define AD_DATE_TO_UNIX(x) (x + AD_DATE_DELTA) +#define DATE_NOT_SET 0x80000000 +#define AD_DATE_DELTA 946684800 +#define AD_DATE_TO_UNIX(x) (x + AD_DATE_DELTA) static guint32 print_date(proto_tree *tree,int id, tvbuff_t *tvb, gint offset) { @@ -834,7 +834,7 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) item = proto_tree_add_item(tree, hf_afp_file_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_file_bitmap); } - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2,FALSE); @@ -844,7 +844,7 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2,FALSE); @@ -857,21 +857,21 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) } /* -------------------------- */ -static guint16 +static guint16 decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) { proto_tree *sub_tree = NULL; proto_item *item; guint16 attribute; - + attribute = tvb_get_ntohs(tvb, offset); if (tree) { item = proto_tree_add_text(tree, tvb, offset, 2, "File Attributes: 0x%04x", attribute); sub_tree = proto_item_add_subtree(item, ett_afp_file_attribute); } - proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,FALSE); - if (!shared) + proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,FALSE); + if (!shared) proto_tree_add_item(sub_tree, hf_afp_file_attribute_MultiUser , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_attribute_System , tvb, offset, 2,FALSE); @@ -886,7 +886,7 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) proto_tree_add_item(sub_tree, hf_afp_file_attribute_RenameInhibit, tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_attribute_DeleteInhibit, tvb, offset, 2,FALSE); - if (!shared) + if (!shared) proto_tree_add_item(sub_tree, hf_afp_file_attribute_CopyProtect , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_file_attribute_SetClear , tvb, offset, 2,FALSE); @@ -904,26 +904,26 @@ decode_access_rights (proto_tree *tree, tvbuff_t *tvb, int hf, gint offset) item = proto_tree_add_item(tree, hf, tvb, offset, 4, FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_dir_ar); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_search, tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_read , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_write , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_search, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_read , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_o_write , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_search, tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_read , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_write , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_search, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_read , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_g_write , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_search, tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_read , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_write , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_search, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_read , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_e_write , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_search, tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_read , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_write , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_search, tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_read , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_write , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_blank , tvb, offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_own , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_blank , tvb, offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_ar_u_own , tvb, offset, 4, FALSE); } -} +} static void decode_unix_privs (proto_tree *tree, tvbuff_t *tvb, gint offset) @@ -1009,7 +1009,7 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, proto_tree_add_item(tree, hf_afp_file_DataForkLen, tvb, offset, 4,FALSE); offset += 4; } - + if ((bitmap & kFPRsrcForkLenBit)) { proto_tree_add_item(tree, hf_afp_file_RsrcForkLen, tvb, offset, 4,FALSE); offset += 4; @@ -1051,20 +1051,20 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, } /* -------------------------- */ -static guint16 +static guint16 decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) { proto_tree *sub_tree = NULL; proto_item *item; guint16 bitmap; - + bitmap = tvb_get_ntohs(tvb, offset); if (tree) { item = proto_tree_add_item(tree, hf_afp_dir_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_dir_bitmap); } - - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE); + + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2,FALSE); @@ -1084,20 +1084,20 @@ decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) } /* -------------------------- */ -static guint16 +static guint16 decode_dir_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset) { proto_tree *sub_tree = NULL; proto_item *item; guint16 attribute; - + attribute = tvb_get_ntohs(tvb, offset); if (tree) { item = proto_tree_add_text(tree, tvb, offset, 2, "Directory Attributes: 0x%04x", attribute); sub_tree = proto_item_add_subtree(item, ett_afp_dir_attribute); } - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2,FALSE); proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2,FALSE); @@ -1174,11 +1174,11 @@ parse_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap) offset += 2; /* error in AFP3.0.pdf */ } if ((bitmap & kFPOwnerIDBit)) { - proto_tree_add_item(tree, hf_afp_dir_OwnerID, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_afp_dir_OwnerID, tvb, offset, 4, FALSE); offset += 4; } if ((bitmap & kFPGroupIDBit)) { - proto_tree_add_item(tree, hf_afp_dir_GroupID, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_afp_dir_GroupID, tvb, offset, 4, FALSE); offset += 4; } if ((bitmap & kFPAccessRightsBit)) { @@ -1213,21 +1213,21 @@ name_in_bitmap(tvbuff_t *tvb, gint *offset, guint16 bitmap) guint16 nameoff; guint8 len; gint tp_ofs; - + name = NULL; - if ((bitmap & kFPAttributeBit)) + if ((bitmap & kFPAttributeBit)) *offset += 2; if ((bitmap & kFPParentDirIDBit)) *offset += 4; - if ((bitmap & kFPCreateDateBit)) + if ((bitmap & kFPCreateDateBit)) *offset += 4; if ((bitmap & kFPModDateBit)) *offset += 4; - if ((bitmap & kFPBackupDateBit)) + if ((bitmap & kFPBackupDateBit)) *offset += 4; - if ((bitmap & kFPFinderInfoBit)) + if ((bitmap & kFPFinderInfoBit)) *offset += 32; - + if ((bitmap & kFPLongNameBit)) { nameoff = tvb_get_ntohs(tvb, *offset); if (nameoff) { @@ -1250,14 +1250,14 @@ static gchar * name_in_dbitmap(tvbuff_t *tvb, gint offset, guint16 bitmap) { gchar *name; - + name = name_in_bitmap(tvb, &offset, bitmap); if (name != NULL) return name; /* - check UTF8 name + check UTF8 name */ - + return name; } @@ -1266,14 +1266,14 @@ static gchar * name_in_fbitmap(tvbuff_t *tvb, gint offset, guint16 bitmap) { gchar *name; - + name = name_in_bitmap(tvb, &offset, bitmap); if (name != NULL) return name; /* - check UTF8 name + check UTF8 name */ - + return name; } @@ -1297,10 +1297,10 @@ decode_vol_did_file_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) decode_file_bitmap(tree, tvb, offset); offset += 2; - + decode_dir_bitmap(tree, tvb, offset); offset += 2; - + return offset; } @@ -1337,7 +1337,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off guint8 type; proto_tree *sub_tree = NULL; proto_item *item; - + type = tvb_get_guint8(tvb, offset); len = tvb_get_guint8(tvb, offset +1); name = get_name(tvb, offset +1, type); @@ -1355,7 +1355,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off offset++; proto_tree_add_string(sub_tree, hf_afp_path_name, tvb, offset, len,name); } - else + else offset += 2; return offset +len; @@ -1373,12 +1373,12 @@ static gint dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { int len; - + PAD(1); decode_vol_bitmap(tree, tvb, offset); offset += 2; - + len = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -1389,10 +1389,10 @@ dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!tree) return offset; - + proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,FALSE); offset += len +1; - + len = tvb_reported_length_remaining(tvb,offset); if (len >= 8) { /* optionnal password */ @@ -1407,7 +1407,7 @@ static gint dissect_reply_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { guint16 bitmap; - + if (!tree) return offset; bitmap = decode_vol_bitmap(tree, tvb, offset); @@ -1429,7 +1429,7 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree *flag_tree; proto_item *item; proto_item *ti; - + if (!tree) return offset; @@ -1440,10 +1440,10 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ item = proto_tree_add_text(tree, tvb, offset, 1, "Volumes : %d", num); sub_tree = proto_item_add_subtree(item, ett_afp_server_vol); offset++; - + for (i = 0; i < num; i++) { const gchar *rep; - + item = proto_tree_add_text(sub_tree, tvb, offset, -1,"Volume"); tree = proto_item_add_subtree(item, ett_afp_vol_list); @@ -1458,18 +1458,18 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ len = tvb_get_guint8(tvb, offset) +1; rep = get_name(tvb, offset, 2); proto_item_set_text(item, rep); - proto_item_set_len(item, len +1); + proto_item_set_len(item, len +1); proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,FALSE); offset += len; - } + } return offset; } -/* ************************** +/* ************************** next calls use the same format : - 1 pad byte + 1 pad byte volume id AFP_FLUSH AFP_CLOSEVOL @@ -1482,7 +1482,7 @@ dissect_query_afp_with_vol_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree if (!tree) return offset; PAD(1); - + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,FALSE); offset += 2; return offset; @@ -1499,7 +1499,7 @@ dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset++; offset = decode_vol_did(tree, tvb, offset); - + decode_file_bitmap(tree, tvb, offset); offset += 2; if (tree) { @@ -1539,7 +1539,7 @@ dissect_reply_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t static gint dissect_query_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - + PAD(1); offset = decode_vol_did_file_dir_bitmap(tree, tvb, offset); @@ -1559,7 +1559,7 @@ dissect_query_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* -------------------------- */ static int -loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset, +loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset, int count, guint16 d_bitmap, guint16 f_bitmap, int add) { proto_tree *tree = NULL; @@ -1579,7 +1579,7 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset, if (ptree) { if (flags) { name = name_in_dbitmap(tvb, offset +2, d_bitmap); - } + } else { name = name_in_fbitmap(tvb, offset +2, f_bitmap); } @@ -1602,12 +1602,12 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset, else { offset = parse_file_bitmap(tree, tvb, offset, f_bitmap,0); } - if ((offset & 1)) + if ((offset & 1)) PAD(1); offset = org +size; /* play safe */ if (ptree) g_free((gpointer)name); - } + } return offset; } @@ -1620,10 +1620,10 @@ dissect_reply_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t int count; guint16 f_bitmap; guint16 d_bitmap; - + f_bitmap = decode_file_bitmap(tree, tvb, offset); offset += 2; - + d_bitmap = decode_dir_bitmap(tree, tvb, offset); offset += 2; @@ -1652,7 +1652,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (!ptree) return offset; PAD(1); - + proto_tree_add_item(ptree, hf_afp_vol_id, tvb, offset, 2,FALSE); offset += 2; @@ -1664,10 +1664,10 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item(ptree, hf_afp_cat_position, tvb, offset, 16,FALSE); offset += 16; - + f_bitmap = decode_file_bitmap(ptree, tvb, offset); offset += 2; - + d_bitmap = decode_dir_bitmap(ptree, tvb, offset); offset += 2; @@ -1686,7 +1686,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,FALSE); offset++; - PAD(1); + PAD(1); offset = parse_file_bitmap(tree, tvb, offset, r_bitmap,0); offset = org +size; @@ -1701,7 +1701,7 @@ dissect_query_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,FALSE); offset++; PAD(1); - + offset = parse_file_bitmap(tree, tvb, offset, r_bitmap,0); offset = org +size; @@ -1717,13 +1717,13 @@ dissect_reply_afp_cat_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint16 f_bitmap; guint16 d_bitmap; int count; - + proto_tree_add_item(tree, hf_afp_cat_position, tvb, offset, 16,FALSE); offset += 16; f_bitmap = decode_file_bitmap(tree, tvb, offset); offset += 2; - + d_bitmap = decode_dir_bitmap(tree, tvb, offset); offset += 2; @@ -1746,8 +1746,8 @@ dissect_query_afp_get_vol_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre decode_vol_bitmap(tree, tvb, offset); offset += 2; - - return offset; + + return offset; } /* ------------------------ */ @@ -1776,10 +1776,10 @@ dissect_query_afp_set_vol_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre bitmap = decode_vol_bitmap(tree, tvb, offset); offset += 2; - + offset = parse_vol_bitmap(tree, tvb, offset, bitmap); - return offset; + return offset; } /* ***************************/ @@ -1788,7 +1788,7 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { int len; const char *uam; - + len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_afp_AFPVersion, tvb, offset, 1,FALSE); offset += len +1; @@ -1836,7 +1836,7 @@ dissect_reply_afp_write(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { proto_tree_add_item(tree, hf_afp_last_written, tvb, offset, 4, FALSE); offset += 4; - + return offset; } @@ -1864,7 +1864,7 @@ dissect_reply_afp_write_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t { proto_tree_add_item(tree, hf_afp_last_written64, tvb, offset, 8, FALSE); offset += 8; - + return offset; } @@ -1873,7 +1873,7 @@ static gint dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { PAD(1); - + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE); offset += 2; @@ -1885,7 +1885,7 @@ dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_afp_newline_mask, tvb, offset, 1,FALSE); offset++; - + proto_tree_add_item(tree, hf_afp_newline_char, tvb, offset, 1,FALSE); offset++; @@ -1897,7 +1897,7 @@ static gint dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { PAD(1); - + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE); offset += 2; @@ -1910,8 +1910,8 @@ dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr return offset; } -/* ************************** - Open desktop call +/* ************************** + Open desktop call query is the same than AFP_FLUSH, AFP_CLOSEVOL */ @@ -1924,7 +1924,7 @@ dissect_reply_afp_open_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre return offset; } -/* ************************** +/* ************************** no reply */ static gint @@ -1937,10 +1937,10 @@ dissect_query_afp_close_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr return offset; } -/* ************************** +/* ************************** calls using the same format : - 1 pad byte - fork number + 1 pad byte + fork number AFP_FLUSHFORK AFP_CLOSEFORK */ @@ -1975,7 +1975,7 @@ dissect_reply_afp_get_fldr_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr f_bitmap = decode_file_bitmap(tree, tvb, offset); offset += 2; - + d_bitmap = decode_dir_bitmap(tree, tvb, offset); offset += 2; @@ -1992,25 +1992,25 @@ dissect_reply_afp_get_fldr_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr return offset; } -/* ************************** +/* ************************** no reply */ static gint dissect_query_afp_set_fldr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { guint16 f_bitmap; - + PAD(1); offset = decode_vol_did(tree, tvb, offset); f_bitmap = decode_file_bitmap(tree, tvb, offset); offset += 2; - + offset = decode_name(tree, pinfo, tvb, offset); if ((offset & 1)) PAD(1); - /* did:name can be a file or a folder but only the intersection between + /* did:name can be a file or a folder but only the intersection between * file bitmap and dir bitmap can be set. * Well it's in afp spec, but clients (Mac) are setting 'file only' bits with this call * (WriteInhibit for example). @@ -2020,20 +2020,20 @@ dissect_query_afp_set_fldr_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree * return offset; } -/* ************************** +/* ************************** no reply */ static gint dissect_query_afp_set_file_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { guint16 f_bitmap; - + PAD(1); offset = decode_vol_did(tree, tvb, offset); f_bitmap = decode_file_bitmap(tree, tvb, offset); offset += 2; - + offset = decode_name(tree, pinfo, tvb, offset); if ((offset & 1)) @@ -2043,7 +2043,7 @@ dissect_query_afp_set_file_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree * return offset; } -/* ************************** +/* ************************** no reply */ static gint @@ -2056,7 +2056,7 @@ dissect_query_afp_set_dir_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t d_bitmap = decode_dir_bitmap(tree, tvb, offset); offset += 2; - + offset = decode_name(tree, pinfo, tvb, offset); if ((offset & 1)) @@ -2081,7 +2081,7 @@ dissect_query_afp_create_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; } -/* -------------------------- +/* -------------------------- AFP_MOVE */ static gint @@ -2089,7 +2089,7 @@ dissect_reply_afp_create_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t { proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,FALSE); offset += 4; - + return offset; } @@ -2099,11 +2099,11 @@ dissect_reply_afp_create_dir(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * { proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,FALSE); offset += 4; - + return offset; } -/* ************************** +/* ************************** no reply */ static gint @@ -2114,11 +2114,11 @@ dissect_query_afp_delete_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset += 2; proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,FALSE); offset += 4; - + return offset; } -/* ************************** +/* ************************** same reply as get_fork_param */ static gint @@ -2185,7 +2185,7 @@ dissect_query_afp_set_fork_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr static gint dissect_query_afp_move(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - + PAD(1); offset = decode_vol_did(tree, tvb, offset); @@ -2203,7 +2203,7 @@ dissect_query_afp_move(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint static gint dissect_query_afp_exchange_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - + PAD(1); offset = decode_vol_did(tree, tvb, offset); @@ -2221,7 +2221,7 @@ dissect_query_afp_copy_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { proto_tree *sub_tree = NULL; proto_item *item; - + PAD(1); if (tree) { item = proto_tree_add_text(tree, tvb, offset, 6,"Source volume"); @@ -2246,7 +2246,7 @@ dissect_query_afp_copy_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static gint dissect_query_afp_rename(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - + PAD(1); offset = decode_vol_did(tree, tvb, offset); @@ -2263,7 +2263,7 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree *sub_tree = NULL; proto_item *item; guint8 flag; - + flag = tvb_get_guint8(tvb, offset); if (tree) { item = proto_tree_add_text(tree, tvb, offset, 1, "Flags: 0x%02x", flag); @@ -2276,7 +2276,7 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE); offset += 2; - + proto_tree_add_item(tree, hf_afp_lock_offset, tvb, offset, 4,FALSE); offset += 4; @@ -2302,7 +2302,7 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree *sub_tree = NULL; proto_item *item; guint8 flag; - + flag = tvb_get_guint8(tvb, offset); if (tree) { item = proto_tree_add_text(tree, tvb, offset, 1, "Flags: 0x%02x", flag); @@ -2315,7 +2315,7 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE); offset += 2; - + proto_tree_add_item(tree, hf_afp_lock_offset64, tvb, offset, 8,FALSE); offset += 8; @@ -2349,7 +2349,7 @@ dissect_query_afp_add_cmt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g offset = decode_name(tree, pinfo, tvb, offset); - if ((offset & 1)) + if ((offset & 1)) PAD(1); len = tvb_get_guint8(tvb, offset); @@ -2402,7 +2402,7 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE); offset += 4; - + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE); offset += 1; PAD(1); @@ -2440,7 +2440,7 @@ dissect_reply_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE); offset += 4; - + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE); offset += 1; @@ -2464,21 +2464,21 @@ dissect_query_afp_add_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,FALSE); offset += 4; - + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,FALSE); offset += 1; - + PAD(1); proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4,FALSE); offset += 4; - + proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2,FALSE); offset += 2; return offset; } -/* ************************** +/* ************************** no reply */ static gint @@ -2497,13 +2497,13 @@ dissect_query_afp_add_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4,FALSE); offset += 4; - + offset = decode_name(tree, pinfo, tvb, offset); return offset; } -/* ************************** +/* ************************** no reply */ static gint @@ -2576,7 +2576,7 @@ dissect_query_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree { proto_tree_add_item(tree, hf_afp_map_id_type, tvb, offset, 1,FALSE); offset++; - + proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4,FALSE); offset += 4; @@ -2606,7 +2606,7 @@ int len; len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, 1,FALSE); offset += len +1; - + return offset; } @@ -2742,7 +2742,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 afp_command; int len = tvb_reported_length_remaining(tvb,0); - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -2757,7 +2757,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - request_key.conversation = conversation->index; + request_key.conversation = conversation->index; request_key.seq = aspinfo->seq; request_val = (afp_request_val *) g_hash_table_lookup( @@ -2776,7 +2776,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (!request_val) { /* missing request */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "[Reply without query?]"); return; } @@ -2804,36 +2804,36 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; switch(afp_command) { case AFP_BYTELOCK: - offset = dissect_query_afp_byte_lock(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_byte_lock(tvb, pinfo, afp_tree, offset);break; case AFP_BYTELOCK_EXT: - offset = dissect_query_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break; case AFP_OPENDT: /* same as close vol */ - case AFP_FLUSH: + case AFP_FLUSH: case AFP_CLOSEVOL: offset = dissect_query_afp_with_vol_id(tvb, pinfo, afp_tree, offset);break; case AFP_CLOSEDIR: /* offset = dissect_query_afp_close_dir(tvb, pinfo, afp_tree, offset);break; */ break; - case AFP_CLOSEDT: + case AFP_CLOSEDT: offset = dissect_query_afp_close_dt(tvb, pinfo, afp_tree, offset);break; case AFP_FLUSHFORK: /* same packet as closefork */ case AFP_CLOSEFORK: offset = dissect_query_afp_with_fork(tvb, pinfo, afp_tree, offset);break; case AFP_COPYFILE: - offset = dissect_query_afp_copy_file(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_copy_file(tvb, pinfo, afp_tree, offset);break; case AFP_CREATEFILE: - offset = dissect_query_afp_create_file(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_create_file(tvb, pinfo, afp_tree, offset);break; case AFP_DISCTOLDSESS: - offset = dissect_query_afp_disconnect_old_session(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_disconnect_old_session(tvb, pinfo, afp_tree, offset);break; case AFP_ENUMERATE_EXT: case AFP_ENUMERATE: offset = dissect_query_afp_enumerate(tvb, pinfo, afp_tree, offset);break; case AFP_GETFORKPARAM: - offset = dissect_query_afp_get_fork_param(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_fork_param(tvb, pinfo, afp_tree, offset);break; case AFP_GETSESSTOKEN: - offset = dissect_query_afp_get_session_token(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_session_token(tvb, pinfo, afp_tree, offset);break; case AFP_GETUSERINFO: - offset = dissect_query_afp_get_user_info(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_user_info(tvb, pinfo, afp_tree, offset);break; case AFP_GETSRVINFO: /* offset = dissect_query_afp_get_server_info(tvb, pinfo, afp_tree, offset);break; */ case AFP_GETSRVPARAM: @@ -2864,11 +2864,11 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case AFP_RENAME: offset = dissect_query_afp_rename(tvb, pinfo, afp_tree, offset);break; case AFP_SETDIRPARAM: - offset = dissect_query_afp_set_dir_param(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_set_dir_param(tvb, pinfo, afp_tree, offset);break; case AFP_SETFILEPARAM: - offset = dissect_query_afp_set_file_param(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_set_file_param(tvb, pinfo, afp_tree, offset);break; case AFP_SETFORKPARAM: - offset = dissect_query_afp_set_fork_param(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_set_fork_param(tvb, pinfo, afp_tree, offset);break; case AFP_SETVOLPARAM: offset = dissect_query_afp_set_vol_param(tvb, pinfo, afp_tree, offset);break; case AFP_WRITE: @@ -2885,33 +2885,33 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case AFP_DELETE: /* same as create_id */ case AFP_CREATEDIR: case AFP_CREATEID: - offset = dissect_query_afp_create_id(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_create_id(tvb, pinfo, afp_tree, offset);break; case AFP_DELETEID: - offset = dissect_query_afp_delete_id(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_delete_id(tvb, pinfo, afp_tree, offset);break; case AFP_RESOLVEID: - offset = dissect_query_afp_resolve_id(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_resolve_id(tvb, pinfo, afp_tree, offset);break; case AFP_EXCHANGEFILE: - offset = dissect_query_afp_exchange_file(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_exchange_file(tvb, pinfo, afp_tree, offset);break; case AFP_CATSEARCH_EXT: case AFP_CATSEARCH: - offset = dissect_query_afp_cat_search(tvb, pinfo, afp_tree, offset);break; - case AFP_GETICON: - offset = dissect_query_afp_get_icon(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_cat_search(tvb, pinfo, afp_tree, offset);break; + case AFP_GETICON: + offset = dissect_query_afp_get_icon(tvb, pinfo, afp_tree, offset);break; case AFP_GTICNINFO: - offset = dissect_query_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break; case AFP_ADDAPPL: - offset = dissect_query_afp_add_appl(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_add_appl(tvb, pinfo, afp_tree, offset);break; case AFP_RMVAPPL: - offset = dissect_query_afp_rmv_appl(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_rmv_appl(tvb, pinfo, afp_tree, offset);break; case AFP_GETAPPL: - offset = dissect_query_afp_get_appl(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_appl(tvb, pinfo, afp_tree, offset);break; case AFP_ADDCMT: - offset = dissect_query_afp_add_cmt(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_add_cmt(tvb, pinfo, afp_tree, offset);break; case AFP_RMVCMT: /* same as get_cmt */ case AFP_GETCMT: - offset = dissect_query_afp_get_cmt(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_get_cmt(tvb, pinfo, afp_tree, offset);break; case AFP_ADDICON: - offset = dissect_query_afp_add_icon(tvb, pinfo, afp_tree, offset);break; + offset = dissect_query_afp_add_icon(tvb, pinfo, afp_tree, offset);break; break; } } @@ -2924,9 +2924,9 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } switch(afp_command) { case AFP_BYTELOCK: - offset = dissect_reply_afp_byte_lock(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_byte_lock(tvb, pinfo, afp_tree, offset);break; case AFP_BYTELOCK_EXT: - offset = dissect_reply_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_byte_lock_ext(tvb, pinfo, afp_tree, offset);break; case AFP_ENUMERATE_EXT: case AFP_ENUMERATE: offset = dissect_reply_afp_enumerate(tvb, pinfo, afp_tree, offset);break; @@ -2942,16 +2942,16 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case AFP_GETSRVPARAM: offset = dissect_reply_afp_get_server_param(tvb, pinfo, afp_tree, offset);break; case AFP_CREATEDIR: - offset = dissect_reply_afp_create_dir(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_create_dir(tvb, pinfo, afp_tree, offset);break; case AFP_MAPID: offset = dissect_reply_afp_map_id(tvb, pinfo, afp_tree, offset);break; case AFP_MAPNAME: offset = dissect_reply_afp_map_name(tvb, pinfo, afp_tree, offset);break; case AFP_MOVE: /* same as create_id */ case AFP_CREATEID: - offset = dissect_reply_afp_create_id(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_create_id(tvb, pinfo, afp_tree, offset);break; case AFP_GETSESSTOKEN: - offset = dissect_reply_afp_get_session_token(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_get_session_token(tvb, pinfo, afp_tree, offset);break; case AFP_GETVOLPARAM: offset = dissect_reply_afp_get_vol_param(tvb, pinfo, afp_tree, offset);break; case AFP_GETFLDRPARAM: @@ -2961,13 +2961,13 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case AFP_CATSEARCH_EXT: case AFP_CATSEARCH: - offset = dissect_reply_afp_cat_search(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_cat_search(tvb, pinfo, afp_tree, offset);break; case AFP_GTICNINFO: - offset = dissect_reply_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_get_icon_info(tvb, pinfo, afp_tree, offset);break; case AFP_GETAPPL: - offset = dissect_reply_afp_get_appl(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_get_appl(tvb, pinfo, afp_tree, offset);break; case AFP_GETCMT: - offset = dissect_reply_afp_get_cmt(tvb, pinfo, afp_tree, offset);break; + offset = dissect_reply_afp_get_cmt(tvb, pinfo, afp_tree, offset);break; case AFP_WRITE: offset = dissect_reply_afp_write(tvb, pinfo, afp_tree, offset);break; case AFP_WRITE_EXT: @@ -3013,9 +3013,9 @@ proto_register_afp(void) FT_UINT8, BASE_DEC, VALS(CommandCode_vals), 0x0, "AFP function", HFILL }}, - { &hf_afp_pad, - { "Pad", "afp.pad", - FT_NONE, BASE_NONE, NULL, 0, + { &hf_afp_pad, + { "Pad", "afp.pad", + FT_NONE, BASE_NONE, NULL, 0, "Pad Byte", HFILL }}, { &hf_afp_AFPVersion, @@ -3053,7 +3053,7 @@ proto_register_afp(void) FT_UINT16, BASE_HEX, NULL, 0, "Volume attributes", HFILL }}, - { &hf_afp_vol_attribute_ReadOnly, + { &hf_afp_vol_attribute_ReadOnly, { "Read only", "afp.vol_attribute.read_only", FT_BOOLEAN, 16, NULL, kReadOnly, "Read only volume", HFILL }}, @@ -3143,77 +3143,77 @@ proto_register_afp(void) FT_BOOLEAN, 16, NULL, kFPVolBlockSizeBit, "Volume block size", HFILL }}, - { &hf_afp_dir_bitmap_Attributes, + { &hf_afp_dir_bitmap_Attributes, { "Attributes", "afp.dir_bitmap.attributes", FT_BOOLEAN, 16, NULL, kFPAttributeBit, "Return attributes if directory", HFILL }}, - { &hf_afp_dir_bitmap_ParentDirID, + { &hf_afp_dir_bitmap_ParentDirID, { "DID", "afp.dir_bitmap.did", FT_BOOLEAN, 16, NULL, kFPParentDirIDBit, "Return parent directory ID if directory", HFILL }}, - { &hf_afp_dir_bitmap_CreateDate, + { &hf_afp_dir_bitmap_CreateDate, { "Creation date", "afp.dir_bitmap.create_date", FT_BOOLEAN, 16, NULL, kFPCreateDateBit, "Return creation date if directory", HFILL }}, - { &hf_afp_dir_bitmap_ModDate, + { &hf_afp_dir_bitmap_ModDate, { "Modification date", "afp.dir_bitmap.mod_date", FT_BOOLEAN, 16, NULL, kFPModDateBit, "Return modification date if directory", HFILL }}, - { &hf_afp_dir_bitmap_BackupDate, + { &hf_afp_dir_bitmap_BackupDate, { "Backup date", "afp.dir_bitmap.backup_date", FT_BOOLEAN, 16, NULL, kFPBackupDateBit, "Return backup date if directory", HFILL }}, - { &hf_afp_dir_bitmap_FinderInfo, + { &hf_afp_dir_bitmap_FinderInfo, { "Finder info", "afp.dir_bitmap.finder_info", FT_BOOLEAN, 16, NULL, kFPFinderInfoBit, "Return finder info if directory", HFILL }}, - { &hf_afp_dir_bitmap_LongName, + { &hf_afp_dir_bitmap_LongName, { "Long name", "afp.dir_bitmap.long_name", FT_BOOLEAN, 16, NULL, kFPLongNameBit, "Return long name if directory", HFILL }}, - { &hf_afp_dir_bitmap_ShortName, + { &hf_afp_dir_bitmap_ShortName, { "Short name", "afp.dir_bitmap.short_name", FT_BOOLEAN, 16, NULL, kFPShortNameBit, "Return short name if directory", HFILL }}, - { &hf_afp_dir_bitmap_NodeID, + { &hf_afp_dir_bitmap_NodeID, { "File ID", "afp.dir_bitmap.fid", FT_BOOLEAN, 16, NULL, kFPNodeIDBit, "Return file ID if directory", HFILL }}, - { &hf_afp_dir_bitmap_OffspringCount, + { &hf_afp_dir_bitmap_OffspringCount, { "Offspring count", "afp.dir_bitmap.offspring_count", FT_BOOLEAN, 16, NULL, kFPOffspringCountBit, "Return offspring count if directory", HFILL }}, - { &hf_afp_dir_bitmap_OwnerID, + { &hf_afp_dir_bitmap_OwnerID, { "Owner id", "afp.dir_bitmap.owner_id", FT_BOOLEAN, 16, NULL, kFPOwnerIDBit, "Return owner id if directory", HFILL }}, - { &hf_afp_dir_bitmap_GroupID, + { &hf_afp_dir_bitmap_GroupID, { "Group id", "afp.dir_bitmap.group_id", FT_BOOLEAN, 16, NULL, kFPGroupIDBit, "Return group id if directory", HFILL }}, - { &hf_afp_dir_bitmap_AccessRights, + { &hf_afp_dir_bitmap_AccessRights, { "Access rights", "afp.dir_bitmap.access_rights", FT_BOOLEAN, 16, NULL, kFPAccessRightsBit, "Return access rights if directory", HFILL }}, - { &hf_afp_dir_bitmap_UTF8Name, + { &hf_afp_dir_bitmap_UTF8Name, { "UTF-8 name", "afp.dir_bitmap.UTF8_name", FT_BOOLEAN, 16, NULL, kFPUTF8NameBit, "Return UTF-8 name if diectory", HFILL }}, - { &hf_afp_dir_bitmap_UnixPrivs, + { &hf_afp_dir_bitmap_UnixPrivs, { "UNIX privileges", "afp.dir_bitmap.unix_privs", FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit, "Return UNIX privileges if directory", HFILL }}, @@ -3268,42 +3268,42 @@ proto_register_afp(void) FT_BOOLEAN, 16, NULL, kFPAttributeBit, "Return attributes if file", HFILL }}, - { &hf_afp_file_bitmap_ParentDirID, + { &hf_afp_file_bitmap_ParentDirID, { "DID", "afp.file_bitmap.did", FT_BOOLEAN, 16, NULL, kFPParentDirIDBit, "Return parent directory ID if file", HFILL }}, - { &hf_afp_file_bitmap_CreateDate, + { &hf_afp_file_bitmap_CreateDate, { "Creation date", "afp.file_bitmap.create_date", FT_BOOLEAN, 16, NULL, kFPCreateDateBit, "Return creation date if file", HFILL }}, - { &hf_afp_file_bitmap_ModDate, + { &hf_afp_file_bitmap_ModDate, { "Modification date", "afp.file_bitmap.mod_date", FT_BOOLEAN, 16, NULL, kFPModDateBit, "Return modification date if file", HFILL }}, - { &hf_afp_file_bitmap_BackupDate, + { &hf_afp_file_bitmap_BackupDate, { "Backup date", "afp.file_bitmap.backup_date", FT_BOOLEAN, 16, NULL, kFPBackupDateBit, "Return backup date if file", HFILL }}, - { &hf_afp_file_bitmap_FinderInfo, + { &hf_afp_file_bitmap_FinderInfo, { "Finder info", "afp.file_bitmap.finder_info", FT_BOOLEAN, 16, NULL, kFPFinderInfoBit, "Return finder info if file", HFILL }}, - { &hf_afp_file_bitmap_LongName, + { &hf_afp_file_bitmap_LongName, { "Long name", "afp.file_bitmap.long_name", FT_BOOLEAN, 16, NULL, kFPLongNameBit, "Return long name if file", HFILL }}, - { &hf_afp_file_bitmap_ShortName, + { &hf_afp_file_bitmap_ShortName, { "Short name", "afp.file_bitmap.short_name", FT_BOOLEAN, 16, NULL, kFPShortNameBit, "Return short name if file", HFILL }}, - { &hf_afp_file_bitmap_NodeID, + { &hf_afp_file_bitmap_NodeID, { "File ID", "afp.file_bitmap.fid", FT_BOOLEAN, 16, NULL, kFPNodeIDBit, "Return file ID if file", HFILL }}, @@ -3328,7 +3328,7 @@ proto_register_afp(void) FT_BOOLEAN, 16, NULL, kFPLaunchLimitBit, "Return launch limit if file", HFILL }}, - { &hf_afp_file_bitmap_UTF8Name, + { &hf_afp_file_bitmap_UTF8Name, { "UTF-8 name", "afp.file_bitmap.UTF8_name", FT_BOOLEAN, 16, NULL, kFPUTF8NameBit, "Return UTF-8 name if file", HFILL }}, @@ -3338,7 +3338,7 @@ proto_register_afp(void) FT_BOOLEAN, 16, NULL, kFPExtRsrcForkLenBit, "Return extended (>2GB) resource fork size if file", HFILL }}, - { &hf_afp_file_bitmap_UnixPrivs, + { &hf_afp_file_bitmap_UnixPrivs, { "UNIX privileges", "afp.file_bitmap.unix_privs", FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit_file, "Return UNIX privileges if file", HFILL }}, @@ -3574,22 +3574,22 @@ proto_register_afp(void) { "Extended resource fork size", "afp.ext_resource_fork_len", FT_UINT64, BASE_DEC, NULL, 0x0, "Extended (>2GB) resource fork length", HFILL }}, - + { &hf_afp_file_bitmap, { "File bitmap", "afp.file_bitmap", FT_UINT16, BASE_HEX, NULL, 0x0, "File bitmap", HFILL }}, - + { &hf_afp_req_count, { "Req count", "afp.req_count", FT_UINT16, BASE_DEC, NULL, 0x0, "Maximum number of structures returned", HFILL }}, - { &hf_afp_start_index, + { &hf_afp_start_index, { "Start index", "afp.start_index", FT_UINT16, BASE_DEC, NULL, 0x0, "First structure returned", HFILL }}, - + { &hf_afp_max_reply_size, { "Reply size", "afp.reply_size", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -3609,7 +3609,7 @@ proto_register_afp(void) { "Struct size", "afp.struct_size", FT_UINT8, BASE_DEC, NULL,0, "Sizeof of struct", HFILL }}, - + { &hf_afp_flag, { "From", "afp.flag", FT_UINT8, BASE_HEX, VALS(flag_vals), 0x80, @@ -3629,22 +3629,22 @@ proto_register_afp(void) { "Offset", "afp.offset", FT_INT32, BASE_DEC, NULL, 0x0, "Offset", HFILL }}, - + { &hf_afp_rw_count, { "Count", "afp.rw_count", FT_INT32, BASE_DEC, NULL, 0x0, "Number of bytes to be read/written", HFILL }}, - + { &hf_afp_newline_mask, { "Newline mask", "afp.newline_mask", FT_UINT8, BASE_HEX, NULL, 0x0, "Value to AND bytes with when looking for newline", HFILL }}, - + { &hf_afp_newline_char, { "Newline char", "afp.newline_char", FT_UINT8, BASE_HEX, NULL, 0x0, "Value to compare ANDed bytes with when looking for newline", HFILL }}, - + { &hf_afp_last_written, { "Last written", "afp.last_written", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -3654,7 +3654,7 @@ proto_register_afp(void) { "Count", "afp.actual_count", FT_INT32, BASE_DEC, NULL, 0x0, "Number of bytes returned by read/write", HFILL }}, - + { &hf_afp_ofork_len, { "New length", "afp.ofork_len", FT_INT32, BASE_DEC, NULL, 0x0, @@ -3749,7 +3749,7 @@ proto_register_afp(void) { "Tag", "afp.appl_tag", FT_UINT32, BASE_HEX, NULL, 0x0, "Application tag", HFILL }}, - + { &hf_afp_lock_op, { "unlock", "afp.lock_op", FT_BOOLEAN, 8, NULL, 0x1, @@ -3759,7 +3759,7 @@ proto_register_afp(void) { "End", "afp.lock_from", FT_BOOLEAN, 8, NULL, 0x80, "Offset is relative to the end of the fork", HFILL }}, - + { &hf_afp_lock_offset, { "Offset", "afp.lock_offset", FT_INT32, BASE_DEC, NULL, 0x0, @@ -3916,7 +3916,7 @@ proto_register_afp(void) { "Offset", "afp.offset64", FT_INT64, BASE_DEC, NULL, 0x0, "Offset (64 bits)", HFILL }}, - + { &hf_afp_rw_count64, { "Count", "afp.rw_count64", FT_INT64, BASE_DEC, NULL, 0x0, diff --git a/packet-afs-defs.h b/packet-afs-defs.h index d00887ffbf..cb33fdea01 100644 --- a/packet-afs-defs.h +++ b/packet-afs-defs.h @@ -6,9 +6,9 @@ * Portions based on information retrieved from the RX definitions * in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/ * Portions based on information/specs retrieved from the OpenAFS sources at - * www.openafs.org, Copyright IBM. + * www.openafs.org, Copyright IBM. * - * $Id: packet-afs-defs.h,v 1.11 2002/02/08 22:36:21 nneul Exp $ + * $Id: packet-afs-defs.h,v 1.12 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -432,7 +432,7 @@ static const value_string afs_errors[] = { { 1492325135, "No volume"}, { 1492325136, "Multiple RW volumes"}, { 1492325137, "Failed operation"}, - + /* add more of these errors to decode the errcode responses */ { 0, NULL }, }; diff --git a/packet-afs-macros.h b/packet-afs-macros.h index c48c257f97..8a3a90c691 100644 --- a/packet-afs-macros.h +++ b/packet-afs-macros.h @@ -6,9 +6,9 @@ * Portions based on information retrieved from the RX definitions * in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/ * Portions based on information/specs retrieved from the OpenAFS sources at - * www.openafs.org, Copyright IBM. + * www.openafs.org, Copyright IBM. * - * $Id: packet-afs-macros.h,v 1.18 2002/02/10 02:22:02 guy Exp $ + * $Id: packet-afs-macros.h,v 1.19 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,12 +53,12 @@ #define OUT_INT(field) \ proto_tree_add_int(tree, field, tvb, offset, sizeof(gint32), tvb_get_ntohl(tvb, offset)); \ offset += 4; - + /* Output a unsigned integer, stored into field 'field' - Assumes it is in network byte order, converts to host before using, + Assumes it is in network byte order, converts to host before using, Note - does not increment offset, so can be used repeatedly for bitfields */ #define DISP_UINT(field) \ - proto_tree_add_uint(tree,field,tvb,offset,sizeof(guint32),tvb_get_ntohl(tvb, offset)); + proto_tree_add_uint(tree,field,tvb,offset,sizeof(guint32),tvb_get_ntohl(tvb, offset)); /* Output an IPv4 address, stored into field 'field' */ #define OUT_IP(field) \ @@ -107,7 +107,7 @@ offset += 4; \ } -/* Output a rx style string, up to a maximum length first +/* Output a rx style string, up to a maximum length first 4 bytes - length, then char data */ #define OUT_RXString(field) \ { int i,len; \ @@ -236,7 +236,7 @@ OUT_UINT(hf_afs_cb_fid_uniqifier); \ tree = save; \ } - + /* Output a StoreStatus */ #define OUT_FS_AFSStoreStatus(label) \ { proto_tree *save, *ti; \ @@ -464,7 +464,7 @@ /* Skip a certain number of bytes */ #define SKIP(bytes) \ offset += bytes; - + /* Raw data - to end of frame */ #define OUT_BYTES_ALL(field) OUT_BYTES(field, tvb_length_remaining(tvb,offset)) diff --git a/packet-afs-register-info.h b/packet-afs-register-info.h index 6fc23da3da..198771c911 100644 --- a/packet-afs-register-info.h +++ b/packet-afs-register-info.h @@ -6,9 +6,9 @@ * Portions based on information retrieved from the RX definitions * in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/ * Portions based on information/specs retrieved from the OpenAFS sources at - * www.openafs.org, Copyright IBM. + * www.openafs.org, Copyright IBM. * - * $Id: packet-afs-register-info.h,v 1.13 2002/02/10 02:22:02 guy Exp $ + * $Id: packet-afs-register-info.h,v 1.14 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -31,537 +31,537 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -{ &hf_afs_fs, { "File Server", "afs.fs", +{ &hf_afs_fs, { "File Server", "afs.fs", FT_BOOLEAN, BASE_NONE, 0, 0, "File Server", HFILL }}, -{ &hf_afs_cb, { "Callback", "afs.cb", +{ &hf_afs_cb, { "Callback", "afs.cb", FT_BOOLEAN, BASE_NONE, 0, 0, "Callback", HFILL }}, -{ &hf_afs_prot, { "Protection", "afs.prot", +{ &hf_afs_prot, { "Protection", "afs.prot", FT_BOOLEAN, BASE_NONE, 0, 0, "Protection Server", HFILL }}, -{ &hf_afs_vldb, { "VLDB", "afs.vldb", +{ &hf_afs_vldb, { "VLDB", "afs.vldb", FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Location Database Server", HFILL }}, -{ &hf_afs_kauth, { "KAuth", "afs.kauth", +{ &hf_afs_kauth, { "KAuth", "afs.kauth", FT_BOOLEAN, BASE_NONE, 0, 0, "Kerberos Auth Server", HFILL }}, -{ &hf_afs_vol, { "Volume Server", "afs.vol", +{ &hf_afs_vol, { "Volume Server", "afs.vol", FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Server", HFILL }}, -{ &hf_afs_error, { "Error", "afs.error", +{ &hf_afs_error, { "Error", "afs.error", FT_BOOLEAN, BASE_NONE, 0, 0, "Error", HFILL }}, -{ &hf_afs_bos, { "BOS", "afs.bos", +{ &hf_afs_bos, { "BOS", "afs.bos", FT_BOOLEAN, BASE_NONE, 0, 0, "Basic Oversee Server", HFILL }}, -{ &hf_afs_update, { "Update", "afs.update", +{ &hf_afs_update, { "Update", "afs.update", FT_BOOLEAN, BASE_NONE, 0, 0, "Update Server", HFILL }}, -{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys", +{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys", FT_BOOLEAN, BASE_NONE, 0, 0, "Rmtsys", HFILL }}, -{ &hf_afs_ubik, { "Ubik", "afs.ubik", +{ &hf_afs_ubik, { "Ubik", "afs.ubik", FT_BOOLEAN, BASE_NONE, 0, 0, "Ubik", HFILL }}, -{ &hf_afs_backup, { "Backup", "afs.backup", +{ &hf_afs_backup, { "Backup", "afs.backup", FT_BOOLEAN, BASE_NONE, 0, 0, "Backup Server", HFILL }}, -{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode", +{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode", FT_UINT32, BASE_DEC, VALS(fs_req), 0, "Operation", HFILL }}, -{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode", +{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode", FT_UINT32, BASE_DEC, VALS(cb_req), 0, "Operation", HFILL }}, -{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode", +{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode", FT_UINT32, BASE_DEC, VALS(prot_req), 0, "Operation", HFILL }}, -{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode", +{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode", FT_UINT32, BASE_DEC, VALS(vldb_req), 0, "Operation", HFILL }}, -{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode", +{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode", FT_UINT32, BASE_DEC, VALS(kauth_req), 0, "Operation", HFILL }}, -{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode", +{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode", FT_UINT32, BASE_DEC, VALS(vol_req), 0, "Operation", HFILL }}, -{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode", +{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode", FT_UINT32, BASE_DEC, VALS(bos_req), 0, "Operation", HFILL }}, -{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode", +{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode", FT_UINT32, BASE_DEC, VALS(update_req), 0, "Operation", HFILL }}, -{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode", +{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode", FT_UINT32, BASE_DEC, VALS(rmtsys_req), 0, "Operation", HFILL }}, -{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode", +{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode", FT_UINT32, BASE_DEC, 0, 0, "Operation", HFILL }}, { &hf_afs_backup_opcode, { - "Operation", "afs.backup.opcode", + "Operation", "afs.backup.opcode", FT_UINT32, BASE_DEC, VALS(backup_req), 0, "Operation", HFILL }}, { &hf_afs_ubik_opcode, { - "Operation", "afs.ubik.opcode", + "Operation", "afs.ubik.opcode", FT_UINT32, BASE_DEC, VALS(ubik_req), 0, "Operation", HFILL }}, /* File Server Fields */ -{ &hf_afs_fs_fid_volume, { "FileID (Volume)", "afs.fs.fid.volume", +{ &hf_afs_fs_fid_volume, { "FileID (Volume)", "afs.fs.fid.volume", FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }}, -{ &hf_afs_fs_fid_vnode, { "FileID (VNode)", "afs.fs.fid.vnode", +{ &hf_afs_fs_fid_vnode, { "FileID (VNode)", "afs.fs.fid.vnode", FT_UINT32, BASE_DEC, 0, 0, "File ID (VNode)", HFILL }}, -{ &hf_afs_fs_fid_uniqifier, { "FileID (Uniqifier)", "afs.fs.fid.uniq", +{ &hf_afs_fs_fid_uniqifier, { "FileID (Uniqifier)", "afs.fs.fid.uniq", FT_UINT32, BASE_DEC, 0, 0, "File ID (Uniqifier)", HFILL }}, -{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset", +{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset", FT_UINT32, BASE_DEC, 0, 0, "Offset", HFILL }}, -{ &hf_afs_fs_length, { "Length", "afs.fs.length", +{ &hf_afs_fs_length, { "Length", "afs.fs.length", FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }}, -{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength", +{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength", FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }}, -{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode", +{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_fs_data, { "Data", "afs.fs.data", +{ &hf_afs_fs_data, { "Data", "afs.fs.data", FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }}, -{ &hf_afs_fs_token, { "Token", "afs.fs.token", +{ &hf_afs_fs_token, { "Token", "afs.fs.token", FT_BYTES, BASE_HEX, 0, 0, "Token", HFILL }}, -{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname", +{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname", FT_STRING, BASE_HEX, 0, 0, "Old Name", HFILL }}, -{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname", +{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname", FT_STRING, BASE_HEX, 0, 0, "New Name", HFILL }}, -{ &hf_afs_fs_name, { "Name", "afs.fs.name", +{ &hf_afs_fs_name, { "Name", "afs.fs.name", FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }}, -{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name", +{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name", FT_STRING, BASE_HEX, 0, 0, "Symlink Name", HFILL }}, -{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content", +{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content", FT_STRING, BASE_HEX, 0, 0, "Symlink Content", HFILL }}, -{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid", +{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid", FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }}, -{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname", +{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname", FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }}, -{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp", +{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Timestamp", HFILL }}, -{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg", +{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg", FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }}, -{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd", +{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd", FT_STRING, BASE_HEX, 0, 0, "Message of the Day", HFILL }}, -{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version", +{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version", FT_UINT32, BASE_DEC, 0, 0, "XStats Version", HFILL }}, -{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion", +{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion", FT_UINT32, BASE_DEC, 0, 0, "Client Version", HFILL }}, -{ &hf_afs_fs_xstats_version, { "Collection Number", "afs.fs.xstats.collnumber", +{ &hf_afs_fs_xstats_version, { "Collection Number", "afs.fs.xstats.collnumber", FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, "Collection Number", HFILL }}, -{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp", +{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp", FT_UINT32, BASE_DEC, 0, 0, "XStats Timestamp", HFILL }}, -{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1", +{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1", FT_UINT32, BASE_DEC, 0, 0, "CPS Spare1", HFILL }}, -{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2", +{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2", FT_UINT32, BASE_DEC, 0, 0, "CPS Spare2", HFILL }}, -{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3", +{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3", FT_UINT32, BASE_DEC, 0, 0, "CPS Spare3", HFILL }}, -{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype", +{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype", FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, "Vice Lock Type", HFILL }}, -{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid", +{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid", FT_UINT32, BASE_DEC, 0, 0, "Vice ID", HFILL }}, -{ &hf_afs_fs_viceid, { "IP Address", "afs.fs.ipaddr", +{ &hf_afs_fs_viceid, { "IP Address", "afs.fs.ipaddr", FT_IPv4, BASE_HEX, 0, 0, "IP Address", HFILL }}, - -{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask", + +{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask", FT_UINT32, BASE_HEX, 0, 0, "Mask", HFILL }}, -{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime", +{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime", FT_BOOLEAN, 32, 0, 0x00000001, "Set Modification Time", HFILL }}, -{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner", +{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner", FT_BOOLEAN, 32, 0, 0x00000002, "Set Owner", HFILL }}, -{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup", +{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup", FT_BOOLEAN, 32, 0, 0x00000004, "Set Group", HFILL }}, -{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode", +{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode", FT_BOOLEAN, 32, 0, 0x00000008, "Set Mode", HFILL }}, -{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize", +{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize", FT_BOOLEAN, 32, 0, 0x00000010, "Set Segment Size", HFILL }}, -{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync", +{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync", FT_BOOLEAN, 32, 0, 0x00000400, "FSync", HFILL }}, -{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime", +{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Client Modification Time", HFILL }}, -{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime", +{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Server Modification Time", HFILL }}, -{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner", +{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner", FT_UINT32, BASE_DEC, 0, 0, "Owner", HFILL }}, -{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group", +{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group", FT_UINT32, BASE_DEC, 0, 0, "Group", HFILL }}, -{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode", +{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode", FT_UINT32, BASE_OCT, 0, 0, "Unix Mode", HFILL }}, -{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize", +{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize", FT_UINT32, BASE_DEC, 0, 0, "Segment Size", HFILL }}, -{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion", +{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion", FT_UINT32, BASE_DEC, 0, 0, "Interface Version", HFILL }}, -{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype", +{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype", FT_UINT32, BASE_DEC, 0, 0, "File Type", HFILL }}, -{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author", +{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author", FT_UINT32, BASE_DEC, 0, 0, "Author", HFILL }}, -{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess", +{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess", FT_UINT32, BASE_DEC, 0, 0, "Caller Access", HFILL }}, -{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess", +{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess", FT_UINT32, BASE_DEC, 0, 0, "Anonymous Access", HFILL }}, -{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode", +{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode", FT_UINT32, BASE_DEC, 0, 0, "Parent VNode", HFILL }}, -{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique", +{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique", FT_UINT32, BASE_DEC, 0, 0, "Parent Unique", HFILL }}, -{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion", +{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion", FT_UINT32, BASE_DEC, 0, 0, "Data Version", HFILL }}, -{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh", +{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh", FT_UINT32, BASE_DEC, 0, 0, "Data Version (High)", HFILL }}, -{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount", +{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount", FT_UINT32, BASE_DEC, 0, 0, "Link Count", HFILL }}, -{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2", +{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2", FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }}, -{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3", +{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3", FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }}, -{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4", +{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4", FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }}, -{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter", +{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter", FT_UINT32, BASE_DEC, 0, 0, "Sync Counter", HFILL }}, -{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length", +{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length", FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }}, -{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1", +{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Volume Creation Timestamp", HFILL }}, -{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2", +{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2", FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }}, -{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3", +{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3", FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }}, -{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4", +{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4", FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }}, -{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5", +{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5", FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }}, -{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6", +{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6", FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }}, { &hf_afs_fs_acl_count_positive, { - "ACL Count (Positive)", "afs.fs.acl.count.positive", + "ACL Count (Positive)", "afs.fs.acl.count.positive", FT_UINT32, BASE_DEC, 0, 0, "Number of Positive ACLs", HFILL }}, { &hf_afs_fs_acl_count_negative, { - "ACL Count (Negative)", "afs.fs.acl.count.negative", + "ACL Count (Negative)", "afs.fs.acl.count.negative", FT_UINT32, BASE_DEC, 0, 0, "Number of Negative ACLs", HFILL }}, { &hf_afs_fs_acl_datasize, { - "ACL Size", "afs.fs.acl.datasize", + "ACL Size", "afs.fs.acl.datasize", FT_UINT32, BASE_DEC, 0, 0, "ACL Data Size", HFILL }}, { &hf_afs_fs_acl_entity, { - "Entity (User/Group)", "afs.fs.acl.entity", + "Entity (User/Group)", "afs.fs.acl.entity", FT_STRING, BASE_HEX, 0, 0, "ACL Entity (User/Group)", HFILL }}, { &hf_afs_fs_acl_r, { - "_R_ead", "afs.fs.acl.r", + "_R_ead", "afs.fs.acl.r", FT_BOOLEAN, 8, 0, PRSFS_READ, "Read", HFILL }}, { &hf_afs_fs_acl_l, { - "_L_ookup", "afs.fs.acl.l", + "_L_ookup", "afs.fs.acl.l", FT_BOOLEAN, 8, 0, PRSFS_LOOKUP, "Lookup", HFILL }}, { &hf_afs_fs_acl_i, { - "_I_nsert", "afs.fs.acl.i", + "_I_nsert", "afs.fs.acl.i", FT_BOOLEAN, 8, 0, PRSFS_INSERT, "Insert", HFILL }}, -{ &hf_afs_fs_acl_d, { "_D_elete", "afs.fs.acl.d", +{ &hf_afs_fs_acl_d, { "_D_elete", "afs.fs.acl.d", FT_BOOLEAN, 8, 0, PRSFS_DELETE, "Delete", HFILL }}, -{ &hf_afs_fs_acl_w, { "_W_rite", "afs.fs.acl.w", +{ &hf_afs_fs_acl_w, { "_W_rite", "afs.fs.acl.w", FT_BOOLEAN, 8, 0, PRSFS_WRITE, "Write", HFILL }}, -{ &hf_afs_fs_acl_k, { "_L_ock", "afs.fs.acl.k", +{ &hf_afs_fs_acl_k, { "_L_ock", "afs.fs.acl.k", FT_BOOLEAN, 8, 0, PRSFS_LOCK, "Lock", HFILL }}, -{ &hf_afs_fs_acl_a, { "_A_dminister", "afs.fs.acl.a", +{ &hf_afs_fs_acl_a, { "_A_dminister", "afs.fs.acl.a", FT_BOOLEAN, 8, 0, PRSFS_ADMINISTER, "Administer", HFILL }}, -{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version", +{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version", FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }}, -{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires", +{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Expires", HFILL }}, -{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type", +{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type", FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }}, /* BOS Server Fields */ -{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode", +{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_bos_type, { "Type", "afs.bos.type", +{ &hf_afs_bos_type, { "Type", "afs.bos.type", FT_STRING, BASE_HEX, 0, 0, "Type", HFILL }}, -{ &hf_afs_bos_content, { "Content", "afs.bos.content", +{ &hf_afs_bos_content, { "Content", "afs.bos.content", FT_STRING, BASE_HEX, 0, 0, "Content", HFILL }}, -{ &hf_afs_bos_data, { "Data", "afs.bos.data", +{ &hf_afs_bos_data, { "Data", "afs.bos.data", FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }}, -{ &hf_afs_bos_path, { "Path", "afs.bos.path", +{ &hf_afs_bos_path, { "Path", "afs.bos.path", FT_STRING, BASE_HEX, 0, 0, "Path", HFILL }}, -{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm", +{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm", FT_STRING, BASE_HEX, 0, 0, "Parm", HFILL }}, -{ &hf_afs_bos_error, { "Error", "afs.bos.error", +{ &hf_afs_bos_error, { "Error", "afs.bos.error", FT_STRING, BASE_HEX, 0, 0, "Error", HFILL }}, -{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1", +{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1", FT_STRING, BASE_HEX, 0, 0, "Spare1", HFILL }}, -{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2", +{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2", FT_STRING, BASE_HEX, 0, 0, "Spare2", HFILL }}, -{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3", +{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3", FT_STRING, BASE_HEX, 0, 0, "Spare3", HFILL }}, -{ &hf_afs_bos_file, { "File", "afs.bos.file", +{ &hf_afs_bos_file, { "File", "afs.bos.file", FT_STRING, BASE_HEX, 0, 0, "File", HFILL }}, -{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd", +{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd", FT_STRING, BASE_HEX, 0, 0, "Command", HFILL }}, -{ &hf_afs_bos_key, { "Key", "afs.bos.key", +{ &hf_afs_bos_key, { "Key", "afs.bos.key", FT_BYTES, BASE_HEX, 0, 0, "key", HFILL }}, -{ &hf_afs_bos_user, { "User", "afs.bos.user", +{ &hf_afs_bos_user, { "User", "afs.bos.user", FT_STRING, BASE_HEX, 0, 0, "User", HFILL }}, -{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance", +{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance", FT_STRING, BASE_HEX, 0, 0, "Instance", HFILL }}, -{ &hf_afs_bos_status, { "Status", "afs.bos.status", +{ &hf_afs_bos_status, { "Status", "afs.bos.status", FT_INT32, BASE_DEC, 0, 0, "Status", HFILL }}, -{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc", +{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc", FT_STRING, BASE_DEC, 0, 0, "Status Description", HFILL }}, -{ &hf_afs_bos_num, { "Number", "afs.bos.number", +{ &hf_afs_bos_num, { "Number", "afs.bos.number", FT_UINT32, BASE_DEC, 0, 0, "Number", HFILL }}, -{ &hf_afs_bos_size, { "Size", "afs.bos.size", +{ &hf_afs_bos_size, { "Size", "afs.bos.size", FT_UINT32, BASE_DEC, 0, 0, "Size", HFILL }}, -{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags", +{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags", FT_UINT32, BASE_DEC, 0, 0, "Flags", HFILL }}, -{ &hf_afs_bos_date, { "Date", "afs.bos.date", +{ &hf_afs_bos_date, { "Date", "afs.bos.date", FT_UINT32, BASE_DEC, 0, 0, "Date", HFILL }}, -{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno", +{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno", FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }}, -{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell", +{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell", FT_STRING, BASE_HEX, 0, 0, "Cell", HFILL }}, -{ &hf_afs_bos_host, { "Host", "afs.bos.host", +{ &hf_afs_bos_host, { "Host", "afs.bos.host", FT_STRING, BASE_HEX, 0, 0, "Host", HFILL }}, -{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime", +{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "New Time", HFILL }}, -{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime", +{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Backup Time", HFILL }}, -{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime", +{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Old Time", HFILL }}, -{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime", +{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Key Modification Time", HFILL }}, -{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum", +{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum", FT_UINT32, BASE_DEC, 0, 0, "Key Checksum", HFILL }}, -{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2", +{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2", FT_UINT32, BASE_DEC, 0, 0, "Key Spare 2", HFILL }}, /* KAUTH Server Fields */ -{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode", +{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ", +{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ", FT_STRING, BASE_HEX, 0, 0, "Principal", HFILL }}, -{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm", +{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm", FT_STRING, BASE_HEX, 0, 0, "Realm", HFILL }}, -{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain", +{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain", FT_STRING, BASE_HEX, 0, 0, "Domain", HFILL }}, -{ &hf_afs_kauth_name, { "Name", "afs.kauth.name", +{ &hf_afs_kauth_name, { "Name", "afs.kauth.name", FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }}, -{ &hf_afs_kauth_data, { "Data", "afs.kauth.data", +{ &hf_afs_kauth_data, { "Data", "afs.kauth.data", FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }}, -{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno", +{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno", FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }}, /* VOL Server Fields */ -{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode", +{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id", +{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id", FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }}, -{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count", +{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count", FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }}, -{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name", +{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name", FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }}, /* VLDB Server Fields */ -{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode", +{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type", +{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type", FT_UINT32, BASE_HEX, VALS(volume_types), 0, "Volume Type", HFILL }}, -{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id", +{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id", FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }}, -{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump", +{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump", FT_UINT32, BASE_DEC, 0, 0, "Bumped Volume ID", HFILL }}, -{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index", +{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index", FT_UINT32, BASE_DEC, 0, 0, "Volume Index", HFILL }}, -{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count", +{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count", FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }}, -{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers", +{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers", FT_UINT32, BASE_DEC, 0, 0, "Number of Servers", HFILL }}, -{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex", +{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex", FT_UINT32, BASE_DEC, 0, 0, "Next Volume Index", HFILL }}, -{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol", +{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol", FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }}, -{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol", +{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol", FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }}, -{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol", +{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol", FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }}, -{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol", +{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol", FT_UINT32, BASE_DEC, 0, 0, "Clone Volume ID", HFILL }}, -{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name", +{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name", FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }}, -{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition", +{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition", FT_STRING, BASE_HEX, 0, 0, "Partition", HFILL }}, -{ &hf_afs_vldb_server, { "Server", "afs.vldb.server", +{ &hf_afs_vldb_server, { "Server", "afs.vldb.server", FT_IPv4, BASE_HEX, 0, 0, "Server", HFILL }}, -{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid", +{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid", FT_BYTES, BASE_HEX, 0, 0, "Server UUID", HFILL }}, -{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq", +{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq", FT_UINT32, BASE_HEX, 0, 0, "Server Unique Address", HFILL }}, -{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags", +{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags", FT_UINT32, BASE_HEX, 0, 0, "Server Flags", HFILL }}, -{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip", +{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip", FT_IPv4, BASE_HEX, 0, 0, "Server IP", HFILL }}, -{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags", +{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags", FT_UINT32, BASE_HEX, 0, 0, "Flags", HFILL }}, - -{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists", + +{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists", FT_BOOLEAN, 32, 0, 0x1000, "Read/Write Exists", HFILL }}, -{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists", +{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists", FT_BOOLEAN, 32, 0, 0x2000, "Read-Only Exists", HFILL }}, -{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists", +{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists", FT_BOOLEAN, 32, 0, 0x4000, "Backup Exists", HFILL }}, -{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset", +{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset", FT_BOOLEAN, 32, 0, 0x8000, "DFS Fileset", HFILL }}, - -{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1", + +{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1", FT_UINT32, BASE_DEC, 0, 0, "Spare 1", HFILL }}, -{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2", +{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2", FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }}, -{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3", +{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3", FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }}, -{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4", +{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4", FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }}, -{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5", +{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5", FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }}, -{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6", +{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6", FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }}, -{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7", +{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7", FT_UINT32, BASE_DEC, 0, 0, "Spare 7", HFILL }}, -{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8", +{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8", FT_UINT32, BASE_DEC, 0, 0, "Spare 8", HFILL }}, -{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9", +{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9", FT_UINT32, BASE_DEC, 0, 0, "Spare 9", HFILL }}, /* BACKUP Server Fields */ -{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode", +{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, /* CB Server Fields */ -{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode", +{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version", +{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version", FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }}, -{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires", +{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Expires", HFILL }}, -{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type", +{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type", FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }}, -{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume", +{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume", FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }}, -{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode", +{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode", FT_UINT32, BASE_DEC, 0, 0, "File ID (VNode)", HFILL }}, -{ &hf_afs_cb_fid_uniqifier, { "FileID (Uniqifier)", "afs.cb.fid.uniq", +{ &hf_afs_cb_fid_uniqifier, { "FileID (Uniqifier)", "afs.cb.fid.uniq", FT_UINT32, BASE_DEC, 0, 0, "File ID (Uniqifier)", HFILL }}, /* PROT Server Fields */ -{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode", +{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_prot_name, { "Name", "afs.prot.name", +{ &hf_afs_prot_name, { "Name", "afs.prot.name", FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }}, -{ &hf_afs_prot_id, { "ID", "afs.prot.id", +{ &hf_afs_prot_id, { "ID", "afs.prot.id", FT_UINT32, BASE_DEC, 0, 0, "ID", HFILL }}, -{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid", +{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid", FT_UINT32, BASE_DEC, 0, 0, "Old ID", HFILL }}, -{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid", +{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid", FT_UINT32, BASE_DEC, 0, 0, "New ID", HFILL }}, -{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid", +{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid", FT_UINT32, BASE_DEC, 0, 0, "Group ID", HFILL }}, -{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid", +{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid", FT_UINT32, BASE_DEC, 0, 0, "User ID", HFILL }}, -{ &hf_afs_prot_count, { "Count", "afs.prot.count", +{ &hf_afs_prot_count, { "Count", "afs.prot.count", FT_UINT32, BASE_DEC, 0, 0, "Count", HFILL }}, -{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid", +{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid", FT_UINT32, BASE_DEC, 0, 0, "Maximum Group ID", HFILL }}, -{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid", +{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid", FT_UINT32, BASE_DEC, 0, 0, "Maximum User ID", HFILL }}, -{ &hf_afs_prot_pos, { "Position", "afs.prot.pos", +{ &hf_afs_prot_pos, { "Position", "afs.prot.pos", FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }}, -{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag", +{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag", FT_UINT32, BASE_HEX, 0, 0, "Flag", HFILL }}, /* UBIK Fields */ -{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode", +{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode", FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }}, -{ &hf_afs_ubik_state, { "State", "afs.ubik.state", +{ &hf_afs_ubik_state, { "State", "afs.ubik.state", FT_UINT32, BASE_HEX, 0, 0, "State", HFILL }}, -{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch", +{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Epoch", HFILL }}, -{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter", +{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter", FT_UINT32, BASE_DEC, 0, 0, "Counter", HFILL }}, -{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart", +{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Vote Started", HFILL }}, -{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend", +{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend", FT_ABSOLUTE_TIME, BASE_DEC, 0, 0, "Vote Ends", HFILL }}, -{ &hf_afs_ubik_file, { "File", "afs.ubik.file", +{ &hf_afs_ubik_file, { "File", "afs.ubik.file", FT_UINT32, BASE_DEC, 0, 0, "File", HFILL }}, -{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position", +{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position", FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }}, -{ &hf_afs_ubik_length, { "Length", "afs.ubik.length", +{ &hf_afs_ubik_length, { "Length", "afs.ubik.length", FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }}, -{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype", +{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype", FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, "Lock Type", HFILL }}, -{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype", +{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype", FT_UINT32, BASE_HEX, 0, 0, "Vote Type", HFILL }}, -{ &hf_afs_ubik_site, { "Site", "afs.ubik.site", +{ &hf_afs_ubik_site, { "Site", "afs.ubik.site", FT_IPv4, BASE_HEX, 0, 0, "Site", HFILL }}, -{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface", +{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface", FT_IPv4, BASE_HEX, 0, 0, "Interface Address", HFILL }}, -{ &hf_afs_ubik_now, { "Now", "afs.ubik.now", +{ &hf_afs_ubik_now, { "Now", "afs.ubik.now", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Now", HFILL }}, -{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime", +{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Time", HFILL }}, -{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost", +{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost", FT_IPv4, BASE_HEX, 0, 0, "Last Yes Host", HFILL }}, -{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate", +{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate", FT_UINT32, BASE_HEX, 0, 0, "Last Yes State", HFILL }}, -{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim", +{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Claim", HFILL }}, -{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost", +{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost", FT_IPv4, BASE_HEX, 0, 0, "Lowest Host", HFILL }}, -{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime", +{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Lowest Time", HFILL }}, -{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost", +{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost", FT_IPv4, BASE_HEX, 0, 0, "Sync Host", HFILL }}, -{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr", +{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr", FT_IPv4, BASE_HEX, 0, 0, "Address", HFILL }}, -{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime", +{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Time", HFILL }}, -{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime", +{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Vote Time", HFILL }}, -{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent", +{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Beacon Sent", HFILL }}, -{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote", +{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote", FT_UINT32, BASE_HEX, 0, 0, "Last Vote", HFILL }}, -{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb", +{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb", FT_UINT32, BASE_HEX, 0, 0, "Current DB", HFILL }}, -{ &hf_afs_ubik_up, { "Up", "afs.ubik.up", +{ &hf_afs_ubik_up, { "Up", "afs.ubik.up", FT_UINT32, BASE_HEX, 0, 0, "Up", HFILL }}, -{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown", +{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown", FT_UINT32, BASE_HEX, 0, 0, "Beacon Since Down", HFILL }}, -{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite", +{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite", FT_UINT32, BASE_HEX, 0, 0, "Am Sync Site", HFILL }}, -{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil", +{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Site Until", HFILL }}, -{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers", +{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers", FT_UINT32, BASE_HEX, 0, 0, "Number of Servers", HFILL }}, -{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages", +{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages", FT_UINT32, BASE_HEX, 0, 0, "Locked Pages", HFILL }}, -{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages", +{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages", FT_UINT32, BASE_HEX, 0, 0, "Write Locked Pages", HFILL }}, -{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite", +{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite", FT_UINT32, BASE_HEX, 0, 0, "Active Write", HFILL }}, -{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter", +{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter", FT_UINT32, BASE_HEX, 0, 0, "TID Counter", HFILL }}, -{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks", +{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks", FT_UINT32, BASE_HEX, 0, 0, "Any Read Locks", HFILL }}, -{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks", +{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks", FT_UINT32, BASE_HEX, 0, 0, "Any Write Locks", HFILL }}, -{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate", +{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate", FT_UINT32, BASE_HEX, 0, 0, "Recovery State", HFILL }}, -{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran", +{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran", FT_UINT32, BASE_HEX, 0, 0, "Current Transaction", HFILL }}, -{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran", +{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran", FT_UINT32, BASE_HEX, 0, 0, "Write Transaction", HFILL }}, -{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime", +{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime", FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Epoch Time", HFILL }}, -{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone", +{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone", FT_UINT32, BASE_HEX, 0, 0, "Is Clone", HFILL }}, diff --git a/packet-afs.c b/packet-afs.c index d19ad71d04..f226e29612 100644 --- a/packet-afs.c +++ b/packet-afs.c @@ -6,9 +6,9 @@ * Portions based on information retrieved from the RX definitions * in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/ * Portions based on information/specs retrieved from the OpenAFS sources at - * www.openafs.org, Copyright IBM. + * www.openafs.org, Copyright IBM. * - * $Id: packet-afs.c,v 1.48 2002/08/02 23:35:46 jmayer Exp $ + * $Id: packet-afs.c,v 1.49 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -74,43 +74,43 @@ static GMemChunk *afs_request_vals = NULL; /* * Dissector prototypes */ -static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo, +static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset); -static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); -static void dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo, +static void dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); /* @@ -215,11 +215,11 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ - conversation = conversation_new(&pinfo->src, &pinfo->dst, + conversation = conversation_new(&pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - request_key.conversation = conversation->index; + request_key.conversation = conversation->index; request_key.service = rxinfo->serviceid; request_key.callnumber = rxinfo->callnumber; @@ -381,15 +381,15 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_text(afs_tree, tvb, offset, 0, "Operation: Unknown"); } - + /* Add the subtree for this particular service */ afs_op_tree = proto_item_add_subtree(ti, ett_afs_op); - + if ( typenode != 0 ) { /* indicate the type of request */ proto_tree_add_boolean_hidden(afs_tree, typenode, tvb, offset, 0, 1); } - + /* Process the packet according to what service it is */ if ( dissector ) { (*dissector)(tvb, rxinfo, afs_op_tree, offset, opcode); @@ -431,7 +431,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * * Should this just scan the string itself, rather than using "sscanf()"? */ -static int +static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset) { int old_offset; @@ -445,12 +445,12 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs if (sscanf((char *) GETSTR, "%d %n", &pos, &n) != 1) { - /* does not matter what we return, if this fails, + /* does not matter what we return, if this fails, * we cant dissect anything else in the packet either. */ return offset; } - proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb, + proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb, offset, n, pos); offset += n; @@ -458,7 +458,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs if (sscanf((char *) GETSTR, "%d %n", &neg, &n) != 1) { return offset; } - proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb, + proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb, offset, n, neg); offset += n; @@ -466,7 +466,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs * This wacky order preserves the order used by the "fs" command */ for (i = 0; i < pos; i++) { - if (sscanf((char *) GETSTR, + if (sscanf((char *) GETSTR, "%127s %d %n", user, &acl, &n) != 2) { return offset; } @@ -474,7 +474,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs offset += n; } for (i = 0; i < neg; i++) { - if (sscanf((char *) GETSTR, + if (sscanf((char *) GETSTR, "%127s %d %n", user, &acl, &n) != 2) { return offset; } @@ -518,7 +518,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off OUT_FS_AFSFetchStatus("Status"); OUT_FS_AFSCallBack(); OUT_FS_AFSVolSync(); - break; + break; case 133: /* Store data */ case 134: /* Store ACL */ case 135: /* Store status */ @@ -554,7 +554,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off case 145: /* old release lock */ case 147: /* give up callbacks */ case 150: /* set volume status */ - case 152: /* check token */ + case 152: /* check token */ /* nothing returned */ break; case 146: /* get statistics */ @@ -578,7 +578,7 @@ dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int off break; case 155: /* bulk status */ OUT_FS_AFSBulkStats(); - SKIP(4); + SKIP(4); OUT_FS_AFSCBs(); OUT_FS_AFSVolSync(); break; @@ -625,7 +625,7 @@ dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o break; case 131: /* Fetch ACL */ OUT_FS_AFSFid("Target"); - break; + break; case 132: /* Fetch Status */ OUT_FS_AFSFid("Target"); break; diff --git a/packet-aim.c b/packet-aim.c index 83991ba44c..077b05b524 100644 --- a/packet-aim.c +++ b/packet-aim.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2000, Ralf Hoelzer <ralf@well.com> * - * $Id: packet-aim.c,v 1.16 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-aim.c,v 1.17 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -113,27 +113,27 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Not an instant messenger packet, just happened to use the same port */ return; } - + /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM"); - - if (check_col(pinfo->cinfo, COL_INFO)) + + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); /* get relevant header information */ hdr_channel = tvb_get_guint8(tvb, 1); - hdr_sequence_no = tvb_get_ntohs(tvb, 2); - hdr_data_field_length = tvb_get_ntohs(tvb, 4); + hdr_sequence_no = tvb_get_ntohs(tvb, 2); + hdr_data_field_length = tvb_get_ntohs(tvb, 4); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { - - ti = proto_tree_add_item(tree, proto_aim, tvb, 0, -1, FALSE); + + ti = proto_tree_add_item(tree, proto_aim, tvb, 0, -1, FALSE); aim_tree = proto_item_add_subtree(ti, ett_aim); - proto_tree_add_uint(aim_tree, hf_aim_cmd_start, tvb, 0, 1, '*'); + proto_tree_add_uint(aim_tree, hf_aim_cmd_start, tvb, 0, 1, '*'); proto_tree_add_uint(aim_tree, hf_aim_channel, tvb, 1, 1, hdr_channel); proto_tree_add_uint(aim_tree, hf_aim_seqno, tvb, 2, 2, hdr_sequence_no); proto_tree_add_uint(aim_tree, hf_aim_data_len, tvb, 4, 2, hdr_data_field_length); @@ -148,17 +148,17 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case CHANNEL_NEW_CONN: if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "New Connection"); break; - + /* SNAC channel. Most packets are of this type, such as messages or buddy list * management. */ case CHANNEL_SNAC_DATA: - family = tvb_get_ntohs(tvb, 6); - subtype = tvb_get_ntohs(tvb, 8); + family = tvb_get_ntohs(tvb, 6); + subtype = tvb_get_ntohs(tvb, 8); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "SNAC data"); - } + } if( tree ) { ti1 = proto_tree_add_text(aim_tree, tvb, 6, tvb_length(tvb) - 6, "FNAC"); @@ -170,7 +170,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Family: 0x%04x - Subtype: 0x%04x (unknown)", family, subtype); - + switch(family) { case FAMILY_SIGNON: @@ -182,16 +182,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Login"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname); - } + } if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname); } break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Login information reply"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Login information reply"); break; case 0x0006: buddyname_length = get_buddyname( buddyname, tvb, 19, 20 ); @@ -199,16 +199,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname); - } - + } + if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 20, buddyname_length, "Screen Name: %s", buddyname); } break; case 0x0007: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on reply"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Sign-on reply"); break; } break; @@ -217,28 +217,28 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(subtype) { case 0x0002: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Client is now online and ready for normal function"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Client is now online and ready for normal function"); break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Server is now ready for normal functions"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Server is now ready for normal functions"); break; case 0x0004: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request for new service (server will redirect client)"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request for new service (server will redirect client)"); break; case 0x0005: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Redirect response"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Redirect response"); break; case 0x0006: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rate Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rate Information"); break; case 0x0007: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate information response"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate information response"); break; case 0x0008: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate Information Response Ack"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rate Information Response Ack"); break; case 0x0016: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "No-op"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "No-op"); break; } break; @@ -247,23 +247,23 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(subtype) { case 0x0001: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Buddylist - Error"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Buddylist - Error"); break; case 0x0002: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights information"); break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights information"); break; case 0x0004: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Add to Buddylist"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Add to Buddylist"); break; case 0x0005: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Remove from Buddylist"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Remove from Buddylist"); break; case 0x000b: @@ -272,11 +272,11 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Oncoming Buddy"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname); - } - + } + if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname); } break; @@ -288,11 +288,11 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Offgoing Buddy"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", buddyname); - } - + } + if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 17, buddyname_length, "Screen Name: %s", buddyname); } @@ -304,28 +304,28 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(subtype) { case 0x0001: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Location - Error"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Location - Error"); break; case 0x0002: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request Rights Information"); break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Rights Information"); break; case 0x0004: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Set User Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Set User Information"); break; case 0x0005: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request User Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Request User Information"); break; case 0x0006: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "User Information"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "User Information"); break; case 0x0007: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Subrequest"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Subrequest"); break; case 0x0008: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Notification"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Watcher Notification"); break; } break; @@ -334,13 +334,13 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(subtype) { case 0x0001: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisements - Error"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisements - Error"); break; case 0x0002: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement Request"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement Request"); break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement data (GIF)"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Advertisement data (GIF)"); break; } break; @@ -349,13 +349,13 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(subtype) { case 0x0001: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search - Error (could be: not found)"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search - Error (could be: not found)"); break; case 0x0002: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search for Screen Name by e-mail"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Search for Screen Name by e-mail"); break; case 0x0003: - if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Screen Name Search Result"); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Screen Name Search Result"); break; } break; @@ -370,23 +370,23 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Chat Message "); col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg); - } + } break; - + case 0x006: /* channel message to client */ buddyname_length = get_buddyname( buddyname, tvb, 30, 31 ); get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length ); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Chat Message "); col_append_fstr(pinfo->cinfo, COL_INFO, "from: %s", buddyname); col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg); - } - + } + if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 31, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 31, buddyname_length, "Screen Name: %s", buddyname); } break; } @@ -400,16 +400,16 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) buddyname_length = get_buddyname( buddyname, tvb, 26, 27 ); get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) - 36 - buddyname_length ); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Message "); col_append_fstr(pinfo->cinfo, COL_INFO, "to: %s", buddyname); col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg); - } + } if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname); } break; @@ -424,38 +424,38 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, " from: %s", buddyname); col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg); - } - + } + if( tree ) { - proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname); + proto_tree_add_text(aim_tree_fnac, tvb, 27, buddyname_length, "Screen Name: %s", buddyname); } break; } break; } - - + + break; - + case CHANNEL_FLAP_ERR: if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "FLAP error"); - } + } break; - + case CHANNEL_CLOSE_CONN: if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Close Connection"); - } + } break; - + default: if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown Channel: %d", hdr_channel ); - } + } break; } @@ -467,7 +467,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static int get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_offset) { guint8 buddyname_length; - + buddyname_length = tvb_get_guint8(tvb, len_offset); if(buddyname_length > MAX_BUDDYNAME_LENGTH ) buddyname_length = MAX_BUDDYNAME_LENGTH; @@ -513,20 +513,20 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len new_offset++; new_length--; } - + /* set offset and length of message to after the first HTML tag */ msg_offset = new_offset; msg_length = new_length; max = msg_length - 1; tagchars = 0; - + /* find the rest of the message until either a </html> is reached or the end of the frame. * All other HTML tags are stripped to display only the raw message (printable characters) */ while( (c < max) && (tagchars < 7) ) { j = tvb_get_guint8(tvb, msg_offset+c); - + /* make sure this is an HTML tag by checking the order of the chars */ if( ( (j == '<') && (tagchars == 0) ) || ( (j == '/') && (tagchars == 1) ) || @@ -542,7 +542,7 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len #ifdef STRIP_TAGS if( j == '<' ) bracket = TRUE; - if( j == '>' ) bracket = FALSE; + if( j == '>' ) bracket = FALSE; if( (isprint(j) ) && (bracket == FALSE) && (j != '>')) #else if( isprint(j) ) @@ -554,12 +554,12 @@ static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_len c++; } } - + /* Register the protocol with Ethereal */ -void +void proto_register_aim(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { diff --git a/packet-ajp13.c b/packet-ajp13.c index b35ff852f5..f20069b7af 100644 --- a/packet-ajp13.c +++ b/packet-ajp13.c @@ -2,7 +2,7 @@ * Routines for AJP13 dissection * Copyright 2002, Christopher K. St. John <cks@distributopia.com> * - * $Id: packet-ajp13.c,v 1.7 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-ajp13.c,v 1.8 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -77,7 +77,7 @@ * * Since AJP13 is a TCP/IP based protocol, writing a dissector for it * requires addressing several other issues: - * + * * 1) TCP/IP segments can get retransmitted or be sent out of * order. Users don't normally care, because the low-level kernel * networking code takes care of reassembling them properly. But we're @@ -236,7 +236,7 @@ typedef struct ajp13_frame_data { * * XXX - is there a tvbuff routine to handle this? */ -static guint16 +static guint16 get_nstring(tvbuff_t *tvb, gint offset, guint8* cbuf, size_t cbuflen) { guint16 len; @@ -331,7 +331,7 @@ display_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ajp13_tree) /* dangerous assumption that we can just %s out raw bytes */ if(check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " %s", rsmsg_bytes); - + /* NUMBER OF HEADERS */ nhdr = tvb_get_ntohs(tvb, pos); @@ -436,7 +436,7 @@ display_req_body(tvbuff_t *tvb, proto_tree *ajp13_tree) */ proto_tree_add_item(ajp13_tree, hf_ajp13_len, tvb, pos, 2, 0); pos+=2; - + /* BODY (AS STRING) */ body_len = get_nstring(tvb, pos, body_bytes, sizeof body_bytes); @@ -578,7 +578,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ajp13_tree, hf_ajp13_nhdr, tvb, pos, 2, 0); pos+=2; cd->content_length = 0; - + /* HEADERS */ for(i=0; i<nhdr; i++) { @@ -705,7 +705,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + mag = tvb_get_ntohs(tvb, 0); len = tvb_get_ntohs(tvb, 2); @@ -718,7 +718,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:Body", conv->index); else if (mag == 0x4142) col_append_fstr(pinfo->cinfo, COL_INFO, "%d:RSP:", conv->index); - else + else col_set_str(pinfo->cinfo, COL_INFO, "AJP13 Error?"); } @@ -762,7 +762,7 @@ get_ajp13_pdu_len(tvbuff_t *tvb, int offset) -/* Code to actually dissect the packets. +/* Code to actually dissect the packets. */ static void dissect_ajp13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -782,7 +782,7 @@ dissect_ajp13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_ajp13(void) -{ +{ static hf_register_info hf[] = { { &hf_ajp13_magic, { "Magic", "ajp13.magic", FT_BYTES, BASE_HEX, NULL, 0x0, "Magic Number", diff --git a/packet-aodv.c b/packet-aodv.c index 4b893eff05..1677660a4f 100644 --- a/packet-aodv.c +++ b/packet-aodv.c @@ -2,7 +2,7 @@ * Routines for AODV dissection * Copyright 2000, Erik Nordström <erik.nordstrom@it.uu.se> * - * $Id: packet-aodv.c,v 1.5 2002/08/22 07:32:22 guy Exp $ + * $Id: packet-aodv.c,v 1.6 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -122,7 +122,7 @@ static int dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti = NULL, *tj = NULL, *tk = NULL; - proto_tree *aodv_tree = NULL, *aodv_flags_tree = NULL, + proto_tree *aodv_tree = NULL, *aodv_flags_tree = NULL, *aodv_unreach_dest_tree = NULL; guint8 type; int i; @@ -131,12 +131,12 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct aodv_rerr rerr; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + /* Check the type of AODV packet. */ type = tvb_get_guint8(tvb, 0); if (type < 1 || type > 3) { @@ -145,7 +145,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ return 0; } - + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_aodv, tvb, 0, -1, "Ad hoc On-demand Distance Vector Routing Protocol, %s", @@ -168,7 +168,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rreq.dest_seqno = tvb_get_ntohl(tvb, 12); tvb_memcpy(tvb, (guint8 *)&rreq.orig_addr, 16, 4); rreq.orig_seqno = tvb_get_ntohl(tvb, 20); - + if (tree) { proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rreq_join, tvb, 1, 1, rreq.flags); proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rreq_repair, tvb, 1, 1, rreq.flags); @@ -187,18 +187,18 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(aodv_tree, hf_aodv_orig_seqno, tvb, 20, 4, rreq.orig_seqno); proto_item_append_text(ti, ", Dest IP: %s, Orig IP: %s, Id=%u", ip_to_str(tvb_get_ptr(tvb, 8, 4)), ip_to_str(tvb_get_ptr(tvb, 16, 4)), rreq.rreq_id); } - + if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s, D: %s O: %s Id=%u Hcnt=%u DSN=%u OSN=%u", - val_to_str(type, type_vals, - "Unknown AODV Packet Type (%u)"), - ip_to_str(tvb_get_ptr(tvb, 8, 4)), - ip_to_str(tvb_get_ptr(tvb, 16, 4)), - rreq.rreq_id, - rreq.hop_count, - rreq.dest_seqno, + col_add_fstr(pinfo->cinfo, COL_INFO, "%s, D: %s O: %s Id=%u Hcnt=%u DSN=%u OSN=%u", + val_to_str(type, type_vals, + "Unknown AODV Packet Type (%u)"), + ip_to_str(tvb_get_ptr(tvb, 8, 4)), + ip_to_str(tvb_get_ptr(tvb, 16, 4)), + rreq.rreq_id, + rreq.hop_count, + rreq.dest_seqno, rreq.orig_seqno); - + break; case RREP: rrep.type = type; @@ -227,27 +227,27 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s D: %s O: %s Hcnt=%u DSN=%u Lifetime=%u", - val_to_str(type, type_vals, - "Unknown AODV Packet Type (%u)"), - ip_to_str(tvb_get_ptr(tvb, 4, 4)), - ip_to_str(tvb_get_ptr(tvb, 12, 4)), - rrep.hop_count, - rrep.dest_seqno, + col_add_fstr(pinfo->cinfo, COL_INFO, "%s D: %s O: %s Hcnt=%u DSN=%u Lifetime=%u", + val_to_str(type, type_vals, + "Unknown AODV Packet Type (%u)"), + ip_to_str(tvb_get_ptr(tvb, 4, 4)), + ip_to_str(tvb_get_ptr(tvb, 12, 4)), + rrep.hop_count, + rrep.dest_seqno, rrep.lifetime); break; case RERR: rerr.type = type; rerr.flags = tvb_get_guint8(tvb, 1); rerr.dest_count = tvb_get_guint8(tvb, 3); - + if (tree) { proto_tree_add_boolean(aodv_flags_tree, hf_aodv_flags_rerr_nodelete, tvb, 1, 1, rerr.flags); if (rerr.flags & RERR_NODEL) proto_item_append_text(tj, " N"); proto_tree_add_uint(aodv_tree, hf_aodv_destcount, tvb, 3, 1, rerr.dest_count); tk = proto_tree_add_text(aodv_tree, tvb, 4, 8*rerr.dest_count, "Unreachable Destinations:"); - + aodv_unreach_dest_tree = proto_item_add_subtree(tk, ett_aodv_unreach_dest); for (i = 0; i < rerr.dest_count; i++) { tvb_memcpy(tvb, (guint8 *)&rerr.dest_addr, 4+8*i, 4); @@ -258,9 +258,9 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s, Dest Count=%u", - val_to_str(type, type_vals, - "Unknown AODV Packet Type (%u)"), + col_add_fstr(pinfo->cinfo, COL_INFO, "%s, Dest Count=%u", + val_to_str(type, type_vals, + "Unknown AODV Packet Type (%u)"), rerr.dest_count); break; default: @@ -276,101 +276,101 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_aodv(void) -{ +{ static hf_register_info hf[] = { { &hf_aodv_type, { "Type", "aodv.type", - FT_UINT8, BASE_DEC, VALS(type_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(type_vals), 0x0, "AODV packet type", HFILL } }, { &hf_aodv_flags, { "Flags", "aodv.flags", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "Flags", HFILL } }, { &hf_aodv_flags_rreq_join, { "RREQ Join", "aodv.flags.rreq_join", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN, "", HFILL } }, { &hf_aodv_flags_rreq_repair, { "RREQ Repair", "aodv.flags.rreq_repair", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP, "", HFILL } }, { &hf_aodv_flags_rreq_gratuitous, { "RREQ Gratuitous", "aodv.flags.rreq_gratuitous", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRAT, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRAT, "", HFILL } }, { &hf_aodv_flags_rrep_repair, { "RREP Repair", "aodv.flags.rrep_repair", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP, "", HFILL } }, { &hf_aodv_flags_rrep_ack, { "RREP Acknowledgement", "aodv.flags.rrep_ack", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK, "", HFILL } }, { &hf_aodv_flags_rerr_nodelete, { "RERR No Delete", "aodv.flags.rerr_nodelete", - FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL, + FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL, "", HFILL } }, { &hf_aodv_prefix_sz, { "Prefix Size", "aodv.prefix_sz", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Prefix_size", HFILL } }, { &hf_aodv_hopcount, { "Hop Count", "aodv.hopcount", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Hop Count", HFILL } }, { &hf_aodv_rreq_id, { "RREQ Id", "aodv.rreq_id", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "RREQ Id", HFILL } }, { &hf_aodv_dest_ip, { "Destination IP", "aodv.dest_ip", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_DEC, NULL, 0x0, "Destination IP Address", HFILL } }, { &hf_aodv_dest_seqno, { "Destination Sequence Number", "aodv.dest_seqno", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "Destination Sequence Number", HFILL } }, { &hf_aodv_orig_ip, { "Originator IP", "aodv.orig_ip", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_DEC, NULL, 0x0, "Originator IP Address", HFILL } }, { &hf_aodv_orig_seqno, { "Originator Sequence Number", "aodv.orig_seqno", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "Originator Sequence Number", HFILL } }, { &hf_aodv_lifetime, { "Lifetime", "aodv.lifetime", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "Lifetime", HFILL } }, { &hf_aodv_destcount, { "Destination Count", "aodv.destcount", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Unreachable Destinations Count", HFILL } }, { &hf_aodv_unreach_dest_ip, { "Unreachable Destination IP", "aodv.unreach_dest_ip", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_DEC, NULL, 0x0, "Unreachable Destination IP Address", HFILL } }, { &hf_aodv_unreach_dest_seqno, { "Unreachable Destination Sequence Number", "aodv.unreach_dest_seqno", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "Unreachable Destination Sequence Number", HFILL } }, }; diff --git a/packet-aodv6.c b/packet-aodv6.c index 6f8f399580..0698f1f152 100644 --- a/packet-aodv6.c +++ b/packet-aodv6.c @@ -3,7 +3,7 @@ * Copyright 2002, Antti J. Tuominen <ajtuomin@tml.hut.fi> * Loosely based on packet-aodv.c. * - * $Id: packet-aodv6.c,v 1.4 2002/08/22 07:32:22 guy Exp $ + * $Id: packet-aodv6.c,v 1.5 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -235,7 +235,7 @@ dissect_aodv6(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) rerr_t rerr; /* Make entries in Protocol column and Info column on summary - * display + * display */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV6"); diff --git a/packet-arp.c b/packet-arp.c index 20139cb9f2..2093764e1c 100644 --- a/packet-arp.c +++ b/packet-arp.c @@ -1,22 +1,22 @@ /* packet-arp.c * Routines for ARP packet disassembly * - * $Id: packet-arp.c,v 1.52 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-arp.c,v 1.53 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -446,7 +446,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tot_len = MIN_ATMARP_HEADER_SIZE + ar_shl + ar_ssl + ar_spln + ar_thl + ar_tsl + ar_tpln; - + /* Adjust the length of this tvbuff to include only the ARP datagram. Our caller may use that to determine how much of its packet was padding. */ @@ -558,7 +558,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { if ((op_str = match_strval(ar_op, atmop_vals))) ti = proto_tree_add_protocol_format(tree, proto_arp, tvb, 0, tot_len, - "ATM Address Resolution Protocol (%s)", + "ATM Address Resolution Protocol (%s)", op_str); else ti = proto_tree_add_protocol_format(tree, proto_arp, tvb, 0, tot_len, @@ -691,7 +691,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ar_op = tvb_get_ntohs(tvb, AR_OP); tot_len = MIN_ARP_HEADER_SIZE + ar_hln*2 + ar_pln*2; - + /* Adjust the length of this tvbuff to include only the ARP datagram. Our caller may use that to determine how much of its packet was padding. */ @@ -702,7 +702,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) spa_offset = sha_offset + ar_hln; tha_offset = spa_offset + ar_pln; tpa_offset = tha_offset + ar_hln; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { switch (ar_op) { @@ -772,7 +772,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)&ip, spa_offset, sizeof(ip)); add_ether_byip(ip, tvb_get_ptr(tvb, sha_offset, 6)); - + if (ar_op == ARPOP_REQUEST) { /* Add target address *if* the target MAC address isn't a broadcast address. */ @@ -828,7 +828,7 @@ proto_register_arp(void) static hf_register_info hf[] = { { &hf_arp_hard_type, - { "Hardware type", "arp.hw.type", + { "Hardware type", "arp.hw.type", FT_UINT16, BASE_HEX, VALS(hrd_vals), 0x0, "", HFILL }}, diff --git a/packet-arp.h b/packet-arp.h index 6e93f52d65..b20bb48e16 100644 --- a/packet-arp.h +++ b/packet-arp.h @@ -2,23 +2,23 @@ * Definitions of routines for ARP packet disassembly that are used * elsewhere * - * $Id: packet-arp.h,v 1.5 2001/03/13 21:34:23 gram Exp $ + * $Id: packet-arp.h,v 1.6 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-asap.c b/packet-asap.c index e6b2f0eac3..efc5663d5c 100644 --- a/packet-asap.c +++ b/packet-asap.c @@ -6,24 +6,24 @@ * * Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-asap.c,v 1.4 2002/07/08 21:09:32 guy Exp $ + * $Id: packet-asap.c,v 1.5 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -80,7 +80,7 @@ dissect_parameters(tvbuff_t *, proto_tree *); /* Helper functions */ -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -112,7 +112,7 @@ dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *c length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); cause_info_length = length - CAUSE_HEADER_LENGTH; if (cause_info_length > 0) - proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, + proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, tvb_get_ptr(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length)); proto_item_set_text(cause_item, "Error cause with code %u and %u byte%s information", code, cause_info_length, plurality(cause_info_length, "", "s")); } @@ -147,10 +147,10 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, total_length, "BAD ERROR CAUSE"); cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause); - + proto_tree_add_uint(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, code); proto_tree_add_uint(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, length); - + switch(code) { default: dissect_unknown_cause(cause_tvb, cause_tree, cause_item); @@ -174,7 +174,7 @@ dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree) padding_length = nr_of_padding_bytes(length); total_length = length + padding_length; error_cause_tvb = tvb_new_subset(error_causes_tvb, offset , total_length, total_length); - dissect_error_cause(error_cause_tvb, parameter_tree); + dissect_error_cause(error_cause_tvb, parameter_tree); offset += total_length; } } @@ -198,8 +198,8 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot { guint32 ipv4_address; - tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH); - proto_tree_add_ipv4(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address); + tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH); + proto_tree_add_ipv4(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address); proto_item_set_text(parameter_item, "IPV4 address parameter: %s", ip_to_str((const guint8 *)&ipv4_address)); } @@ -210,11 +210,11 @@ static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 *ip6_address_ptr; - + ip6_address_ptr = (guint8 *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); proto_tree_add_ipv6(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, (const guint8 *)ip6_address_ptr); - + proto_item_set_text(parameter_item, "IPV6 address parameter: %s", ip6_to_str((struct e_in6_addr *)ip6_address_ptr)); } @@ -226,20 +226,20 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot static void dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ tvbuff_t *parameters_tvb; guint16 port, reserved; - + port = tvb_get_ntohs(parameter_tvb, SCTP_PORT_OFFSET); reserved = tvb_get_ntohs(parameter_tvb, SCTP_RESERVED_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_sctp_port, parameter_tvb, SCTP_PORT_OFFSET, SCTP_PORT_LENGTH, port); proto_tree_add_uint(parameter_tree, hf_sctp_reserved, parameter_tvb, SCTP_RESERVED_OFFSET, SCTP_RESERVED_LENGTH, reserved); - + proto_item_set_text(parameter_item, "SCTP transport parameter"); parameters_tvb = tvb_new_subset(parameter_tvb, SCTP_ADDRESS_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, parameter_tree); + dissect_parameters(parameters_tvb, parameter_tree); } #define TCP_PORT_LENGTH 2 @@ -250,20 +250,20 @@ dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ static void dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ tvbuff_t *parameters_tvb; guint16 port, reserved; - + port = tvb_get_ntohs(parameter_tvb, TCP_PORT_OFFSET); reserved = tvb_get_ntohs(parameter_tvb, TCP_RESERVED_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_tcp_port, parameter_tvb, TCP_PORT_OFFSET, TCP_PORT_LENGTH, port); proto_tree_add_uint(parameter_tree, hf_tcp_reserved, parameter_tvb, TCP_RESERVED_OFFSET, TCP_RESERVED_LENGTH, reserved); - + proto_item_set_text(parameter_item, "TCP transport parameter"); parameters_tvb = tvb_new_subset(parameter_tvb, TCP_ADDRESS_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, parameter_tree); + dissect_parameters(parameters_tvb, parameter_tree); } #define UDP_PORT_LENGTH 2 @@ -274,20 +274,20 @@ dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t static void dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ tvbuff_t *parameters_tvb; guint16 port, reserved; - + port = tvb_get_ntohs(parameter_tvb, UDP_PORT_OFFSET); reserved = tvb_get_ntohs(parameter_tvb, UDP_RESERVED_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_udp_port, parameter_tvb, UDP_PORT_OFFSET, UDP_PORT_LENGTH, port); proto_tree_add_uint(parameter_tree, hf_udp_reserved, parameter_tvb, UDP_RESERVED_OFFSET, UDP_RESERVED_LENGTH, reserved); - + proto_item_set_text(parameter_item, "UDP transport parameter"); parameters_tvb = tvb_new_subset(parameter_tvb, UDP_ADDRESS_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, parameter_tree); + dissect_parameters(parameters_tvb, parameter_tree); } #define POLICY_TYPE_LENGTH 1 @@ -310,10 +310,10 @@ static const value_string policy_type_values[] = { static void dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 policy_type; gint32 policy_value; - + policy_type = tvb_get_guint8(parameter_tvb, POLICY_TYPE_OFFSET); policy_value = tvb_get_ntoh24(parameter_tvb, POLICY_VALUE_OFFSET); proto_tree_add_uint(parameter_tree, hf_policy_type, parameter_tvb, POLICY_TYPE_OFFSET, POLICY_TYPE_LENGTH, policy_type); @@ -332,7 +332,7 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre char *handle_ptr; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + handle_length = length - PARAMETER_HEADER_LENGTH; handle_ptr = (char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length); proto_tree_add_bytes(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, handle_ptr); @@ -354,17 +354,17 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr tvbuff_t *parameters_tvb; guint32 pe_identifier, home_enrp_identifier; gint32 reg_life; - + pe_identifier = tvb_get_ntohl(parameter_tvb, PE_PE_IDENTIFIER_OFFSET); home_enrp_identifier = tvb_get_ntohl(parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET); reg_life = tvb_get_ntohl(parameter_tvb, REGISTRATION_LIFE_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_pe_pe_identifier, parameter_tvb, PE_PE_IDENTIFIER_OFFSET, PE_PE_IDENTIFIER_LENGTH, pe_identifier); proto_tree_add_uint(parameter_tree, hf_home_enrp_id, parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET, HOME_ENRP_INDENTIFIER_LENGTH, home_enrp_identifier); proto_tree_add_int(parameter_tree, hf_reg_life, parameter_tvb, REGISTRATION_LIFE_OFFSET, REGISTRATION_LIFE_LENGTH, reg_life); parameters_tvb = tvb_new_subset(parameter_tvb, USER_TRANSPORT_PARAMETER_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, parameter_tree); + dissect_parameters(parameters_tvb, parameter_tree); proto_item_set_text(parameter_item, "Pool element"); } @@ -381,28 +381,28 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr static void dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ tvbuff_t *parameters_tvb; guint32 server_identifier, reserved; server_identifier = tvb_get_ntohl(parameter_tvb, SERVER_ID_OFFSET); reserved = tvb_get_ntohl(parameter_tvb, RESERVED_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_server_identifier, parameter_tvb, SERVER_ID_OFFSET, SERVER_ID_LENGTH, server_identifier); proto_tree_add_boolean(parameter_tree, hf_m_bit, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); proto_tree_add_uint(parameter_tree, hf_reserved, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); - + proto_item_set_text(parameter_item, "Server information"); parameters_tvb = tvb_new_subset(parameter_tvb, SERVER_TRANSPORT_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, parameter_tree); + dissect_parameters(parameters_tvb, parameter_tree); } #define ERROR_CAUSES_OFFSET PARAMETER_VALUE_OFFSET static void dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ tvbuff_t *error_causes_tvb; error_causes_tvb = tvb_new_subset(parameter_tvb, ERROR_CAUSES_OFFSET, -1,-1); @@ -414,12 +414,12 @@ dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter static void dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 cookie_length; - + cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if (cookie_length > 0) - proto_tree_add_bytes(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, + proto_tree_add_bytes(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, tvb_get_ptr(parameter_tvb, COOKIE_OFFSET, cookie_length)); proto_item_set_text(parameter_item, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s")); } @@ -429,9 +429,9 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr static void dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint32 pe_identifer; - + pe_identifer = tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET); proto_tree_add_uint(parameter_tree, hf_pe_identifier, parameter_tvb, PE_IDENTIFIER_OFFSET, PE_IDENTIFIER_LENGTH, pe_identifer); proto_item_set_text(parameter_item, "PE identifier: 0x%x", pe_identifer); @@ -441,14 +441,14 @@ static void dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 type, length, parameter_value_length; - + type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + parameter_value_length = length - PARAMETER_HEADER_LENGTH; if (parameter_value_length > 0) - proto_tree_add_bytes(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, + proto_tree_add_bytes(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); proto_item_set_text(parameter_item, "Parameter with type %u and %u byte%s value", type, parameter_value_length, plurality(parameter_value_length, "", "s")); @@ -548,7 +548,7 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, + proto_tree_add_bytes(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } @@ -568,7 +568,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree) total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - dissect_asap_parameter(parameter_tvb, tree); + dissect_asap_parameter(parameter_tvb, tree); /* get rid of the handled parameter */ offset += total_length; } @@ -621,7 +621,7 @@ dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap tvbuff_t *parameters_tvb; guint8 type, flags; guint16 length; - + type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET); flags = tvb_get_guint8(message_tvb, MESSAGE_FLAGS_OFFSET); length = tvb_get_ntohs (message_tvb, MESSAGE_LENGTH_OFFSET); @@ -633,9 +633,9 @@ dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap if (asap_tree) { proto_tree_add_uint(asap_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, type); proto_tree_add_uint(asap_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, flags); - proto_tree_add_uint(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length); + proto_tree_add_uint(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length); parameters_tvb = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1); - dissect_parameters(parameters_tvb, asap_tree); + dissect_parameters(parameters_tvb, asap_tree); } } @@ -646,9 +646,9 @@ dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *asap_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASAP"); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -678,7 +678,7 @@ proto_register_asap(void) { "Flags", "asap.message_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_message_length, { "Length", "asap.message_length", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -738,7 +738,7 @@ proto_register_asap(void) { "Port", "asap.sctp_transport.port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sctp_reserved, { "Reserved", "asap.sctp_transport.reserved", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -778,7 +778,7 @@ proto_register_asap(void) { "Pool handle", "asap.pool_handle.pool_handle", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_pe_pe_identifier, { "PE identifier", "asap.pool_element.pe_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, @@ -788,7 +788,7 @@ proto_register_asap(void) { "Home ENRP server identifier", "asap.pool_element.home_enrp_server_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_reg_life, { "Registration life", "asap.pool_element.registration_life", FT_INT32, BASE_DEC, NULL, 0x0, @@ -820,14 +820,14 @@ proto_register_asap(void) "", HFILL } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_asap, &ett_asap_parameter, &ett_asap_cause, }; - + /* Register the protocol name and description */ proto_asap = proto_register_protocol("Aggregate Server Access Protocol", "ASAP", "asap"); @@ -841,7 +841,7 @@ void proto_reg_handoff_asap(void) { dissector_handle_t asap_handle; - + asap_handle = create_dissector_handle(dissect_asap, proto_asap); dissector_add("sctp.ppi", ASAP_PAYLOAD_PROTO_ID, asap_handle); } diff --git a/packet-ascend.c b/packet-ascend.c index 700ba9025b..56d4412512 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.31 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-ascend.c,v 1.32 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -84,16 +84,16 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_protocol_format(tree, proto_ascend, tvb, 0, 0, "Lucent/Ascend packet trace"); fh_tree = proto_item_add_subtree(ti, ett_raw); - proto_tree_add_uint(fh_tree, hf_link_type, tvb, 0, 0, + proto_tree_add_uint(fh_tree, hf_link_type, tvb, 0, 0, pseudo_header->ascend.type); if (pseudo_header->ascend.type == ASCEND_PFX_WDD) { - proto_tree_add_string(fh_tree, hf_called_number, tvb, 0, 0, + proto_tree_add_string(fh_tree, hf_called_number, tvb, 0, 0, pseudo_header->ascend.call_num); proto_tree_add_uint(fh_tree, hf_chunk, tvb, 0, 0, pseudo_header->ascend.chunk); proto_tree_add_uint_hidden(fh_tree, hf_session_id, tvb, 0, 0, 0); } else { /* It's wandsession data */ - proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0, + proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0, pseudo_header->ascend.user); proto_tree_add_uint(fh_tree, hf_session_id, tvb, 0, 0, pseudo_header->ascend.sess); diff --git a/packet-atalk.c b/packet-atalk.c index 0410572dcb..bb7f103d66 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -2,7 +2,7 @@ * Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP, * RTMP. * - * $Id: packet-atalk.c,v 1.80 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-atalk.c,v 1.81 2002/08/28 21:00:07 jmayer Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -80,10 +80,10 @@ static int hf_ddp_type = -1; #define ATP_MAXDATA (578+4) /* maximum ATP data size */ #define ATP_BUFSIZ 587 /* maximum packet size */ #define ATP_HDRSIZE 5 /* includes DDP type field */ - + #define ATP_TRELMASK 0x07 /* mask all but TREL */ #define ATP_RELTIME 30 /* base release timer (in secs) */ - + #define ATP_TREL30 0x0 /* release time codes */ #define ATP_TREL1M 0x1 /* these are passed in flags of */ #define ATP_TREL2M 0x2 /* atp_sreq call, and set in the */ @@ -95,16 +95,16 @@ static int hf_ddp_type = -1; #define ATP_XO 0x20 /* (1<<5) eXactly Once mode */ #define ATP_EOM 0x10 /* (1<<4) End Of Message */ #define ATP_STS 0x08 /* (1<<3) Transaction Status */ - + /* function codes */ #define ATP_FUNCMASK (3<<6) /* mask all but function */ - + #define ATP_TREQ 1 /* (1<<6) Trans. REQuest */ #define ATP_TRESP 2 /* (2<<6) Trans. RESPonse */ #define ATP_TREL 3 /* (3<<6) Trans. RELease */ -/* ------------------------- */ +/* ------------------------- */ static dissector_handle_t asp_handle; static int proto_atp = -1; @@ -127,7 +127,7 @@ static int hf_atp_segment_multiple_tails = -1; static int hf_atp_segment_too_long_segment = -1; static int hf_atp_segment_error = -1; -/* ------------------------- */ +/* ------------------------- */ static int proto_zip = -1; static dissector_handle_t zip_atp_handle; @@ -181,7 +181,7 @@ static gint ett_zip_network_list = -1; /* -------------------------------- * from netatalk/include/atalk/ats.h */ - + #define ASPFUNC_CLOSE 1 #define ASPFUNC_CMD 2 #define ASPFUNC_STAT 3 @@ -191,7 +191,7 @@ static gint ett_zip_network_list = -1; #define ASPFUNC_WRTCONT 7 #define ASPFUNC_ATTN 8 -#define ASP_HDRSIZ 4 +#define ASP_HDRSIZ 4 #define ASPERR_OK 0x0000 #define ASPERR_BADVERS 0xfbd6 #define ASPERR_BUFSMALL 0xfbd5 @@ -256,11 +256,11 @@ typedef struct { guint8 src[4]; guint16 seq; } asp_request_key; - + typedef struct { guint8 value; /* command for asp, bitmap for atp */ } asp_request_val; - + static GHashTable *asp_request_hash = NULL; static GMemChunk *asp_request_keys = NULL; static GMemChunk *asp_request_vals = NULL; @@ -495,7 +495,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree, int hf_index) { int len; - + len = tvb_get_guint8(tvb, offset); offset++; @@ -504,7 +504,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree, char *tmp; proto_tree *item; proto_tree *subtree; - + /* * XXX - if we could do this inside the protocol tree * code, we could perhaps avoid allocating and freeing @@ -518,12 +518,12 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree, subtree = proto_item_add_subtree(item, ett_pstring); proto_tree_add_text(subtree, tvb, offset-1, 1, "Length: %d", len); proto_tree_add_text(subtree, tvb, offset, len, "Data: %s", tmp); - + g_free(tmp); } offset += len; - - return offset; + + return offset; } static void @@ -542,7 +542,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(function, rtmp_function_vals, "Unknown function (%02x)")); - + if (tree) { ti = proto_tree_add_item(tree, proto_rtmp, tvb, 0, 1, FALSE); rtmp_tree = proto_item_add_subtree(ti, ett_rtmp); @@ -575,11 +575,11 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { node = tvb_get_ntohs(tvb, offset); nodelen = 2; } - + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Net: %u Node Len: %u Node: %u", net, nodelen_bits, node); - + if (tree) { ti = proto_tree_add_item(tree, proto_rtmp, tvb, offset, -1, FALSE); rtmp_tree = proto_item_add_subtree(ti, ett_rtmp); @@ -614,10 +614,10 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tuple_tree = proto_item_add_subtree(tuple_item, ett_rtmp_tuple); if (tuple_dist & 0x80) { - proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_range_start, tvb, offset, 2, + proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_range_start, tvb, offset, 2, tuple_net); } else { - proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_net, tvb, offset, 2, + proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_net, tvb, offset, 2, tuple_net); } proto_tree_add_uint(tuple_tree, hf_rtmp_tuple_dist, tvb, offset+2, 1, @@ -627,7 +627,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* * Extended network tuple. */ - proto_tree_add_item(tuple_tree, hf_rtmp_tuple_range_end, tvb, offset+3, 2, + proto_tree_add_item(tuple_tree, hf_rtmp_tuple_range_end, tvb, offset+3, 2, FALSE); offset += 6; } else @@ -660,7 +660,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Op: %s Count: %u", val_to_str(op, nbp_op_vals, "Unknown (0x%01x)"), count); - + if (tree) { ti = proto_tree_add_item(tree, proto_nbp, tvb, offset, -1, FALSE); nbp_tree = proto_item_add_subtree(ti, ett_nbp); @@ -680,7 +680,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *node_item,*node_tree; int soffset = offset; - node_item = proto_tree_add_text(nbp_tree, tvb, offset, -1, + node_item = proto_tree_add_text(nbp_tree, tvb, offset, -1, "Node %u", i+1); node_tree = proto_item_add_subtree(node_item, ett_nbp_node); @@ -704,7 +704,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return; } -/* ----------------------------- +/* ----------------------------- ATP protocol cf. inside appletalk chap. 9 desegmentation from packet-ieee80211.c */ @@ -778,25 +778,25 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { g_hash_table_insert(atp_request_hash, new_request_key,request_val); } - /* + /* ATP_EOM is not mandatory. Some implementations don't always set it if the query is only one packet. - + So it needs to keep the number of packets asked in request. - */ + */ if (aspinfo.reply) { more_fragment = !((ATP_EOM & ctrlinfo) || (request_val && 1 == request_val->value)); frag_number = bitmap; } - + if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); - col_add_fstr(pinfo->cinfo, COL_INFO, "%s transaction %u", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s transaction %u", val_to_str(op, atp_function_vals, "Unknown (0x%01x)"),tid); - if (more_fragment) + if (more_fragment) col_append_fstr(pinfo->cinfo, COL_INFO, " [fragment]"); - } + } if (tree) { ti = proto_tree_add_item(tree, proto_atp, tvb, offset, -1, FALSE); @@ -825,7 +825,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (aspinfo.release) proto_tree_add_item(atp_tree, hf_atp_user_bytes, tvb, offset +4, 4, FALSE); - + } if (aspinfo.release) @@ -833,14 +833,14 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { save_fragmented = pinfo->fragmented; - /* FIXME + /* FIXME asp doesn't fit very well here move asp back in atp? */ if (atp_defragment && aspinfo.reply && (more_fragment || frag_number != 0)) { fragment_data *fd_head; int hdr; - + hdr = ATP_HDRSIZE -1; if (frag_number != 0) hdr += 4; /* asp header */ @@ -862,7 +862,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { atp_tree, pinfo, new_tvb); } } - else + else new_tvb = tvb_new_subset(tvb, ATP_HDRSIZE -1, -1, -1); } else { @@ -873,7 +873,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* full packet */ new_tvb = tvb_new_subset(tvb, ATP_HDRSIZE -1, -1,- 1); } - + if (new_tvb) { pinfo->private_data = &aspinfo; /* if port == 6 it's not an ASP packet but a ZIP packet */ @@ -892,9 +892,9 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } /* - copy and paste from dsi + copy and paste from dsi */ -static gint +static gint dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { proto_tree *sub_tree; @@ -911,7 +911,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (!tree) return offset; - + ti = proto_tree_add_text(tree, tvb, offset, -1, "Get Status"); tree = proto_item_add_subtree(ti, ett_asp_status); @@ -967,7 +967,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * dir_ofs += offset; } } - + ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); if (ofs) proto_tree_add_item(tree, hf_asp_server_type, tvb, ofs, 1, FALSE); @@ -984,7 +984,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * ofs += len; } } - + ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); if (ofs) { nbe = tvb_get_guint8(tvb, ofs); @@ -1013,7 +1013,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint16 net; guint8 node; guint16 port; - + ofs = adr_ofs; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "Address list: %u", nbe); @@ -1021,7 +1021,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * adr_tree = proto_item_add_subtree(ti, ett_asp_addr); for (i = 0; i < nbe; i++) { guint8 type; - + len = tvb_get_guint8(tvb, ofs); type = tvb_get_guint8(tvb, ofs +1); switch (type) { @@ -1036,9 +1036,9 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * break; case 3: /* DDP, atalk_addr_to_str want host order not network */ net = tvb_get_ntohs(tvb, ofs+2); - node = tvb_get_guint8(tvb, ofs +4); + node = tvb_get_guint8(tvb, ofs +4); port = tvb_get_guint8(tvb, ofs +5); - ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u", + ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u", net, node, port); break; case 4: /* DNS */ @@ -1049,17 +1049,17 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "dns %s", tmp); g_free(tmp); break; - } + } /* else fall to default malformed record */ default: ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknow type : %u", type); break; - } + } len -= 2; sub_tree = proto_item_add_subtree(ti,ett_asp_addr_line); proto_tree_add_item(sub_tree, hf_asp_server_addr_len, tvb, ofs, 1, FALSE); ofs++; - proto_tree_add_item(sub_tree, hf_asp_server_addr_type, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_asp_server_addr_type, tvb, ofs, 1, FALSE); ofs++; proto_tree_add_item(sub_tree, hf_asp_server_addr_value,tvb, ofs, len, FALSE); ofs += len; @@ -1082,7 +1082,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * return offset; } -/* ----------------------------- +/* ----------------------------- ASP protocol cf. inside appletalk chap. 11 */ static struct aspinfo * @@ -1103,7 +1103,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo) pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - request_key.conversation = conversation->index; + request_key.conversation = conversation->index; memcpy(request_key.src, (!aspinfo->reply)?pinfo->src.data:pinfo->dst.data, 4); request_key.seq = aspinfo->seq; @@ -1121,7 +1121,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo) request_val); } - if (!request_val) + if (!request_val) return NULL; aspinfo->command = request_val->value; @@ -1129,8 +1129,8 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo) } -static void -dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void +dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { struct aspinfo *aspinfo; int offset = 0; @@ -1138,7 +1138,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 fn; int len; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -1174,7 +1174,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(asp_tree, hf_asp_version, tvb, offset, 2, FALSE); offset += 2; - break; + break; case ASPFUNC_TICKLE: case ASPFUNC_CLOSE: proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE); @@ -1187,7 +1187,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, FALSE); offset += 2; - break; + break; case ASPFUNC_ATTN: proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE); offset++; @@ -1203,7 +1203,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; len = tvb_reported_length_remaining(tvb,offset); new_tvb = tvb_new_subset(tvb, offset,-1,len); - call_dissector(afp_handle, new_tvb, pinfo, tree); + call_dissector(afp_handle, new_tvb, pinfo, tree); break; case ASPFUNC_WRTCONT: proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, FALSE); @@ -1217,7 +1217,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(asp_tree, 4); offset += 3; len = tvb_reported_length_remaining(tvb,offset); - call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree); + call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree); break; } } @@ -1241,12 +1241,12 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, FALSE); offset += 2; - break; + break; case ASPFUNC_STAT: proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, FALSE); offset += 4; dissect_asp_reply_get_status(tvb, pinfo, asp_tree, offset); - break; + break; case ASPFUNC_CMD: case ASPFUNC_WRITE: proto_item_set_len(asp_tree, 4); @@ -1255,7 +1255,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; len = tvb_reported_length_remaining(tvb,offset); new_tvb = tvb_new_subset(tvb, offset,-1,len); - call_dissector(afp_handle, new_tvb, pinfo, tree); + call_dissector(afp_handle, new_tvb, pinfo, tree); break; case ASPFUNC_TICKLE: case ASPFUNC_WRTCONT: @@ -1266,17 +1266,17 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(asp_tree, 4); offset += 4; len = tvb_reported_length_remaining(tvb,offset); - call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree); + call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,len), pinfo, tree); break; } } } -/* ----------------------------- +/* ----------------------------- ZIP protocol cf. inside appletalk chap. 8 */ static void -dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { struct aspinfo *aspinfo; int offset = 0; @@ -1286,7 +1286,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 fn; guint16 count; guint8 len; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -1306,9 +1306,9 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(fn, zip_atp_function_vals, "Unknown (0x%01x)"), aspinfo->seq); } - if (!tree) + if (!tree) return; - + ti = proto_tree_add_item(tree, proto_zip, tvb, offset, -1, FALSE); zip_tree = proto_item_add_subtree(ti, ett_zip); @@ -1327,7 +1327,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { guint8 i; - + proto_tree_add_uint(zip_tree, hf_zip_atp_function, tvb, 0, 0, fn); switch(fn) { case 7: @@ -1335,7 +1335,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 9: proto_tree_add_item(zip_tree, hf_zip_last_flag, tvb, offset, 1, FALSE); offset++; - + proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, FALSE); offset++; count = tvb_get_ntohs(tvb, offset); @@ -1353,7 +1353,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static void -dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *zip_tree = NULL; proto_item *ti; @@ -1367,7 +1367,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 net; guint8 i; guint8 count; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -1379,9 +1379,9 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(fn, zip_function_vals, "Unknown ZIP function (%02x)")); } - if (!tree) + if (!tree) return; - + ti = proto_tree_add_item(tree, proto_zip, tvb, 0, -1, FALSE); zip_tree = proto_item_add_subtree(ti, ett_zip); @@ -1441,7 +1441,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += len +1; } break; - + case 5 : /* GetNetInfo request */ proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, FALSE); offset++; @@ -1468,7 +1468,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_get_guint8(tvb, offset); proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,FALSE); offset += len +1; - + len = tvb_get_guint8(tvb, offset); proto_tree_add_item(zip_tree, hf_zip_multicast_length,tvb, offset, 1,FALSE); offset++; @@ -1516,7 +1516,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode, if (tree) proto_tree_add_uint(ddp_tree, hf_ddp_src_socket, tvb, 3, 1, sport); type = tvb_get_guint8(tvb, 4); - + src.net = 0; src.node = snode; dst.net = 0; @@ -1529,19 +1529,19 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode, pinfo->ptype = PT_DDP; pinfo->destport = dport; pinfo->srcport = sport; - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, op_vals, "Unknown DDP protocol (%02x)")); } if (tree) { - proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb, + proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb, 4, 3, atalk_addr_to_str(&src)); - proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb, + proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb, 6, 3, atalk_addr_to_str(&dst)); proto_tree_add_uint(ddp_tree, hf_ddp_type, tvb, 4, 1, type); - } + } new_tvb = tvb_new_subset(tvb, DDP_SHORT_HEADER_SIZE, -1, -1); if (!dissector_try_port(ddp_dissector_table, type, new_tvb, pinfo, tree)) @@ -1567,7 +1567,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ddp.snet=g_ntohs(ddp.snet); ddp.sum=g_ntohs(ddp.sum); ddp.hops_len=g_ntohs(ddp.hops_len); - + src.net = ddp.snet; src.node = ddp.snode; dst.net = ddp.dnet; @@ -1584,20 +1584,20 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)")); - + if (tree) { ti = proto_tree_add_item(tree, proto_ddp, tvb, 0, DDP_HEADER_SIZE, FALSE); ddp_tree = proto_item_add_subtree(ti, ett_ddp); - proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb, + proto_tree_add_string_hidden(ddp_tree, hf_ddp_src, tvb, 4, 3, atalk_addr_to_str(&src)); - proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb, + proto_tree_add_string_hidden(ddp_tree, hf_ddp_dst, tvb, 6, 3, atalk_addr_to_str(&dst)); proto_tree_add_uint(ddp_tree, hf_ddp_hopcount, tvb, 0, 1, ddp_hops(ddp.hops_len)); - proto_tree_add_uint(ddp_tree, hf_ddp_len, tvb, 0, 2, + proto_tree_add_uint(ddp_tree, hf_ddp_len, tvb, 0, 2, ddp_len(ddp.hops_len)); proto_tree_add_uint(ddp_tree, hf_ddp_checksum, tvb, 2, 2, ddp.sum); @@ -1614,7 +1614,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(ddp_tree, hf_ddp_src_socket, tvb, 11, 1, ddp.sport); proto_tree_add_uint(ddp_tree, hf_ddp_type, tvb, 12, 1, - ddp.type); + ddp.type); } new_tvb = tvb_new_subset(tvb, DDP_HEADER_SIZE, -1, -1); @@ -1660,7 +1660,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } dnode = tvb_get_guint8(tvb, 0); - if (tree) + if (tree) proto_tree_add_uint(llap_tree, hf_llap_dst, tvb, 0, 1, dnode); snode = tvb_get_guint8(tvb, 1); if (tree) @@ -1672,7 +1672,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) proto_tree_add_uint(llap_tree, hf_llap_type, tvb, 2, 1, type); - + new_tvb = tvb_new_subset(tvb, 3, -1, -1); if (proto_is_protocol_enabled(proto_ddp)) { @@ -1717,7 +1717,7 @@ atp_init(void) G_ALLOC_AND_FREE); } -static void +static void asp_reinit( void) { @@ -1810,74 +1810,74 @@ proto_register_atalk(void) static hf_register_info hf_nbp[] = { { &hf_nbp_op, - { "Operation", "nbp.op", FT_UINT8, BASE_DEC, + { "Operation", "nbp.op", FT_UINT8, BASE_DEC, VALS(nbp_op_vals), 0xF0, "Operation", HFILL }}, { &hf_nbp_info, - { "Info", "nbp.info", FT_UINT8, BASE_HEX, + { "Info", "nbp.info", FT_UINT8, BASE_HEX, NULL, 0x0, "Info", HFILL }}, { &hf_nbp_count, - { "Count", "nbp.count", FT_UINT8, BASE_DEC, + { "Count", "nbp.count", FT_UINT8, BASE_DEC, NULL, 0x0F, "Count", HFILL }}, { &hf_nbp_node_net, - { "Network", "nbp.net", FT_UINT16, BASE_DEC, + { "Network", "nbp.net", FT_UINT16, BASE_DEC, NULL, 0x0, "Network", HFILL }}, { &hf_nbp_node_node, - { "Node", "nbp.node", FT_UINT8, BASE_DEC, + { "Node", "nbp.node", FT_UINT8, BASE_DEC, NULL, 0x0, "Node", HFILL }}, { &hf_nbp_node_port, - { "Port", "nbp.port", FT_UINT8, BASE_DEC, + { "Port", "nbp.port", FT_UINT8, BASE_DEC, NULL, 0x0, "Port", HFILL }}, { &hf_nbp_node_enum, - { "Enumerator", "nbp.enum", FT_UINT8, BASE_DEC, + { "Enumerator", "nbp.enum", FT_UINT8, BASE_DEC, NULL, 0x0, "Enumerator", HFILL }}, { &hf_nbp_node_object, - { "Object", "nbp.object", FT_STRING, BASE_DEC, + { "Object", "nbp.object", FT_STRING, BASE_DEC, NULL, 0x0, "Object", HFILL }}, { &hf_nbp_node_type, - { "Type", "nbp.type", FT_STRING, BASE_DEC, + { "Type", "nbp.type", FT_STRING, BASE_DEC, NULL, 0x0, "Type", HFILL }}, { &hf_nbp_node_zone, - { "Zone", "nbp.zone", FT_STRING, BASE_DEC, + { "Zone", "nbp.zone", FT_STRING, BASE_DEC, NULL, 0x0, "Zone", HFILL }}, { &hf_nbp_tid, - { "Transaction ID", "nbp.tid", FT_UINT8, BASE_DEC, + { "Transaction ID", "nbp.tid", FT_UINT8, BASE_DEC, NULL, 0x0, "Transaction ID", HFILL }} }; static hf_register_info hf_rtmp[] = { { &hf_rtmp_net, - { "Net", "rtmp.net", FT_UINT16, BASE_DEC, + { "Net", "rtmp.net", FT_UINT16, BASE_DEC, NULL, 0x0, "Net", HFILL }}, { &hf_rtmp_node, - { "Node", "nbp.nodeid", FT_UINT8, BASE_DEC, + { "Node", "nbp.nodeid", FT_UINT8, BASE_DEC, NULL, 0x0, "Node", HFILL }}, { &hf_rtmp_node_len, - { "Node Length", "nbp.nodeid.length", FT_UINT8, BASE_DEC, + { "Node Length", "nbp.nodeid.length", FT_UINT8, BASE_DEC, NULL, 0x0, "Node Length", HFILL }}, { &hf_rtmp_tuple_net, - { "Net", "rtmp.tuple.net", FT_UINT16, BASE_DEC, + { "Net", "rtmp.tuple.net", FT_UINT16, BASE_DEC, NULL, 0x0, "Net", HFILL }}, { &hf_rtmp_tuple_range_start, - { "Range Start", "rtmp.tuple.range_start", FT_UINT16, BASE_DEC, + { "Range Start", "rtmp.tuple.range_start", FT_UINT16, BASE_DEC, NULL, 0x0, "Range Start", HFILL }}, { &hf_rtmp_tuple_range_end, - { "Range End", "rtmp.tuple.range_end", FT_UINT16, BASE_DEC, + { "Range End", "rtmp.tuple.range_end", FT_UINT16, BASE_DEC, NULL, 0x0, "Range End", HFILL }}, { &hf_rtmp_tuple_dist, - { "Distance", "rtmp.tuple.dist", FT_UINT16, BASE_DEC, + { "Distance", "rtmp.tuple.dist", FT_UINT16, BASE_DEC, NULL, 0x0, "Distance", HFILL }}, { &hf_rtmp_function, - { "Function", "rtmp.function", FT_UINT8, BASE_DEC, + { "Function", "rtmp.function", FT_UINT8, BASE_DEC, VALS(rtmp_function_vals), 0x0, "Request Function", HFILL }} }; static hf_register_info hf_atp[] = { { &hf_atp_ctrlinfo, - { "Control info", "atp.ctrlinfo", FT_UINT8, BASE_HEX, + { "Control info", "atp.ctrlinfo", FT_UINT8, BASE_HEX, NULL, 0, "control info", HFILL }}, { &hf_atp_function, - { "Function", "atp.function", FT_UINT8, BASE_DEC, + { "Function", "atp.function", FT_UINT8, BASE_DEC, VALS(atp_function_vals), ATP_FUNCMASK, "function code", HFILL }}, @@ -1898,14 +1898,14 @@ proto_register_atalk(void) VALS(atp_trel_timer_vals), 0x07, "TRel timer", HFILL }}, { &hf_atp_bitmap, - { "Bitmap", "atp.bitmap", FT_UINT8, BASE_HEX, + { "Bitmap", "atp.bitmap", FT_UINT8, BASE_HEX, NULL, 0x0, "Bitmap or sequence number", HFILL }}, { &hf_atp_tid, - { "TID", "atp.tid", FT_UINT16, BASE_DEC, + { "TID", "atp.tid", FT_UINT16, BASE_DEC, NULL, 0x0, "Transaction id", HFILL }}, { &hf_atp_user_bytes, - { "User bytes", "atp.user_bytes", FT_UINT32, BASE_HEX, + { "User bytes", "atp.user_bytes", FT_UINT32, BASE_HEX, NULL, 0x0, "User bytes", HFILL }}, { &hf_atp_segment_overlap, @@ -1941,39 +1941,39 @@ proto_register_atalk(void) static hf_register_info hf_asp[] = { { &hf_asp_func, - { "asp function", "asp.function", FT_UINT8, BASE_DEC, + { "asp function", "asp.function", FT_UINT8, BASE_DEC, VALS(asp_func_vals), 0, "asp function", HFILL }}, { &hf_asp_error, - { "asp error", "asp.error", FT_INT32, BASE_DEC, + { "asp error", "asp.error", FT_INT32, BASE_DEC, VALS(asp_error_vals), 0, "return error code", HFILL }}, { &hf_asp_version, - { "Version", "asp.version", FT_UINT16, BASE_HEX, + { "Version", "asp.version", FT_UINT16, BASE_HEX, NULL, 0, "asp version", HFILL }}, { &hf_asp_attn_code, - { "Attn code", "asp.attn_code", FT_UINT16, BASE_HEX, + { "Attn code", "asp.attn_code", FT_UINT16, BASE_HEX, NULL, 0, "asp attention code", HFILL }}, { &hf_asp_init_error, - { "Error", "asp.init_error", FT_UINT16, BASE_DEC, + { "Error", "asp.init_error", FT_UINT16, BASE_DEC, NULL, 0, "asp init error", HFILL }}, { &hf_asp_session_id, - { "Session ID", "asp.session_id", FT_UINT8, BASE_DEC, + { "Session ID", "asp.session_id", FT_UINT8, BASE_DEC, NULL, 0, "asp session id", HFILL }}, { &hf_asp_socket, - { "Socket", "asp.socket", FT_UINT8, BASE_DEC, + { "Socket", "asp.socket", FT_UINT8, BASE_DEC, NULL, 0, "asp socket", HFILL }}, { &hf_asp_seq, - { "Sequence", "asp.seq", FT_UINT16, BASE_DEC, + { "Sequence", "asp.seq", FT_UINT16, BASE_DEC, NULL, 0, "asp sequence number", HFILL }}, { &hf_asp_size, - { "size", "asp.size", FT_UINT16, BASE_DEC, + { "size", "asp.size", FT_UINT16, BASE_DEC, NULL, 0, "asp available size for reply", HFILL }}, { &hf_asp_zero_value, @@ -2078,7 +2078,7 @@ proto_register_atalk(void) "Address value", HFILL }}, }; - + static hf_register_info hf_zip[] = { { &hf_zip_function, { "Function", "zip.function", FT_UINT8, BASE_DEC, VALS(zip_function_vals), 0x0, @@ -2150,7 +2150,7 @@ proto_register_atalk(void) "Multicast address", HFILL }}, }; - + static gint *ett[] = { &ett_llap, &ett_ddp, @@ -2168,7 +2168,7 @@ proto_register_atalk(void) &ett_asp_addr, &ett_asp_addr_line, &ett_asp_directory, - + &ett_nbp, &ett_nbp_info, &ett_nbp_node, @@ -2178,8 +2178,8 @@ proto_register_atalk(void) &ett_zip, &ett_zip_flags, - &ett_zip_zones_list, - &ett_zip_network_list, + &ett_zip_zones_list, + &ett_zip_network_list, }; module_t *atp_module; diff --git a/packet-atalk.h b/packet-atalk.h index 24bec82b31..add0e83e7d 100644 --- a/packet-atalk.h +++ b/packet-atalk.h @@ -1,18 +1,18 @@ /* packet-atalk.h * Definitions for Appletalk packet disassembly (DDP, currently). * - * $Id: packet-atalk.h,v 1.8 2002/04/24 06:03:33 guy Exp $ + * $Id: packet-atalk.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-atm.c b/packet-atm.c index 88cd16095b..aac07e2e81 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,22 +1,22 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.48 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-atm.c,v 1.49 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -179,7 +179,7 @@ dissect_le_client(tvbuff_t *tvb, proto_tree *tree) } static void -dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree *tree) +dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree *tree) { proto_item *td; proto_tree *dest_tree; diff --git a/packet-atm.h b/packet-atm.h index 27c69b3935..d10bb783ef 100644 --- a/packet-atm.h +++ b/packet-atm.h @@ -1,21 +1,21 @@ /* packet-atm.h * - * $Id: packet-atm.h,v 1.8 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-atm.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-auto_rp.c b/packet-auto_rp.c index 3a38c86bf7..6aa61ee539 100644 --- a/packet-auto_rp.c +++ b/packet-auto_rp.c @@ -4,22 +4,22 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-auto_rp.c,v 1.21 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-auto_rp.c,v 1.22 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -119,7 +119,7 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + ver_type = tvb_get_guint8(tvb, 0); rp_count = tvb_get_guint8(tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) @@ -288,7 +288,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree) offset++; proto_tree_add_ipv4(grp_tree, hf_auto_rp_group_prefix, tvb, offset, 4, group_addr); offset += 4; - + } return offset; diff --git a/packet-bacapp.c b/packet-bacapp.c index 6eb2e5bab3..b9f6965eb9 100644 --- a/packet-bacapp.c +++ b/packet-bacapp.c @@ -2,7 +2,7 @@ * Routines for BACnet (APDU) dissection * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund * - * $Id: packet-bacapp.c,v 1.12 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bacapp.c,v 1.13 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -19,7 +19,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -84,7 +84,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacapp_tree = proto_item_add_subtree(ti, ett_bacapp); - proto_tree_add_uint_format(bacapp_tree, hf_bacapp_type, tvb, + proto_tree_add_uint_format(bacapp_tree, hf_bacapp_type, tvb, offset, 1, bacapp_type, "APDU Type: %u (%s)", bacapp_type, bacapp_type_name(bacapp_type)); offset ++; diff --git a/packet-bacnet.c b/packet-bacnet.c index 80f7c6c65a..ea9ff4c5b7 100644 --- a/packet-bacnet.c +++ b/packet-bacnet.c @@ -2,7 +2,7 @@ * Routines for BACnet (NPDU) dissection * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund * - * $Id: packet-bacnet.c,v 1.13 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bacnet.c,v 1.14 2002/08/28 21:00:07 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -110,7 +110,7 @@ static const true_false_string control_dest_high = { "DNET, DLEN and Hop Count present. If DLEN=0: broadcast, dest. address field absent.", "DNET, DLEN, DADR and Hop Count absent." }; - + static const true_false_string control_src_high = { "SNET, SLEN and SADR present, SLEN=0 invalid, SLEN specifies length of SADR", "SNET, SLEN and SADR absent" @@ -185,10 +185,10 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 j; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-NPDU"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Building Automation and Control Network NPDU"); offset = 0; @@ -210,31 +210,31 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacnet_tree = proto_item_add_subtree(ti, ett_bacnet); - proto_tree_add_uint_format(bacnet_tree, hf_bacnet_version, tvb, + proto_tree_add_uint_format(bacnet_tree, hf_bacnet_version, tvb, offset, 1, bacnet_version,"Version: 0x%02x (%s)",bacnet_version, (bacnet_version == 0x01)?"ASHRAE 135-1995":"unknown"); offset ++; - ct = proto_tree_add_uint_format(bacnet_tree, hf_bacnet_control, + ct = proto_tree_add_uint_format(bacnet_tree, hf_bacnet_control, tvb, offset, 1, bacnet_control,"Control: 0x%02x",bacnet_control); - control_tree = proto_item_add_subtree(ct, + control_tree = proto_item_add_subtree(ct, ett_bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_net, + proto_tree_add_boolean(control_tree, hf_bacnet_control_net, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_res1, tvb, + proto_tree_add_boolean(control_tree, hf_bacnet_control_res1, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_dest, tvb, + proto_tree_add_boolean(control_tree, hf_bacnet_control_dest, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_res2, tvb, + proto_tree_add_boolean(control_tree, hf_bacnet_control_res2, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_src, tvb, + proto_tree_add_boolean(control_tree, hf_bacnet_control_src, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_expect, tvb, + proto_tree_add_boolean(control_tree, hf_bacnet_control_expect, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_high, + proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_high, tvb, offset, 1, bacnet_control); - proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_low, + proto_tree_add_boolean(control_tree, hf_bacnet_control_prio_low, tvb, offset, 1, bacnet_control); offset ++; if (bacnet_control & BAC_CONTROL_DEST) { /* DNET, DLEN, DADR */ @@ -245,8 +245,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* DLEN = 0 is broadcast on dest.network */ if( bacnet_dlen == 0) { /* append to hf_bacnet_dlen: broadcast */ - proto_tree_add_uint_format(bacnet_tree, - hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen, + proto_tree_add_uint_format(bacnet_tree, + hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen, "Destination MAC Layer Address Length: %d indicates Broadcast on Destination Network", bacnet_dlen); offset ++; @@ -256,8 +256,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, bacnet_dlen); offset ++; /* Ethernet MAC */ - proto_tree_add_item(bacnet_tree, - hf_bacnet_dadr_eth, tvb, offset, + proto_tree_add_item(bacnet_tree, + hf_bacnet_dadr_eth, tvb, offset, bacnet_dlen, FALSE); offset += bacnet_dlen; } else if (bacnet_dlen<7) { @@ -265,13 +265,13 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, bacnet_dlen); offset ++; /* Other MAC formats should be included here */ - proto_tree_add_item(bacnet_tree, - hf_bacnet_dadr_tmp, tvb, offset, + proto_tree_add_item(bacnet_tree, + hf_bacnet_dadr_tmp, tvb, offset, bacnet_dlen, FALSE); offset += bacnet_dlen; } else { - proto_tree_add_uint_format(bacnet_tree, - hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen, + proto_tree_add_uint_format(bacnet_tree, + hf_bacnet_dlen, tvb, offset, 1, bacnet_dlen, "Destination MAC Layer Address Length: %d invalid!", bacnet_dlen); } @@ -284,7 +284,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacnet_slen = tvb_get_guint8(tvb, offset); if( bacnet_slen == 0) { /* SLEN = 0 invalid */ proto_tree_add_uint_format(bacnet_tree, - hf_bacnet_slen, tvb, offset, 1, bacnet_slen, + hf_bacnet_slen, tvb, offset, 1, bacnet_slen, "Source MAC Layer Address Length: %d invalid!", bacnet_slen); offset ++; @@ -294,8 +294,8 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, bacnet_slen); offset ++; /* Ethernet MAC */ - proto_tree_add_item(bacnet_tree, - hf_bacnet_sadr_eth, tvb, offset, + proto_tree_add_item(bacnet_tree, + hf_bacnet_sadr_eth, tvb, offset, bacnet_slen, FALSE); offset += bacnet_slen; } else if (bacnet_slen<6) { /* LON,ARCNET,MS/TP MAC */ @@ -304,13 +304,13 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, bacnet_slen); offset ++; /* Other MAC formats should be included here */ - proto_tree_add_item(bacnet_tree, - hf_bacnet_sadr_tmp, tvb, offset, + proto_tree_add_item(bacnet_tree, + hf_bacnet_sadr_tmp, tvb, offset, bacnet_slen, FALSE); offset += bacnet_slen; } else { proto_tree_add_uint_format(bacnet_tree, - hf_bacnet_slen, tvb, offset, 1, bacnet_slen, + hf_bacnet_slen, tvb, offset, 1, bacnet_slen, "Source MAC Layer Address Length: %d invalid!", bacnet_slen); offset ++; @@ -322,7 +322,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset ++; } /* Network Layer Message Type */ - if (bacnet_control & BAC_CONTROL_NET) { + if (bacnet_control & BAC_CONTROL_NET) { bacnet_mesgtyp = tvb_get_guint8(tvb, offset); proto_tree_add_uint_format(bacnet_tree, hf_bacnet_mesgtyp, tvb, offset, 1, bacnet_mesgtyp, @@ -330,9 +330,9 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacnet_mesgtyp_name(bacnet_mesgtyp)); offset ++; } - /* Vendor ID - * The standard says: "If Bit 7 of the control octet is 1 and - * the Message Type field contains a value in the range + /* Vendor ID + * The standard says: "If Bit 7 of the control octet is 1 and + * the Message Type field contains a value in the range * X'80' - X'FF', then a Vendor ID field shall be present (...)." * We should not go any further in dissecting the packet if it's * not present, but we don't know about that: No length field... @@ -354,9 +354,9 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Reason, DNET (in Reject-Message-To-Network) */ if (bacnet_mesgtyp == BAC_NET_REJ) { bacnet_rejectreason = tvb_get_guint8(tvb, offset); - proto_tree_add_uint_format(bacnet_tree, + proto_tree_add_uint_format(bacnet_tree, hf_bacnet_rejectreason, - tvb, offset, 1, + tvb, offset, 1, bacnet_rejectreason, "Rejection Reason: %d (%s)", bacnet_rejectreason, bacnet_rejectreason_name(bacnet_rejectreason)); @@ -366,7 +366,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; } /* N*DNET (in Router-Busy-To-Network,Router-Available-To-Network) */ - if ((bacnet_mesgtyp == BAC_NET_R_BUSY) || + if ((bacnet_mesgtyp == BAC_NET_R_BUSY) || (bacnet_mesgtyp == BAC_NET_R_AVA) || (bacnet_mesgtyp == BAC_NET_IAM_R) ) { while(tvb_reported_length_remaining(tvb, offset) > 1 ) { proto_tree_add_item(bacnet_tree, hf_bacnet_dnet, @@ -375,7 +375,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } /* Initialize-Routing-Table */ - if ( (bacnet_mesgtyp == BAC_NET_INIT_RTAB) || + if ( (bacnet_mesgtyp == BAC_NET_INIT_RTAB) || (bacnet_mesgtyp == BAC_NET_INIT_RTAB_ACK) ) { bacnet_rportnum = tvb_get_guint8(tvb, offset); /* number of ports */ @@ -403,7 +403,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset ++; } } - + } proto_item_set_len(ti, offset); } @@ -435,49 +435,49 @@ proto_register_bacnet(void) "BACnet Control", HFILL } }, { &hf_bacnet_control_net, - { "NSDU contains", + { "NSDU contains", "bacnet.control_net", FT_BOOLEAN, 8, TFS(&control_net_set_high), BAC_CONTROL_NET, "BACnet Control", HFILL } }, { &hf_bacnet_control_res1, - { "Reserved", + { "Reserved", "bacnet.control_res1", FT_BOOLEAN, 8, TFS(&control_res_high), BAC_CONTROL_RES1, "BACnet Control", HFILL } }, { &hf_bacnet_control_dest, - { "Destination Specifier", + { "Destination Specifier", "bacnet.control_dest", FT_BOOLEAN, 8, TFS(&control_dest_high), BAC_CONTROL_DEST, "BACnet Control", HFILL } }, { &hf_bacnet_control_res2, - { "Reserved", + { "Reserved", "bacnet.control_res2", FT_BOOLEAN, 8, TFS(&control_res_high), BAC_CONTROL_RES2, "BACnet Control", HFILL } }, { &hf_bacnet_control_src, - { "Source specifier", + { "Source specifier", "bacnet.control_src", FT_BOOLEAN, 8, TFS(&control_src_high), BAC_CONTROL_SRC, "BACnet Control", HFILL } }, { &hf_bacnet_control_expect, - { "Expecting Reply", + { "Expecting Reply", "bacnet.control_expect", FT_BOOLEAN, 8, TFS(&control_expect_high), BAC_CONTROL_EXPECT, "BACnet Control", HFILL } }, { &hf_bacnet_control_prio_high, - { "Priority", + { "Priority", "bacnet.control_prio_high", FT_BOOLEAN, 8, TFS(&control_prio_high_high), BAC_CONTROL_PRIO_HIGH, "BACnet Control", HFILL } }, { &hf_bacnet_control_prio_low, - { "Priority", + { "Priority", "bacnet.control_prio_low", FT_BOOLEAN, 8, TFS(&control_prio_low_high), BAC_CONTROL_PRIO_LOW, "BACnet Control", HFILL } diff --git a/packet-beep.c b/packet-beep.c index 1cf841b4a0..59b9d1ccf9 100644 --- a/packet-beep.c +++ b/packet-beep.c @@ -1,7 +1,7 @@ /* packet-beep.c * Routines for BEEP packet disassembly * - * $Id: packet-beep.c,v 1.10 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-beep.c,v 1.11 2002/08/28 21:00:07 jmayer Exp $ * * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * Modified 2001 Darren New <dnew@invisible.net> for BEEP. @@ -73,7 +73,7 @@ static int hf_beep_ackno = -1; static int hf_beep_window = -1; /* Arrays of hf entry pointers for some routines to use. If you want more - * hidden items added for a field, add them to the list before the NULL, + * hidden items added for a field, add them to the list before the NULL, * and the various routines that these are passed to will add them. */ @@ -109,13 +109,13 @@ static unsigned int tcp_port = 0; * * pl_left is the amount of data in this packet that belongs to another * frame ... - * + * * It relies on TCP segments not being re-ordered too much ... */ struct beep_proto_data { int pl_left; /* Payload at beginning of frame */ int pl_size; /* Payload in current message ...*/ - int mime_hdr; /* Whether we expect a mime header. 1 on first, 0 on rest + int mime_hdr; /* Whether we expect a mime header. 1 on first, 0 on rest * in a message */ }; @@ -133,7 +133,7 @@ struct beep_request_val { guint16 processed; /* Have we processed this conversation? */ int size; /* Size of the message */ /* We need an indication in each dirn of - * whether on not a mime header is expected + * whether on not a mime header is expected */ int c_mime_hdr, s_mime_hdr; }; @@ -198,7 +198,7 @@ beep_init_protocol(void) beep_request_keys = g_mem_chunk_new("beep_request_keys", sizeof(struct beep_request_key), beep_packet_init_count * sizeof(struct beep_request_key), G_ALLOC_AND_FREE); - beep_request_vals = g_mem_chunk_new("beep_request_vals", + beep_request_vals = g_mem_chunk_new("beep_request_vals", sizeof(struct beep_request_val), beep_packet_init_count * sizeof(struct beep_request_val), G_ALLOC_AND_FREE); beep_packet_infos = g_mem_chunk_new("beep_packet_infos", @@ -257,7 +257,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset, break; - default: + default: if (tree) { proto_tree_add_boolean_hidden(tree, hf_beep_proto_viol, tvb, offset, 1, TRUE); @@ -276,7 +276,7 @@ static void dissect_beep_status(tvbuff_t *tvb, int offset, { /* FIXME: We should return a value to indicate all OK. */ - + switch(tvb_get_guint8(tvb, offset)) { case '+': @@ -320,21 +320,21 @@ static int num_len(tvbuff_t *tvb, int offset) * as a terminator, or CR or LF by itself, which will be redorded as * an incorrect terminator ... We build the tree at this point * However, we depend on the variable beep_strict_term - */ + */ -static int +static int check_term(tvbuff_t *tvb, int offset, proto_tree *tree) { - /* First, check for CRLF, or, if global_beep_strict_term is false, + /* First, check for CRLF, or, if global_beep_strict_term is false, * one of CR or LF ... If neither of these hold, we add an element * that complains of a protocol violation, and return -1, else * we add a terminator to the tree (possibly non-standard) and return - * the count of characters we saw ... This may throw off the rest of the + * the count of characters we saw ... This may throw off the rest of the * dissection ... so-be-it! */ - if ((tvb_get_guint8(tvb, offset) == 0x0d && + if ((tvb_get_guint8(tvb, offset) == 0x0d && tvb_get_guint8(tvb, offset + 1) == 0x0a)){ /* Correct terminator */ if (tree) { @@ -361,7 +361,7 @@ check_term(tvbuff_t *tvb, int offset, proto_tree *tree) return 1; } - else { + else { if (tree) { proto_tree_add_text(tree, tvb, offset, 2, "PROTOCOL VIOLATION, Invalid Terminator: %s", tvb_format_text(tvb, offset, 2)); @@ -381,7 +381,7 @@ static int header_len(tvbuff_t *tvb, int offset) /* FIXME: Have to make sure we stop looking at the end of the tvb ... */ - /* We look for CRLF, or CR or LF if global_beep_strict_term is + /* We look for CRLF, or CR or LF if global_beep_strict_term is * not set. */ @@ -390,20 +390,20 @@ static int header_len(tvbuff_t *tvb, int offset) if (tvb_ensure_length_remaining(tvb, offset + i) < 1) return i; /* Not enough characters left ... */ - if ((sc = tvb_get_guint8(tvb, offset + i)) == 0x0d + if ((sc = tvb_get_guint8(tvb, offset + i)) == 0x0d && tvb_get_guint8(tvb, offset + i + 1) == 0x0a) return i; /* Done here ... */ if (!global_beep_strict_term && (sc == 0x0d || sc == 0x0a)) return i; /* Done here also ... */ - + i++; } } static int -dissect_beep_mime_header(tvbuff_t *tvb, int offset, +dissect_beep_mime_header(tvbuff_t *tvb, int offset, struct beep_proto_data *frame_data, proto_tree *tree) { @@ -436,7 +436,7 @@ dissect_beep_mime_header(tvbuff_t *tvb, int offset, else { /* FIXME: Process the headers */ if (tree) { - proto_tree_add_text(mime_tree, tvb, offset, mime_length, "Header: %s", + proto_tree_add_text(mime_tree, tvb, offset, mime_length, "Header: %s", tvb_format_text(tvb, offset, mime_length)); } @@ -486,7 +486,7 @@ dissect_beep_int(tvbuff_t *tvb, int offset, } static void -set_mime_hdr_flags(int more, struct beep_request_val *request_val, +set_mime_hdr_flags(int more, struct beep_request_val *request_val, struct beep_proto_data *frame_data, packet_info *pinfo) { @@ -498,7 +498,7 @@ set_mime_hdr_flags(int more, struct beep_request_val *request_val, frame_data->mime_hdr = 0; - if (!more) request_val->c_mime_hdr = 0; + if (!more) request_val->c_mime_hdr = 0; } else { @@ -516,7 +516,7 @@ set_mime_hdr_flags(int more, struct beep_request_val *request_val, frame_data->mime_hdr = 0; - if (!more) request_val->s_mime_hdr = 0; + if (!more) request_val->s_mime_hdr = 0; } else { @@ -540,8 +540,8 @@ set_mime_hdr_flags(int more, struct beep_request_val *request_val, */ static int -dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, struct beep_request_val *request_val, +dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, struct beep_request_val *request_val, struct beep_proto_data *frame_data) { proto_tree *ti = NULL, *hdr = NULL; @@ -552,13 +552,13 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, int is_ANS = 0; st_offset = offset; - if (tvb_strneql(tvb, offset, "MSG ", 4) == 0) + if (tvb_strneql(tvb, offset, "MSG ", 4) == 0) cmd_temp = "Command: MSG"; - if (tvb_strneql(tvb, offset, "RPY ", 4) == 0) + if (tvb_strneql(tvb, offset, "RPY ", 4) == 0) cmd_temp = "Command: RPY"; - if (tvb_strneql(tvb, offset, "ERR ", 4) == 0) + if (tvb_strneql(tvb, offset, "ERR ", 4) == 0) cmd_temp = "Command: ERR"; - if (tvb_strneql(tvb, offset, "NUL ", 4) == 0) + if (tvb_strneql(tvb, offset, "NUL ", 4) == 0) cmd_temp = "Command: NUL"; if (tvb_strneql(tvb, offset, "ANS ", 4) == 0) { cmd_temp = "Command: ANS"; @@ -581,14 +581,14 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Get the channel */ offset += dissect_beep_int(tvb, offset, hdr, hf_beep_channel, &channel, req_chan_hfa); offset += 1; /* Skip the space */ - + /* Dissect the message number */ offset += dissect_beep_int(tvb, offset, hdr, hf_beep_msgno, &msgno, req_msgno_hfa); offset += 1; /* skip the space */ /* Insert the more elements ... */ if ((more = dissect_beep_more(tvb, offset, hdr)) >= 0) { - /* Figure out which direction this is in and what mime_hdr flag to + /* Figure out which direction this is in and what mime_hdr flag to * add to the frame_data. If there are missing segments, this code * will get it wrong! */ @@ -596,7 +596,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { /* Protocol violation, so dissect rest as undisectable */ if (tree) { - proto_tree_add_text(hdr, tvb, offset, + proto_tree_add_text(hdr, tvb, offset, tvb_length_remaining(tvb, offset), "Undissected Payload: %s", tvb_format_text(tvb, offset, @@ -634,10 +634,10 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, /* We dissect the rest as data and bail ... */ if (tree) { - proto_tree_add_text(hdr, tvb, offset, + proto_tree_add_text(hdr, tvb, offset, tvb_length_remaining(tvb, offset), - "Undissected Payload: %s", - tvb_format_text(tvb, offset, + "Undissected Payload: %s", + tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset) ) ); @@ -648,7 +648,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, } offset += cc; - + /* Insert MIME header ... */ if (frame_data && frame_data->mime_hdr) @@ -662,7 +662,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Except, check the payload length, and only dissect that much */ - /* We need to keep track, in the conversation, of how much is left + /* We need to keep track, in the conversation, of how much is left * so in the next packet, we can figure out what is part of the payload * and what is the next message */ @@ -683,7 +683,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, if (frame_data->pl_size < 0) frame_data->pl_size = 0; } } - + /* If anything else left, dissect it ... */ if (tvb_length_remaining(tvb, offset) > 0) @@ -721,10 +721,10 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, /* We dissect the rest as data and bail ... */ if (tree) { - proto_tree_add_text(tree, tvb, offset, + proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), - "Undissected Payload: %s", - tvb_format_text(tvb, offset, + "Undissected Payload: %s", + tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset) ) ); @@ -756,10 +756,10 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, /* We dissect the rest as data and bail ... */ - if (tree) { + if (tree) { proto_tree_add_text(tr, tvb, offset, tvb_length_remaining(tvb, offset), - "Undissected Payload: %s", - tvb_format_text(tvb, offset, + "Undissected Payload: %s", + tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset) ) ); @@ -782,9 +782,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, pl_size = MIN(request_val->size, tvb_length_remaining(tvb, offset)); if (pl_size == 0) { /* The whole of the rest must be payload */ - + pl_size = tvb_length_remaining(tvb, offset); /* Right place ? */ - + } } else if (frame_data) { @@ -793,16 +793,16 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo, pl_size = tvb_length_remaining(tvb, offset); } - /* Take care here to handle the payload correctly, and if there is + /* Take care here to handle the payload correctly, and if there is * another message here, then handle it correctly as well. */ /* If the pl_size == 0 and the offset == 0?, then we have not processed - * anything in this frame above, so we better treat all this data as + * anything in this frame above, so we better treat all this data as * payload to avoid recursion loops */ - if (pl_size == 0 && offset == st_offset) + if (pl_size == 0 && offset == st_offset) pl_size = tvb_length_remaining(tvb, offset); if (pl_size > 0) { @@ -851,19 +851,19 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * The per-frame data tells us how much of this frame is left over from a * previous frame, so we dissect it as payload and then try to dissect the * rest. - * + * * We use the conversation to build up info on the first pass over the * packets of type BEEP, and record anything that is needed if the user * does random dissects of packets in per packet data. * - * Once we have per-packet data, we don't need the conversation stuff - * anymore, but if per-packet data and conversation stuff gets deleted, as - * it does under some circumstances when a rescan is done, it all gets + * Once we have per-packet data, we don't need the conversation stuff + * anymore, but if per-packet data and conversation stuff gets deleted, as + * it does under some circumstances when a rescan is done, it all gets * rebuilt. */ /* Find out what conversation this packet is part of ... but only - * if we have no information on this packet, so find the per-frame + * if we have no information on this packet, so find the per-frame * info first. */ @@ -879,13 +879,13 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - /* + /* * Check for and insert an entry in the request table if does not exist */ request_key.conversation = conversation->index; request_val = (struct beep_request_val *)g_hash_table_lookup(beep_request_hash, &request_key); - + if (!request_val) { /* Create one */ new_request_key = g_mem_chunk_alloc(beep_request_keys); @@ -911,10 +911,10 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - /* Here, we parse the message so we can retrieve the info we need, which - * is that there is some payload left from a previous segment on the + /* Here, we parse the message so we can retrieve the info we need, which + * is that there is some payload left from a previous segment on the * front of this segment ... This all depends on TCP segments not getting - * out of order ... + * out of order ... * * As a huge kludge, we push the checking for the tree down into the code * and process as if we were given a tree but not call the routines that @@ -928,9 +928,9 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) beep_tree = proto_item_add_subtree(ti, ett_beep); } - - /* Check the per-frame data and the conversation for any left-over - * payload from the previous frame + + /* Check the per-frame data and the conversation for any left-over + * payload from the previous frame * * We check that per-frame data exists first, and if so, use it, * else we use the conversation data. @@ -960,7 +960,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) request_val->size = 0; - /* We create the frame data here for this case, and + /* We create the frame data here for this case, and * elsewhere for other frames */ @@ -969,7 +969,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) frame_data->pl_left = pl_left; frame_data->pl_size = 0; frame_data->mime_hdr = 0; - + p_add_proto_data(pinfo->fd, proto_beep, frame_data); } @@ -978,7 +978,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * This _must_ come after the checks above ... */ - if (frame_data == NULL) { + if (frame_data == NULL) { frame_data = g_mem_chunk_alloc(beep_packet_infos); @@ -987,7 +987,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) frame_data->mime_hdr = 0; p_add_proto_data(pinfo->fd, proto_beep, frame_data); - + } if (tvb_length_remaining(tvb, offset) > 0) { @@ -1000,7 +1000,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register all the bits needed with the filtering engine */ -void +void proto_register_beep(void) { static hf_register_info hf[] = { @@ -1068,7 +1068,7 @@ proto_register_beep(void) &ett_header, &ett_trailer, }; - module_t *beep_module; + module_t *beep_module; proto_beep = proto_register_protocol("Blocks Extensible Exchange Protocol", "BEEP", "beep"); @@ -1086,8 +1086,8 @@ proto_register_beep(void) " than the default of 10288)", 10, &global_beep_tcp_port); - prefs_register_bool_preference(beep_module, "strict_header_terminator", - "BEEP Header Requires CRLF", + prefs_register_bool_preference(beep_module, "strict_header_terminator", + "BEEP Header Requires CRLF", "Specifies that BEEP requires CRLF as a " "terminator, and not just CR or LF", &global_beep_strict_term); diff --git a/packet-bgp.c b/packet-bgp.c index 78af9bd4e2..acabbbcd2a 100644 --- a/packet-bgp.c +++ b/packet-bgp.c @@ -2,7 +2,7 @@ * Routines for BGP packet dissection. * Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org> * - * $Id: packet-bgp.c,v 1.66 2002/08/27 19:12:35 guy Exp $ + * $Id: packet-bgp.c,v 1.67 2002/08/28 21:00:07 jmayer Exp $ * * Supports: * RFC1771 A Border Gateway Protocol 4 (BGP-4) @@ -168,27 +168,27 @@ static const value_string bgp_l2vpn_encaps[] = { { 0, "Reserved"}, { 1, "Frame Relay"}, { 2, "ATM AAL5 VCC transport"}, - { 3, "ATM transparent cell transport"}, - { 4, "Ethernet VLAN"}, - { 5, "Ethernet"}, - { 6, "Cisco-HDLC"}, - { 7, "PPP"}, - { 8, "CEM"}, - { 9, "ATM VCC cell transport"}, - { 10, "ATM VPC cell transport"}, - { 11, "MPLS"}, - { 12, "VPLS"}, - { 64, "IP-interworking"}, + { 3, "ATM transparent cell transport"}, + { 4, "Ethernet VLAN"}, + { 5, "Ethernet"}, + { 6, "Cisco-HDLC"}, + { 7, "PPP"}, + { 8, "CEM"}, + { 9, "ATM VCC cell transport"}, + { 10, "ATM VPC cell transport"}, + { 11, "MPLS"}, + { 12, "VPLS"}, + { 64, "IP-interworking"}, { 0, NULL}, }; static const value_string bgpext_ospf_rtype[] = { - { BGP_OSPF_RTYPE_RTR, "Router" }, - { BGP_OSPF_RTYPE_NET, "Network" }, - { BGP_OSPF_RTYPE_SUM, "Summary" }, - { BGP_OSPF_RTYPE_EXT, "External" }, + { BGP_OSPF_RTYPE_RTR, "Router" }, + { BGP_OSPF_RTYPE_NET, "Network" }, + { BGP_OSPF_RTYPE_SUM, "Summary" }, + { BGP_OSPF_RTYPE_EXT, "External" }, { BGP_OSPF_RTYPE_NSSA,"NSSA External" }, - { BGP_OSPF_RTYPE_SHAM,"MPLS-VPN Sham" }, + { BGP_OSPF_RTYPE_SHAM,"MPLS-VPN Sham" }, { 0, NULL }, }; @@ -272,7 +272,7 @@ static gint ett_bgp_communities = -1; static gint ett_bgp_cluster_list = -1; /* cluster list tree */ static gint ett_bgp_options = -1; /* optional parameters tree */ static gint ett_bgp_option = -1; /* an optional parameter tree */ -static gint ett_bgp_extended_communities = -1 ; /* extended communities list tree */ +static gint ett_bgp_extended_communities = -1 ; /* extended communities list tree */ static gint ett_bgp_orf = -1; /* orf (outbound route filter) tree */ static gint ett_bgp_orf_entry = -1; /* orf entry tree */ @@ -371,7 +371,7 @@ decode_MPLS_stack(tvbuff_t *tvb, gint offset, char *buf, size_t buflen) if (strlen(buf) + strlen(junk_buf) + 1 <= buflen) strcat(buf, junk_buf); break; - } + } } return((index - offset) / 3); @@ -463,7 +463,7 @@ mp_addr_to_str (guint16 afi, guint8 safi, tvbuff_t *tvb, gint offset, char *buf, default: length = 0 ; snprintf(buf, buflen, "Unknown SAFI (%u) for AFI %u", safi, afi); - break; + break; } break; default: @@ -613,7 +613,7 @@ decode_prefix_MP(guint16 afi, guint8 safi, tvbuff_t *tvb, gint offset, char *buf ce_id=tvb_get_ntohs(tvb,offset+10); labblk_off=tvb_get_ntohs(tvb,offset+12); labnum = decode_MPLS_stack(tvb, offset + 14, lab_stk, sizeof(lab_stk)); - + switch (rd_type) { case FORMAT_AS2_LOC: tvb_memcpy(tvb, ip4addr, offset + 6, 4); @@ -856,7 +856,7 @@ dissect_bgp_open(tvbuff_t *tvb, int offset, proto_tree *tree) val_to_str(i, afn_vals, "Unknown"), i); p += 2; /* Reserved */ - proto_tree_add_text(subtree3, tvb, p, + proto_tree_add_text(subtree3, tvb, p, 1, "Reserved: 1 byte"); p++; /* SAFI */ @@ -883,7 +883,7 @@ dissect_bgp_open(tvbuff_t *tvb, int offset, proto_tree *tree) orfsendrecv = tvb_get_guint8(tvb, p); proto_tree_add_text(subtree3, tvb, p, 1, "Send/Receive: %s (%u)", - val_to_str(orfsendrecv, orf_send_recv_vals, + val_to_str(orfsendrecv, orf_send_recv_vals, "Uknown"), orfsendrecv); p++; } @@ -1580,7 +1580,7 @@ dissect_bgp_update(tvbuff_t *tvb, int offset, proto_tree *tree) } tlen -= off; aoff += off; - + ti = proto_tree_add_text(subtree2, tvb, o + i + aoff, tlen, "Network layer reachability information (%u %s)", tlen, (tlen == 1) ? "byte" : "bytes"); @@ -1694,14 +1694,14 @@ dissect_bgp_update(tvbuff_t *tvb, int offset, proto_tree *tree) junk_buf[junk_buf_len]='\0'; proto_tree_add_text(subtree3,tvb,q,8, "%s",junk_buf); break; - case BGP_EXT_COM_OSPF_RTYPE: + case BGP_EXT_COM_OSPF_RTYPE: tvb_memcpy(tvb,ipaddr,q+2,4); junk_buf_len+=snprintf(junk_buf+junk_buf_len, sizeof(junk_buf)-junk_buf_len, ": Area:%s %s", ip_to_str(ipaddr), val_to_str(tvb_get_guint8(tvb,q+6),bgpext_ospf_rtype,"Unknown")); /* print OSPF Metric type if selected */ /* always print E2 even if not external route -- receiving router should ignore */ - if ( (tvb_get_guint8(tvb,q+7)) & BGP_OSPF_RTYPE_METRIC_TYPE ) { + if ( (tvb_get_guint8(tvb,q+7)) & BGP_OSPF_RTYPE_METRIC_TYPE ) { junk_buf_len+=snprintf(junk_buf+junk_buf_len,sizeof(junk_buf)-junk_buf_len," E2"); } else if (tvb_get_guint8(tvb,q+6)==(BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA ) ) { junk_buf_len+=snprintf(junk_buf+junk_buf_len,sizeof(junk_buf)-junk_buf_len," E1"); @@ -1729,7 +1729,7 @@ dissect_bgp_update(tvbuff_t *tvb, int offset, proto_tree *tree) tvb_get_ntohs(tvb,q+4)==1 ? "byte" : "bytes"); junk_buf[junk_buf_len]='\0'; ti = proto_tree_add_text(subtree3,tvb,q,8, "%s",junk_buf); - + subtree4 = proto_item_add_subtree(ti,ett_bgp_extended_communities) ; proto_tree_add_text(subtree4,tvb,q+2,1, "Encapsulation: %s", val_to_str(tvb_get_guint8(tvb,q+2),bgp_l2vpn_encaps,"Unknown")); @@ -1737,7 +1737,7 @@ dissect_bgp_update(tvbuff_t *tvb, int offset, proto_tree *tree) tvb_get_ntohs(tvb,q+3)&0x08 ? "Q flag (Reserved) set" : "", tvb_get_ntohs(tvb,q+3)&0x04 ? "F flag (reserved) set" : "", tvb_get_ntohs(tvb,q+3)&0x02 ? "is" : "not", - tvb_get_ntohs(tvb,q+3)&0x01 ? "is" : "not"); + tvb_get_ntohs(tvb,q+3)&0x01 ? "is" : "not"); proto_tree_add_text(subtree4,tvb,q+4,2, "MTU: %u %s", tvb_get_ntohs(tvb,q+4), tvb_get_ntohs(tvb,q+4)==1 ? "byte" : "bytes"); @@ -1848,9 +1848,9 @@ dissect_bgp_route_refresh(tvbuff_t *tvb, int offset, proto_tree *tree) guint8 pfx_le; /* ORF PrefixList mask upper bound */ char pfxbuf[20]; /* ORF PrefixList prefix string buffer */ int pfx_masklen; /* ORF PRefixList prefix mask length */ - -/* + +/* example 1 00 1c 05 hlen=28 00 01 00 01 afi,safi= ipv4-unicast @@ -1870,17 +1870,17 @@ example 2 p = offset + BGP_HEADER_SIZE; /* AFI */ i = tvb_get_ntohs(tvb, p); - proto_tree_add_text(tree, tvb, p, 2, + proto_tree_add_text(tree, tvb, p, 2, "Address family identifier: %s (%u)", val_to_str(i, afn_vals, "Unknown"), i); p += 2; /* Reserved */ - proto_tree_add_text(tree, tvb, p, 1, + proto_tree_add_text(tree, tvb, p, 1, "Reserved: 1 byte"); p++; /* SAFI */ i = tvb_get_guint8(tvb, p); - proto_tree_add_text(tree, tvb, p, 1, + proto_tree_add_text(tree, tvb, p, 1, "Subsequent address family identifier: %s (%u)", val_to_str(i, bgpattr_nlri_safi, i >= 128 ? "Vendor specific" : "Unknown"), @@ -1924,7 +1924,7 @@ example 2 ti1 = proto_tree_add_text(subtree, tvb, p, entrylen, "ORFEntry-PrefixList (%u bytes)", entrylen); subtree1 = proto_item_add_subtree(ti1, ett_bgp_orf_entry); proto_tree_add_text(subtree1, tvb, p , 1, "ACTION: %s MATCH: %s", - val_to_str(entryflag&BGP_ORF_ACTION, orf_entry_action_vals,"UNKNOWN"), + val_to_str(entryflag&BGP_ORF_ACTION, orf_entry_action_vals,"UNKNOWN"), val_to_str(entryflag&BGP_ORF_MATCH, orf_entry_match_vals,"UNKNOWN")); p++; proto_tree_add_text(subtree1, tvb, p , 4, "Entry Sequence No: %u", entryseq); diff --git a/packet-bgp.h b/packet-bgp.h index 14d53a6984..872f70c3e4 100644 --- a/packet-bgp.h +++ b/packet-bgp.h @@ -1,7 +1,7 @@ /* packet-bgp.c * Definitions for BGP packet disassembly structures and routine * - * $Id: packet-bgp.h,v 1.19 2002/08/24 10:22:29 guy Exp $ + * $Id: packet-bgp.h,v 1.20 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -189,8 +189,8 @@ struct bgp_attr { #define SAFNUM_UNIMULC 3 #define SAFNUM_MPLS_LABEL 4 /* rfc3107 */ #define SAFNUM_LAB_VPNUNICAST 128 /* Draft-rosen-rfc2547bis-03 */ -#define SAFNUM_LAB_VPNMULCAST 129 -#define SAFNUM_LAB_VPNUNIMULC 130 +#define SAFNUM_LAB_VPNMULCAST 129 +#define SAFNUM_LAB_VPNUNIMULC 130 #ifndef offsetof #define offsetof(type, member) ((size_t)(&((type *)0)->member)) diff --git a/packet-bootp.c b/packet-bootp.c index 4382305e1b..22ef4ef0b7 100644 --- a/packet-bootp.c +++ b/packet-bootp.c @@ -2,7 +2,7 @@ * Routines for BOOTP/DHCP packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-bootp.c,v 1.69 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bootp.c,v 1.70 2002/08/28 21:00:08 jmayer Exp $ * * The information used comes from: * RFC 951: Bootstrap Protocol @@ -19,17 +19,17 @@ * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -561,7 +561,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, val_to_str(byte, nbnt_vals, "Unknown (0x%02x)")); break; - + case 53: /* DHCP Message Type */ proto_tree_add_text(bp_tree, tvb, voff, 3, "Option %d: %s = DHCP %s", code, text, get_dhcp_type(tvb_get_guint8(tvb, voff+2))); @@ -643,7 +643,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, v_tree = proto_item_add_subtree(vti, ett_bootp_option); protocol = tvb_get_guint8(tvb, voff+2); - proto_tree_add_text(v_tree, tvb, voff+2, 1, "Protocol: %s (%u)", + proto_tree_add_text(v_tree, tvb, voff+2, 1, "Protocol: %s (%u)", val_to_str(protocol, authen_protocol_vals, "Unknown"), protocol); @@ -673,13 +673,13 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, case AUTHEN_RDM_MONOTONIC_COUNTER: proto_tree_add_text(v_tree, tvb, voff+5, 8, - "Replay Detection Value: %s", + "Replay Detection Value: %s", u64toh(tvb_get_ptr(tvb, voff+5, 8))); break; default: proto_tree_add_text(v_tree, tvb, voff+5, 8, - "Replay Detection Value: %s", + "Replay Detection Value: %s", tvb_bytes_to_str(tvb, voff+5, 8)); break; } @@ -691,7 +691,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, case AUTHEN_DELAYED_ALGO_HMAC_MD5: proto_tree_add_text(v_tree, tvb, voff+13, 4, - "Secret ID: 0x%08x", + "Secret ID: 0x%08x", tvb_get_ntohl(tvb, voff+13)); proto_tree_add_text(v_tree, tvb, voff+17, 16, "HMAC MD5 Hash: %s", @@ -843,7 +843,7 @@ bootp_dhcp_decode_agent_info(proto_tree *v_tree, tvbuff_t *tvb, int optp) { guint8 subopt; guint8 subopt_len; - + subopt = tvb_get_guint8(tvb, optp); subopt_len = tvb_get_guint8(tvb, optp+1); switch (subopt) { @@ -873,7 +873,7 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) proto_tree *o43pxeclient_v_tree; proto_item *vti; - struct o43pxeclient_opt_info { + struct o43pxeclient_opt_info { char *text; enum field_type ft; }; @@ -902,7 +902,7 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) /* 255 {"PXE end options", special} */ }; #define NUM_O43PXECLIENT_SUBOPTS (12) - + subopt = tvb_get_guint8(tvb, optp); if (subopt == 0 ) { @@ -916,7 +916,7 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) subopt_len = tvb_get_guint8(tvb, optp+1); - if ( subopt == 71 ) { /* 71 {"PXE boot item", special} */ + if ( subopt == 71 ) { /* 71 {"PXE boot item", special} */ /* case special */ /* I may need to decode that properly one day */ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2, @@ -935,7 +935,7 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) "Suboption %d: %s", subopt, o43pxeclient_opt[subopt].text); break; XXX */ - case special: + case special: /* I may need to decode that properly one day */ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2, "Suboption %d: %s (%d byte%s)" , @@ -948,13 +948,13 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) subopt, o43pxeclient_opt[subopt].text, tvb_get_letohs(tvb, optp+2)); break; - + case val_u_byte: proto_tree_add_text(v_tree, tvb, optp, 3, "Suboption %d: %s = %u", subopt, o43pxeclient_opt[subopt].text, tvb_get_guint8(tvb, optp+2)); break; - + case ipv4: if (subopt_len == 4) { /* one IP address */ @@ -992,7 +992,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) proto_tree *o63_v_tree; proto_item *vti; - struct o63_opt_info { + struct o63_opt_info { char *truet; char *falset; enum field_type ft; @@ -1004,7 +1004,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) /* 2 */ {"NWIP exist in options area","",string}, /* 3 */ {"NWIP exists in sname/file","",string}, /* 4 */ {"NWIP exists, but too big","",string}, - /* 5 */ {"Broadcast for nearest Netware server","Do NOT Broadcast for nearest Netware server",yes_no}, + /* 5 */ {"Broadcast for nearest Netware server","Do NOT Broadcast for nearest Netware server",yes_no}, /* 6 */ {"Preferred DSS server","",ipv4}, /* 7 */ {"Nearest NWIP server","",ipv4}, /* 8 */ {"Autoretries","",val_u_short}, @@ -1012,7 +1012,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) /* 10*/ {"Support NetWare/IP v1.1","Do NOT support NetWare/IP v1.1",yes_no}, /* 11*/ {"Primary DSS ", "" , special} }; - + subopt = tvb_get_guint8(tvb, optp); if (subopt > NUM_O63_SUBOPTS) { proto_tree_add_text(v_tree, tvb,optp,1,"Unknown suboption %d", subopt); @@ -1034,7 +1034,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) optp+=3; break; - case special: + case special: proto_tree_add_text(v_tree, tvb, optp, 6, "Suboption %d: %s = %s" , subopt, o63_opt[subopt].truet, @@ -1048,7 +1048,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp) tvb_get_guint8(tvb, optp+2)); /* XXX - 1 byte? */ optp+=3; break; - + case ipv4: subopt_len = tvb_get_guint8(tvb, optp+1); if (subopt_len == 4) { @@ -1142,7 +1142,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_bootp, tvb, 0, -1, FALSE); bp_tree = proto_item_add_subtree(ti, ett_bootp); - proto_tree_add_uint(bp_tree, hf_bootp_type, tvb, + proto_tree_add_uint(bp_tree, hf_bootp_type, tvb, 0, 1, op); proto_tree_add_uint_format(bp_tree, hf_bootp_hw_type, tvb, @@ -1169,9 +1169,9 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 10, 2, flags); proto_tree_add_uint(flag_tree, hf_bootp_flags_reserved, tvb, 10, 2, flags); - proto_tree_add_item(bp_tree, hf_bootp_ip_client, tvb, + proto_tree_add_item(bp_tree, hf_bootp_ip_client, tvb, 12, 4, FALSE); - proto_tree_add_item(bp_tree, hf_bootp_ip_your, tvb, + proto_tree_add_item(bp_tree, hf_bootp_ip_your, tvb, 16, 4, FALSE); proto_tree_add_item(bp_tree, hf_bootp_ip_server, tvb, 20, 4, FALSE); @@ -1180,7 +1180,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (hlen > 0) { haddr = tvb_get_ptr(tvb, 28, hlen); - proto_tree_add_bytes_format(bp_tree, hf_bootp_hw_addr, tvb, + proto_tree_add_bytes_format(bp_tree, hf_bootp_hw_addr, tvb, 28, hlen, haddr, "Client hardware address: %s", @@ -1302,8 +1302,8 @@ proto_register_bootp(void) { &hf_bootp_dhcp, { "Frame is DHCP", "bootp.dhcp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "", HFILL }}, - + "", HFILL }}, + { &hf_bootp_type, { "Message type", "bootp.type", FT_UINT8, BASE_DEC, VALS(op_vals), 0x0, @@ -1399,7 +1399,7 @@ proto_register_bootp(void) &ett_bootp_flags, &ett_bootp_option, }; - + proto_bootp = proto_register_protocol("Bootstrap Protocol", "BOOTP/DHCP", "bootp"); proto_register_field_array(proto_bootp, hf, array_length(hf)); diff --git a/packet-bootparams.c b/packet-bootparams.c index 387762b849..9165395ae1 100644 --- a/packet-bootparams.c +++ b/packet-bootparams.c @@ -1,7 +1,7 @@ /* packet-bootparams.c * Routines for bootparams dissection * - * $Id: packet-bootparams.c,v 1.21 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bootparams.c,v 1.22 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,16 +60,16 @@ dissect_bp_address(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) type = tvb_get_ntohl(tvb, offset); - + offset = dissect_rpc_uint32(tvb, tree, hf_bootparams_addresstype, offset); switch(type){ case 1: - ipaddr = ((tvb_get_guint8(tvb, offset+3 )&0xff)<<24) + ipaddr = ((tvb_get_guint8(tvb, offset+3 )&0xff)<<24) |((tvb_get_guint8(tvb, offset+7 )&0xff)<<16) |((tvb_get_guint8(tvb, offset+11)&0xff)<<8 ) |((tvb_get_guint8(tvb, offset+15)&0xff) ); - proto_tree_add_ipv4(tree, hfindex, tvb, + proto_tree_add_ipv4(tree, hfindex, tvb, offset, 16, g_ntohl(ipaddr)); offset += 16; break; @@ -90,7 +90,7 @@ dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); offset = dissect_rpc_string(tvb, tree, hf_bootparams_fileid, offset, NULL); } - + return offset; } @@ -103,7 +103,7 @@ dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr); offset = dissect_rpc_string(tvb, tree, hf_bootparams_filepath, offset, NULL); } - + return offset; } @@ -114,7 +114,7 @@ dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre { offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr); } - + return offset; } @@ -127,7 +127,7 @@ dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr offset = dissect_rpc_string(tvb, tree, hf_bootparams_domain, offset, NULL); offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_routeraddr); } - + return offset; } @@ -136,9 +136,9 @@ dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr static const vsff bootparams1_proc[] = { { BOOTPARAMSPROC_NULL, "NULL", NULL, NULL }, - { BOOTPARAMSPROC_WHOAMI, "WHOAMI", + { BOOTPARAMSPROC_WHOAMI, "WHOAMI", dissect_whoami_call, dissect_whoami_reply }, - { BOOTPARAMSPROC_GETFILE, "GETFILE", + { BOOTPARAMSPROC_GETFILE, "GETFILE", dissect_getfile_call, dissect_getfile_reply }, { 0, NULL, NULL, NULL } }; diff --git a/packet-bpdu.c b/packet-bpdu.c index 6275a28406..8839841de9 100644 --- a/packet-bpdu.c +++ b/packet-bpdu.c @@ -1,24 +1,24 @@ /* packet-bpdu.c * Routines for BPDU (Spanning Tree Protocol) disassembly * - * $Id: packet-bpdu.c,v 1.37 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bpdu.c,v 1.38 2002/08/28 21:00:08 jmayer Exp $ * * Copyright 1999 Christophe Tronche <ch.tronche@computer.org> - * + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -148,7 +148,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) double max_age; double hello_time; double forward_delay; - + proto_tree *bpdu_tree; proto_item *bpdu_item; proto_tree *flags_tree; @@ -158,7 +158,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* GARP application frames require special interpretation of the destination address field; otherwise, they will be mistaken as - BPDU frames. + BPDU frames. Fortunately, they can be recognized by checking the first 6 octets of the destination address, which are in the range from 01-80-C2-00-00-20 to 01-80-C2-00-00-2F. @@ -238,7 +238,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (bpdu_type) { case BPDU_TYPE_CONF: - col_add_fstr(pinfo->cinfo, COL_INFO, "Conf. %sRoot = %d/%s Cost = %d Port = 0x%04x", + col_add_fstr(pinfo->cinfo, COL_INFO, "Conf. %sRoot = %d/%s Cost = %d Port = 0x%04x", flags & 0x1 ? "TC + " : "", root_identifier_bridge_priority, root_identifier_mac_str, root_path_cost, port_identifier); @@ -249,7 +249,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case BPDU_TYPE_RST: - col_add_fstr(pinfo->cinfo, COL_INFO, "RST. %sRoot = %d/%s Cost = %d Port = 0x%04x", + col_add_fstr(pinfo->cinfo, COL_INFO, "RST. %sRoot = %d/%s Cost = %d Port = 0x%04x", flags & 0x1 ? "TC + " : "", root_identifier_bridge_priority, root_identifier_mac_str, root_path_cost, port_identifier); @@ -287,8 +287,8 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) BPDU_IDENTIFIER, 2, protocol_identifier); protocol_version_identifier = tvb_get_guint8(tvb, BPDU_VERSION_IDENTIFIER); - proto_tree_add_uint(bpdu_tree, hf_bpdu_version_id, tvb, - BPDU_VERSION_IDENTIFIER, 1, + proto_tree_add_uint(bpdu_tree, hf_bpdu_version_id, tvb, + BPDU_VERSION_IDENTIFIER, 1, protocol_version_identifier); switch (protocol_version_identifier) { case 0: @@ -301,7 +301,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } proto_tree_add_uint(bpdu_tree, hf_bpdu_type, tvb, - BPDU_TYPE, 1, + BPDU_TYPE, 1, bpdu_type); if (bpdu_type != BPDU_TYPE_CONF && bpdu_type != BPDU_TYPE_RST) { @@ -316,7 +316,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bridge_identifier_mac = tvb_get_ptr(tvb, BPDU_BRIDGE_IDENTIFIER + 2, 6); bridge_identifier_mac_str = ether_to_str(bridge_identifier_mac); - flags_item = proto_tree_add_uint(bpdu_tree, hf_bpdu_flags, tvb, + flags_item = proto_tree_add_uint(bpdu_tree, hf_bpdu_flags, tvb, BPDU_FLAGS, 1, flags); flags_tree = proto_item_add_subtree(flags_item, ett_bpdu_flags); sep = initial_sep; @@ -365,40 +365,40 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_ether_hidden(bpdu_tree, hf_bpdu_root_mac, tvb, BPDU_ROOT_IDENTIFIER + 2, 6, root_identifier_mac); - proto_tree_add_text(bpdu_tree, tvb, - BPDU_ROOT_IDENTIFIER, 8, - "Root Identifier: %d / %s", - root_identifier_bridge_priority, + proto_tree_add_text(bpdu_tree, tvb, + BPDU_ROOT_IDENTIFIER, 8, + "Root Identifier: %d / %s", + root_identifier_bridge_priority, root_identifier_mac_str); - proto_tree_add_uint(bpdu_tree, hf_bpdu_root_cost, tvb, - BPDU_ROOT_PATH_COST, 4, + proto_tree_add_uint(bpdu_tree, hf_bpdu_root_cost, tvb, + BPDU_ROOT_PATH_COST, 4, root_path_cost); - proto_tree_add_text(bpdu_tree, tvb, - BPDU_BRIDGE_IDENTIFIER, 8, - "Bridge Identifier: %d / %s", - bridge_identifier_bridge_priority, + proto_tree_add_text(bpdu_tree, tvb, + BPDU_BRIDGE_IDENTIFIER, 8, + "Bridge Identifier: %d / %s", + bridge_identifier_bridge_priority, bridge_identifier_mac_str); proto_tree_add_ether_hidden(bpdu_tree, hf_bpdu_bridge_mac, tvb, BPDU_BRIDGE_IDENTIFIER + 2, 6, bridge_identifier_mac); proto_tree_add_uint(bpdu_tree, hf_bpdu_port_id, tvb, - BPDU_PORT_IDENTIFIER, 2, + BPDU_PORT_IDENTIFIER, 2, port_identifier); message_age = tvb_get_ntohs(tvb, BPDU_MESSAGE_AGE) / 256.0; proto_tree_add_double(bpdu_tree, hf_bpdu_msg_age, tvb, - BPDU_MESSAGE_AGE, 2, + BPDU_MESSAGE_AGE, 2, message_age); max_age = tvb_get_ntohs(tvb, BPDU_MAX_AGE) / 256.0; proto_tree_add_double(bpdu_tree, hf_bpdu_max_age, tvb, - BPDU_MAX_AGE, 2, + BPDU_MAX_AGE, 2, max_age); hello_time = tvb_get_ntohs(tvb, BPDU_HELLO_TIME) / 256.0; proto_tree_add_double(bpdu_tree, hf_bpdu_hello_time, tvb, - BPDU_HELLO_TIME, 2, + BPDU_HELLO_TIME, 2, hello_time); forward_delay = tvb_get_ntohs(tvb, BPDU_FORWARD_DELAY) / 256.0; proto_tree_add_double(bpdu_tree, hf_bpdu_forward_delay, tvb, - BPDU_FORWARD_DELAY, 2, + BPDU_FORWARD_DELAY, 2, forward_delay); if (rstp_bpdu) { proto_tree_add_item(bpdu_tree, hf_bpdu_version_1_length, tvb, @@ -407,7 +407,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static const true_false_string yesno = { +static const true_false_string yesno = { "Yes", "No" }; @@ -519,7 +519,7 @@ proto_reg_handoff_bpdu(void) * Get handle for the GVRP dissector. */ gvrp_handle = find_dissector("gvrp"); - + /* * Get handle for the GMRP dissector. */ diff --git a/packet-bvlc.c b/packet-bvlc.c index 8e5ffa90cd..e48943d8d0 100644 --- a/packet-bvlc.c +++ b/packet-bvlc.c @@ -2,7 +2,7 @@ * Routines for BACnet/IP (BVLL, BVLC) dissection * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund * - * $Id: packet-bvlc.c,v 1.12 2002/08/02 23:35:47 jmayer Exp $ + * $Id: packet-bvlc.c,v 1.13 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -100,7 +100,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *bvlc_tree; proto_tree *bdt_tree; /* Broadcast Distribution Table */ proto_tree *fdt_tree; /* Foreign Device Table */ - + gint offset; guint8 bvlc_type; guint8 bvlc_function; @@ -123,39 +123,39 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_length = tvb_get_ntohs(tvb, offset+2); if (bvlc_function > 0x08) { /* We have a constant header length of BVLC of 4 in every - * BVLC-packet forewarding an NPDU. Beware: Changes in the - * BACnet-IP-standard may break this. + * BVLC-packet forewarding an NPDU. Beware: Changes in the + * BACnet-IP-standard may break this. * At the moment, no functions above 0x0b * exist (Addendum 135a to ANSI/ASHRAE 135-1995 - BACnet) */ bvlc_length = 4; } else if(bvlc_function == 0x04) { /* 4 Bytes + 6 Bytes for B/IP Address of Originating Device */ - bvlc_length = 10; + bvlc_length = 10; } else { - /* BVLC-packets with function below 0x09 contain + /* BVLC-packets with function below 0x09 contain * routing-level data (e.g. Broadcast Distribution) * but no NPDU for BACnet, so bvlc_length goes up to the end * of the captured frame. */ bvlc_length = packet_length; } - + if (tree) { - ti = proto_tree_add_item(tree, proto_bvlc, tvb, 0, + ti = proto_tree_add_item(tree, proto_bvlc, tvb, 0, bvlc_length, FALSE); bvlc_tree = proto_item_add_subtree(ti, ett_bvlc); - proto_tree_add_uint_format(bvlc_tree, hf_bvlc_type, tvb, offset, 1, + proto_tree_add_uint_format(bvlc_tree, hf_bvlc_type, tvb, offset, 1, bvlc_type,"Type: 0x%x (Version %s)",bvlc_type, (bvlc_type == 0x81)?"BACnet/IP (Annex J)":"unknown"); offset ++; - proto_tree_add_uint_format(bvlc_tree, hf_bvlc_function, tvb, - offset, 1, bvlc_function,"Function: 0x%02x (%s)", + proto_tree_add_uint_format(bvlc_tree, hf_bvlc_function, tvb, + offset, 1, bvlc_function,"Function: 0x%02x (%s)", bvlc_function, val_to_str (bvlc_function, bvlc_function_names, "Unknown")); offset ++; - proto_tree_add_uint_format(bvlc_tree, hf_bvlc_length, tvb, offset, - 2, bvlc_length, "BVLC-Length: %d of %d bytes BACnet packet length", + proto_tree_add_uint_format(bvlc_tree, hf_bvlc_length, tvb, offset, + 2, bvlc_length, "BVLC-Length: %d of %d bytes BACnet packet length", bvlc_length, packet_length); offset += 2; switch (bvlc_function) { @@ -166,9 +166,9 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ /* We should bitmask the result correctly when we have a * packet to dissect, see README.developer, 1.6.2, FID */ - proto_tree_add_uint_format(bvlc_tree, hf_bvlc_result, tvb, - offset, 2, bvlc_result,"Result: 0x%04x (%s)", - bvlc_result, val_to_str(bvlc_result << 4, + proto_tree_add_uint_format(bvlc_tree, hf_bvlc_result, tvb, + offset, 2, bvlc_result,"Result: 0x%04x (%s)", + bvlc_result, val_to_str(bvlc_result << 4, bvlc_result_names, "Unknown")); offset += 2; break; @@ -186,11 +186,11 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(bdt_tree, hf_bvlc_bdt_port, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(bdt_tree, + proto_tree_add_item(bdt_tree, hf_bvlc_bdt_mask, tvb, offset, 4, FALSE); offset += 4; - } + } /* We check this if we get a BDT-packet somewhere */ break; case 0x02: /* Read-Broadcast-Distribution-Table */ @@ -207,12 +207,12 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0x07: /* Read-Foreign-Device-Table-Ack */ /* List of FDT Entries: N*10-octet */ - /* N indicates the number of entries in the FDT whose - * contents are being returned. Each returned entry - * consists of the 6-octet B/IP address of the registrant; + /* N indicates the number of entries in the FDT whose + * contents are being returned. Each returned entry + * consists of the 6-octet B/IP address of the registrant; * the 2-octet Time-to-Live value supplied at the time of - * registration; and a 2-octet value representing the - * number of seconds remaining before the BBMD will purge + * registration; and a 2-octet value representing the + * number of seconds remaining before the BBMD will purge * the registrant's FDT entry if no re-registration occurs. */ ti_fdt = proto_tree_add_item(bvlc_tree, proto_bvlc, tvb, @@ -226,15 +226,15 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(fdt_tree, hf_bvlc_fdt_port, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(fdt_tree, + proto_tree_add_item(fdt_tree, hf_bvlc_fdt_ttl, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(fdt_tree, + proto_tree_add_item(fdt_tree, hf_bvlc_fdt_timeout, tvb, offset, 2, FALSE); offset += 2; - } + } /* We check this if we get a FDT-packet somewhere */ break; case 0x08: /* Delete-Foreign-Device-Table-Entry */ @@ -274,7 +274,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) npdu_length = packet_length - bvlc_length; next_tvb = tvb_new_subset(tvb,bvlc_length,-1,npdu_length); /* Code from Guy Harris */ - if (!dissector_try_port(bvlc_dissector_table, + if (!dissector_try_port(bvlc_dissector_table, bvlc_function, next_tvb, pinfo, tree)) { /* Unknown function - dissect the paylod as data */ call_dissector(data_handle,next_tvb, pinfo, tree); @@ -388,11 +388,11 @@ proto_reg_handoff_bvlc(void) } /* Taken from add-135a (BACnet-IP-standard paper): * - * The default UDP port for both directed messages and broadcasts shall - * be X'BAC0' and all B/IP devices shall support it. In some cases, - * e.g., a situation where it is desirable for two groups of BACnet devices - * to coexist independently on the same IP subnet, the UDP port may be - * configured locally to a different value without it being considered + * The default UDP port for both directed messages and broadcasts shall + * be X'BAC0' and all B/IP devices shall support it. In some cases, + * e.g., a situation where it is desirable for two groups of BACnet devices + * to coexist independently on the same IP subnet, the UDP port may be + * configured locally to a different value without it being considered * a violation of this protocol. * * This dissector does not analyse UDP packets other than on port 0xBAC0. diff --git a/packet-cdp.c b/packet-cdp.c index 715f51bb04..4414ed6694 100644 --- a/packet-cdp.c +++ b/packet-cdp.c @@ -2,27 +2,27 @@ * Routines for the disassembly of the "Cisco Discovery Protocol" * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-cdp.c,v 1.48 2002/08/18 15:30:38 gerald Exp $ + * $Id: packet-cdp.c,v 1.49 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include "config.h" #include <stdlib.h> @@ -92,11 +92,11 @@ static const value_string type_vals[] = { { TYPE_DUPLEX, "Duplex" }, { 0, NULL }, }; - -static void + +static void dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *ti; + proto_item *ti; proto_tree *cdp_tree = NULL; int offset = 0; guint16 type; @@ -110,12 +110,12 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP"); if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Cisco Discovery Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Cisco Discovery Protocol"); if (tree){ ti = proto_tree_add_item(tree, proto_cdp, tvb, offset, -1, FALSE); cdp_tree = proto_item_add_subtree(ti, ett_cdp); - + /* CDP header */ proto_tree_add_item(cdp_tree, hf_cdp_version, tvb, offset, 1, FALSE); offset += 1; @@ -271,10 +271,10 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* the actual number of prefixes is (length-4)/5 but if the variable is not a "float" but "integer" then length/5=(length-4)/5 :) */ - + tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv); proto_tree_add_uint(tlv_tree, hf_cdp_tlvtype, tvb, - offset + TLV_TYPE, 2, type); + offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, length); offset += 4; diff --git a/packet-cgmp.c b/packet-cgmp.c index df648f3fcf..433ee1792a 100644 --- a/packet-cgmp.c +++ b/packet-cgmp.c @@ -1,27 +1,27 @@ /* packet-cgmp.c * Routines for the disassembly of the Cisco Group Management Protocol * - * $Id: packet-cgmp.c,v 1.16 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-cgmp.c,v 1.17 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include "config.h" #include <stdlib.h> @@ -52,11 +52,11 @@ static const value_string type_vals[] = { { 1, "Leave" }, { 0, NULL }, }; - -static void + +static void dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *ti; + proto_item *ti; proto_tree *cgmp_tree = NULL; int offset = 0; guint8 count; @@ -64,13 +64,13 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CGMP"); if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_cgmp, tvb, offset, -1, FALSE); cgmp_tree = proto_item_add_subtree(ti, ett_cgmp); - + proto_tree_add_item(cgmp_tree, hf_cgmp_version, tvb, offset, 1, FALSE); proto_tree_add_item(cgmp_tree, hf_cgmp_type, tvb, offset, 1, diff --git a/packet-chdlc.c b/packet-chdlc.c index 493907e5c7..a39e48aee1 100644 --- a/packet-chdlc.c +++ b/packet-chdlc.c @@ -1,7 +1,7 @@ /* packet-chdlc.c * Routines for Cisco HDLC packet disassembly * - * $Id: packet-chdlc.c,v 1.14 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-chdlc.c,v 1.15 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-chdlc.h b/packet-chdlc.h index a722e0b449..17a84c23c5 100644 --- a/packet-chdlc.h +++ b/packet-chdlc.h @@ -1,21 +1,21 @@ /* packet-chdlc.h * - * $Id: packet-chdlc.h,v 1.4 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-chdlc.h,v 1.5 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-clip.c b/packet-clip.c index b7d469d062..d7d1b7f1af 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.20 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-clip.c,v 1.21 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -9,17 +9,17 @@ * This file created by Thierry Andry <Thierry.Andry@advalvas.be> * from nearly-the-same packet-raw.c created by Mike Hall <mlh@io.com> * Copyright 1999 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-clip.h b/packet-clip.h index a9bd33810a..b5438500d8 100644 --- a/packet-clip.h +++ b/packet-clip.h @@ -1,21 +1,21 @@ /* packet-clip.h * - * $Id: packet-clip.h,v 1.6 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-clip.h,v 1.7 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-clnp.c b/packet-clnp.c index 7b3d253ca7..228b899928 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,24 +1,24 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.58 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-clnp.c,v 1.59 2002/08/28 21:00:08 jmayer Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -303,17 +303,17 @@ static gchar *print_tsap(const guchar *tsap, int length) if (cur == &str[0][0]) { cur = &str[1][0]; - } else if (cur == &str[1][0]) { + } else if (cur == &str[1][0]) { cur = &str[2][0]; - } else { + } else { cur = &str[0][0]; } cur[0] = '\0'; - if (length <= 0 || length > MAX_TSAP_LEN) + if (length <= 0 || length > MAX_TSAP_LEN) sprintf(cur, "<unsupported TSAP length>"); - else { + else { allprintable=TRUE; for (i=0;i<length;i++) { /* If any byte is not printable ASCII, display the TSAP as a @@ -326,7 +326,7 @@ static gchar *print_tsap(const guchar *tsap, int length) if (!(isascii(tsap[i]) && isprint(tsap[i]))) { allprintable=FALSE; break; - } + } } if (!allprintable){ strcat(cur,"0x"); @@ -375,7 +375,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, case VP_ACK_TIME: s = tvb_get_ntohs(tvb, offset); - proto_tree_add_text(tree, tvb, offset, length, + proto_tree_add_text(tree, tvb, offset, length, "Ack time (ms): %u", s); offset += length; vp_length -= length; @@ -413,7 +413,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, offset += length; vp_length -= length; break; - + case VP_TRANSIT_DEL: s1 = tvb_get_ntohs(tvb, offset); proto_tree_add_text(tree, tvb, offset, 2, @@ -511,7 +511,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, vp_length -= length; break; - case VP_REASSIGNMENT: + case VP_REASSIGNMENT: proto_tree_add_text(tree, tvb, offset, 2, "Reassignment time: %u secs", tvb_get_ntohs(tvb, offset)); offset += length; @@ -541,7 +541,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, case VP_TPDU_SIZE: c1 = tvb_get_guint8(tvb, offset) & 0x0F; - proto_tree_add_text(tree, tvb, offset, length, + proto_tree_add_text(tree, tvb, offset, length, "TPDU size: %u", 1 << c1); offset += length; vp_length -= length; @@ -645,7 +645,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, "Preferred maximum TPDU size: %u", pref_max_tpdu_size*128); offset += length; vp_length -= length; - break; + break; case VP_INACTIVITY_TIMER: proto_tree_add_text(tree, tvb, offset, length, @@ -653,7 +653,7 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, offset += length; vp_length -= length; break; - + case VP_PROTECTION: /* user-defined */ case VP_PROTO_CLASS: /* todo */ default: /* unknown, no decoding */ @@ -661,25 +661,25 @@ static gboolean osi_decode_tp_var_part(tvbuff_t *tvb, int offset, "Parameter value: <not shown>"); offset += length; vp_length -= length; - break; + break; } } /* while */ return TRUE; } -static int osi_decode_DR(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) +static int osi_decode_DR(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree; proto_item *ti; gushort src_ref; guchar reason; char *str; - - if (li < LI_MIN_DR) + + if (li < LI_MIN_DR) return -1; - + src_ref = tvb_get_ntohs(tvb, offset + P_SRC_REF); reason = tvb_get_guint8(tvb, offset + P_REASON_IN_DR); @@ -712,13 +712,13 @@ static int osi_decode_DR(tvbuff_t *tvb, int offset, cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_text(cotp_tree, tvb, offset, 1, "Length indicator: %u", li); - proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, - "TPDU code: 0x%x (DR)", tpdu); - proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, + proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, + "TPDU code: 0x%x (DR)", tpdu); + proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, "Destination reference: 0x%04x", dst_ref); - proto_tree_add_text(cotp_tree, tvb, offset + 4, 2, + proto_tree_add_text(cotp_tree, tvb, offset + 4, 2, "Source reference: 0x%04x", src_ref); - proto_tree_add_text(cotp_tree, tvb, offset + 6, 1, + proto_tree_add_text(cotp_tree, tvb, offset + 6, 1, "Cause: %s", str); } @@ -733,7 +733,7 @@ static int osi_decode_DR(tvbuff_t *tvb, int offset, } /* osi_decode_DR */ -static int osi_decode_DT(tvbuff_t *tvb, int offset, +static int osi_decode_DT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, gboolean uses_inactive_subset, gboolean *subdissector_found) @@ -745,7 +745,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, guint tpdu_nr ; guint fragment = 0; tvbuff_t *next_tvb; - + /* VP_CHECKSUM is the only parameter allowed in the variable part. (This means we may misdissect this if the packet is bad and contains other parameters.) */ @@ -786,7 +786,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, if ( tpdu_nr & 0x80 ) tpdu_nr = tpdu_nr & 0x7F; else - fragment = 1; + fragment = 1; is_extended = FALSE; is_class_234 = FALSE; break; @@ -798,7 +798,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, } if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "DT TPDU (%u) dst-ref: 0x%04x %s", + col_append_fstr(pinfo->cinfo, COL_INFO, "DT TPDU (%u) dst-ref: 0x%04x %s", tpdu_nr, dst_ref, (fragment)? "(fragment)" : ""); @@ -813,7 +813,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, if (tree) { proto_tree_add_text(cotp_tree, tvb, offset, 1, - "TPDU code: 0x%x (DT)", tpdu); + "TPDU code: 0x%x (DT)", tpdu); } offset += 1; @@ -830,8 +830,8 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, if (is_extended) { if (tree) { - proto_tree_add_text(cotp_tree, tvb, offset, 4, - "TPDU number: 0x%08x (%s)", + proto_tree_add_text(cotp_tree, tvb, offset, 4, + "TPDU number: 0x%08x (%s)", tpdu_nr, (fragment)? "fragment":"complete"); } @@ -840,7 +840,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, } else { if (tree) { proto_tree_add_text(cotp_tree, tvb, offset, 1, - "TPDU number: 0x%02x (%s)", + "TPDU number: 0x%02x (%s)", tpdu_nr, (fragment)? "fragment":"complete"); } @@ -870,7 +870,7 @@ static int osi_decode_DT(tvbuff_t *tvb, int offset, } /* osi_decode_DT */ -static int osi_decode_ED(tvbuff_t *tvb, int offset, +static int osi_decode_ED(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree = NULL; @@ -921,7 +921,7 @@ static int osi_decode_ED(tvbuff_t *tvb, int offset, } /* li */ if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "ED TPDU (%u) dst-ref: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, "ED TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); if (tree) { @@ -933,7 +933,7 @@ static int osi_decode_ED(tvbuff_t *tvb, int offset, offset += 1; if (tree) { - proto_tree_add_text(cotp_tree, tvb, offset, 1, + proto_tree_add_text(cotp_tree, tvb, offset, 1, "TPDU code: 0x%x (ED)", tpdu); } offset += 1; @@ -956,7 +956,7 @@ static int osi_decode_ED(tvbuff_t *tvb, int offset, } else { if (tree) { proto_tree_add_text(cotp_tree, tvb, offset, 1, - "TPDU number: 0x%02x", tpdu_nr); + "TPDU number: 0x%02x", tpdu_nr); } offset += 1; li -= 1; @@ -976,7 +976,7 @@ static int osi_decode_ED(tvbuff_t *tvb, int offset, } /* osi_decode_ED */ -static int osi_decode_RJ(tvbuff_t *tvb, int offset, +static int osi_decode_RJ(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree; @@ -999,7 +999,7 @@ static int osi_decode_RJ(tvbuff_t *tvb, int offset, } if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "RJ TPDU (%u) dst-ref: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, "RJ TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); if (tree) { @@ -1007,20 +1007,20 @@ static int osi_decode_RJ(tvbuff_t *tvb, int offset, cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_text(cotp_tree, tvb, offset, 1, "Length indicator: %u", li); - proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, - "TPDU code: 0x%x (RJ)", tpdu); + proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, + "TPDU code: 0x%x (RJ)", tpdu); if (li == LI_NORMAL_RJ) - proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, + proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, "Credit: %u", cdt); - proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, + proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, "Destination reference: 0x%04x", dst_ref); if (li == LI_NORMAL_RJ) - proto_tree_add_text(cotp_tree, tvb, offset + 4, 1, + proto_tree_add_text(cotp_tree, tvb, offset + 4, 1, "Your TPDU number: 0x%02x", tpdu_nr); else { - proto_tree_add_text(cotp_tree, tvb, offset + 4, 4, + proto_tree_add_text(cotp_tree, tvb, offset + 4, 4, "Your TPDU number: 0x%02x", tpdu_nr); - proto_tree_add_text(cotp_tree, tvb, offset + 8, 2, + proto_tree_add_text(cotp_tree, tvb, offset + 8, 2, "Credit: 0x%02x", credit); } } @@ -1031,7 +1031,7 @@ static int osi_decode_RJ(tvbuff_t *tvb, int offset, } /* osi_decode_RJ */ -static int osi_decode_CC(tvbuff_t *tvb, int offset, +static int osi_decode_CC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -1104,21 +1104,21 @@ static int osi_decode_CC(tvbuff_t *tvb, int offset, } /* osi_decode_CC */ -static int osi_decode_DC(tvbuff_t *tvb, int offset, +static int osi_decode_DC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree = NULL; proto_item *ti; gushort src_ref; - if (li > LI_MAX_DC) + if (li > LI_MAX_DC) return -1; src_ref = tvb_get_ntohs(tvb, offset + P_SRC_REF); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, - "DC TPDU src-ref: 0x%04x dst-ref: 0x%04x", + "DC TPDU src-ref: 0x%04x dst-ref: 0x%04x", src_ref, dst_ref); @@ -1159,7 +1159,7 @@ static int osi_decode_DC(tvbuff_t *tvb, int offset, } /* osi_decode_DC */ -static int osi_decode_AK(tvbuff_t *tvb, int offset, +static int osi_decode_AK(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree = NULL; @@ -1167,7 +1167,7 @@ static int osi_decode_AK(tvbuff_t *tvb, int offset, guint tpdu_nr; gushort cdt_in_ak; - if (li > LI_MAX_AK) + if (li > LI_MAX_AK) return -1; if (is_LI_NORMAL_AK(li)) { @@ -1175,7 +1175,7 @@ static int osi_decode_AK(tvbuff_t *tvb, int offset, tpdu_nr = tvb_get_guint8(tvb, offset + P_TPDU_NR_234); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "AK TPDU (%u) dst-ref: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, "AK TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); if (tree) { @@ -1214,14 +1214,14 @@ static int osi_decode_AK(tvbuff_t *tvb, int offset, offset += li; } else { /* extended format */ - + tpdu_nr = tvb_get_ntohl(tvb, offset + P_TPDU_NR_234); cdt_in_ak = tvb_get_ntohs(tvb, offset + P_CDT_IN_AK); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "AK TPDU (%u) dst-ref: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, "AK TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); - + if (tree) { ti = proto_tree_add_item(tree, proto_cotp, tvb, offset, li + 1, FALSE); cotp_tree = proto_item_add_subtree(ti, ett_cotp); @@ -1257,7 +1257,7 @@ static int osi_decode_AK(tvbuff_t *tvb, int offset, } offset += 2; li -= 2; - + if (tree) osi_decode_tp_var_part(tvb, offset, li, 4, cotp_tree); offset += li; @@ -1268,7 +1268,7 @@ static int osi_decode_AK(tvbuff_t *tvb, int offset, } /* osi_decode_AK */ -static int osi_decode_EA(tvbuff_t *tvb, int offset, +static int osi_decode_EA(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree = NULL; @@ -1276,7 +1276,7 @@ static int osi_decode_EA(tvbuff_t *tvb, int offset, gboolean is_extended; guint tpdu_nr ; - if (li > LI_MAX_EA) + if (li > LI_MAX_EA) return -1; /* VP_CHECKSUM is the only parameter allowed in the variable part. @@ -1313,7 +1313,7 @@ static int osi_decode_EA(tvbuff_t *tvb, int offset, } /* li */ if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "EA TPDU (%u) dst-ref: 0x%04x", tpdu_nr, dst_ref); if (tree) { @@ -1362,14 +1362,14 @@ static int osi_decode_EA(tvbuff_t *tvb, int offset, } /* osi_decode_EA */ -static int osi_decode_ER(tvbuff_t *tvb, int offset, +static int osi_decode_ER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_tree *cotp_tree; proto_item *ti; guchar *str; - if (li > LI_MAX_ER) + if (li > LI_MAX_ER) return -1; switch(tvb_get_guint8(tvb, offset + P_REJECT_ER)) { @@ -1399,11 +1399,11 @@ static int osi_decode_ER(tvbuff_t *tvb, int offset, cotp_tree = proto_item_add_subtree(ti, ett_cotp); proto_tree_add_text(cotp_tree, tvb, offset, 1, "Length indicator: %u", li); - proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, - "TPDU code: 0x%x (ER)", tpdu); - proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, + proto_tree_add_text(cotp_tree, tvb, offset + 1, 1, + "TPDU code: 0x%x (ER)", tpdu); + proto_tree_add_text(cotp_tree, tvb, offset + 2, 2, "Destination reference: 0x%04x", dst_ref); - proto_tree_add_text(cotp_tree, tvb, offset + 4, 1, + proto_tree_add_text(cotp_tree, tvb, offset + 4, 1, "Reject cause: %s", str); } @@ -1413,7 +1413,7 @@ static int osi_decode_ER(tvbuff_t *tvb, int offset, } /* osi_decode_ER */ -static int osi_decode_UD(tvbuff_t *tvb, int offset, +static int osi_decode_UD(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { proto_item *ti; @@ -1432,7 +1432,7 @@ static int osi_decode_UD(tvbuff_t *tvb, int offset, offset += 1; if (tree) { - proto_tree_add_text(cltp_tree, tvb, offset, 1, + proto_tree_add_text(cltp_tree, tvb, offset, 1, "TPDU code: 0x%x (UD)", tpdu); } offset += 1; @@ -1460,7 +1460,7 @@ static int osi_decode_UD(tvbuff_t *tvb, int offset, only valid CLTP PDU type is not a valid COTP PDU type, so we'll handle both of them here. */ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, gboolean uses_inactive_subset) + proto_tree *tree, gboolean uses_inactive_subset) { int offset = 0; gboolean first_tpdu = TRUE; @@ -1562,7 +1562,7 @@ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, return found_ositp; } /* dissect_ositp_internal */ -static void dissect_ositp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_ositp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!dissect_ositp_internal(tvb, pinfo, tree, FALSE)) call_dissector(data_handle,tvb, pinfo, tree); @@ -1570,7 +1570,7 @@ static void dissect_ositp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* - * CLNP part / main entry point + * CLNP part / main entry point */ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -1620,15 +1620,15 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); - proto_tree_add_uint_format(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, + proto_tree_add_uint_format(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, cnf_proto_id, "Inactive subset"); - } + } next_tvb = tvb_new_subset(tvb, 1, -1, -1); dissect_ositp_internal(next_tvb, pinfo, tree, TRUE); return; - } - + } + /* return if version not known */ cnf_vers = tvb_get_guint8(tvb, P_CLNP_VERS); if (cnf_vers != ISO8473_V1) { @@ -1643,16 +1643,16 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_clnp, tvb, 0, cnf_hdr_len, FALSE); clnp_tree = proto_item_add_subtree(ti, ett_clnp); - proto_tree_add_uint(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, + proto_tree_add_uint(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1, cnf_proto_id); - proto_tree_add_uint(clnp_tree, hf_clnp_length, tvb, P_CLNP_HDR_LEN, 1, - cnf_hdr_len); - proto_tree_add_uint(clnp_tree, hf_clnp_version, tvb, P_CLNP_VERS, 1, + proto_tree_add_uint(clnp_tree, hf_clnp_length, tvb, P_CLNP_HDR_LEN, 1, + cnf_hdr_len); + proto_tree_add_uint(clnp_tree, hf_clnp_version, tvb, P_CLNP_VERS, 1, cnf_vers); cnf_ttl = tvb_get_guint8(tvb, P_CLNP_TTL); - proto_tree_add_uint_format(clnp_tree, hf_clnp_ttl, tvb, P_CLNP_TTL, 1, + proto_tree_add_uint_format(clnp_tree, hf_clnp_ttl, tvb, P_CLNP_TTL, 1, cnf_ttl, - "Holding Time : %u (%u.%u secs)", + "Holding Time : %u (%u.%u secs)", cnf_ttl, cnf_ttl / 2, (cnf_ttl % 2) * 5); } @@ -1747,7 +1747,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* tree */ /* address part */ - + offset = P_CLNP_ADDRESS_PART; dst_len = tvb_get_guint8(tvb, offset); dst_addr = tvb_get_ptr(tvb, offset + 1, dst_len); @@ -1756,18 +1756,18 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) src_addr = tvb_get_ptr(tvb, offset + dst_len + 2, src_len); if (tree) { - proto_tree_add_uint(clnp_tree, hf_clnp_dest_length, tvb, offset, 1, + proto_tree_add_uint(clnp_tree, hf_clnp_dest_length, tvb, offset, 1, dst_len); - proto_tree_add_bytes_format(clnp_tree, hf_clnp_dest, tvb, offset + 1 , dst_len, + proto_tree_add_bytes_format(clnp_tree, hf_clnp_dest, tvb, offset + 1 , dst_len, dst_addr, - " DA : %s", + " DA : %s", print_nsap_net(dst_addr, dst_len)); - proto_tree_add_uint(clnp_tree, hf_clnp_src_length, tvb, + proto_tree_add_uint(clnp_tree, hf_clnp_src_length, tvb, offset + 1 + dst_len, 1, src_len); - proto_tree_add_bytes_format(clnp_tree, hf_clnp_src, tvb, + proto_tree_add_bytes_format(clnp_tree, hf_clnp_src, tvb, offset + dst_len + 2, src_len, src_addr, - " SA : %s", + " SA : %s", print_nsap_net(src_addr, src_len)); opt_len -= dst_len + src_len +2; @@ -1785,21 +1785,21 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cnf_type & CNF_SEG_OK) { struct clnp_segment seg; /* XXX - not used */ tvb_memcpy(tvb, (guint8 *)&seg, offset, sizeof(seg)); /* XXX - not used */ - + segment_offset = tvb_get_ntohs(tvb, offset + 2); du_id = tvb_get_ntohs(tvb, offset); if (tree) { - proto_tree_add_text(clnp_tree, tvb, offset, 2, + proto_tree_add_text(clnp_tree, tvb, offset, 2, "Data unit identifier: %06u", du_id); proto_tree_add_text(clnp_tree, tvb, offset + 2 , 2, - "Segment offset : %6u", + "Segment offset : %6u", segment_offset); proto_tree_add_text(clnp_tree, tvb, offset + 4 , 2, - "Total length : %6u", + "Total length : %6u", tvb_get_ntohs(tvb, offset + 4)); } - + offset += 6; opt_len -= 6; } @@ -1807,14 +1807,14 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* To do : decode options */ /* - proto_tree_add_text(clnp_tree, tvb, offset, + proto_tree_add_text(clnp_tree, tvb, offset, cnf_hdr_len - offset, "Options/Data: <not shown>"); */ /* QUICK HACK Option Len:= PDU_Hd_length-( FixedPart+AddresPart+SegmentPart )*/ dissect_osi_options( opt_len, - tvb, offset, clnp_tree ); + tvb, offset, clnp_tree ); } /* Length of CLNP datagram plus headers above it. */ @@ -1904,7 +1904,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) XXX - if this isn't the first Derived PDU of a segmented Initial PDU, skip that? */ - if (nsel == (char)tp_nsap_selector || always_decode_transport) { + if (nsel == (char)tp_nsap_selector || always_decode_transport) { if (dissect_ositp_internal(next_tvb, pinfo, tree, FALSE)) { pinfo->fragmented = save_fragmented; return; /* yes, it appears to be COTP or CLTP */ @@ -2000,7 +2000,7 @@ void proto_register_clnp(void) { static hf_register_info hf[] = { { &hf_clnp_id, - { "Network Layer Protocol Identifier", "clnp.nlpi", FT_UINT8, BASE_HEX, + { "Network Layer Protocol Identifier", "clnp.nlpi", FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }}, { &hf_clnp_length, diff --git a/packet-cops.c b/packet-cops.c index d4a9563401..6164d16aba 100644 --- a/packet-cops.c +++ b/packet-cops.c @@ -4,22 +4,22 @@ * * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-cops.c,v 1.31 2002/05/10 23:20:37 guy Exp $ + * $Id: packet-cops.c,v 1.32 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -51,7 +51,7 @@ static guint global_cops_tcp_port = TCP_PORT_COPS; /* desegmentation of COPS */ static gboolean cops_desegment = TRUE; -/* Variable to allow for proper deletion of dissector registration +/* Variable to allow for proper deletion of dissector registration * when the user changes port from the gui */ @@ -140,7 +140,7 @@ static const value_string cops_flags_vals[] = { /* The different COPS message types */ enum cops_op_code { - COPS_NO_MSG, /* Not a COPS Message type */ + COPS_NO_MSG, /* Not a COPS Message type */ COPS_MSG_REQ, /* Request (REQ) */ COPS_MSG_DEC, /* Decision (DEC) */ @@ -190,7 +190,7 @@ enum cops_c_num { COPS_OBJ_PDPREDIRADDR, /* PDP Redirect Address Object (PDPRedirAddr) */ COPS_OBJ_LASTPDPADDR, /* Last PDP Address (LastPDPaddr) */ COPS_OBJ_ACCTTIMER, /* Accounting Timer Object (AcctTimer) */ - COPS_OBJ_INTEGRITY, /* Message Integrity Object (Integrity) */ + COPS_OBJ_INTEGRITY, /* Message Integrity Object (Integrity) */ COPS_LAST_C_NUM /* For error checking */ }; @@ -224,7 +224,7 @@ enum cops_s_num { COPS_OBJ_GPERR, /* Global Provisioning Error Object (GPERR) */ COPS_OBJ_CPERR, /* PRC Class Provisioning Error Object (CPERR) */ COPS_OBJ_ERRPRID, /* Error Provisioning Instance Identifier (ErrorPRID)*/ - + COPS_LAST_S_NUM /* For error checking */ }; @@ -337,9 +337,9 @@ static const value_string cops_cperror_vals[] = { {11, "invalidAttrType" }, {12, "deletedInRef" }, {13, "priSpecificError" }, - {0, NULL }, + {0, NULL }, }; - + /* Report-Type from Report-Type object */ static const value_string cops_report_type_vals[] = { @@ -459,11 +459,11 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 op_code; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "COPS"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + op_code = tvb_get_guint8(tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "COPS %s", @@ -609,8 +609,8 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree) /* Pad to 32bit boundary */ if (object_len % sizeof (guint32)) object_len += (sizeof (guint32) - object_len % sizeof (guint32)); - - return object_len; + + return object_len; } static int dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *tree, guint16 pr_len) @@ -623,8 +623,8 @@ static int dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *tr proto_item *ti; cops_pr_tree = proto_item_add_subtree(tree, ett_cops_pr_obj); - - while (pr_len >= COPS_OBJECT_HDR_SIZE) { + + while (pr_len >= COPS_OBJECT_HDR_SIZE) { object_len = tvb_get_ntohs(tvb, offset); s_num = tvb_get_guint8(tvb, offset + 2); @@ -635,7 +635,7 @@ static int dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *tr proto_tree_add_uint(obj_tree, hf_cops_obj_len, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset += 2; pr_len -= 2; - + proto_tree_add_uint(obj_tree, hf_cops_obj_s_num, tvb, offset, 1, s_num); offset++; pr_len--; @@ -658,7 +658,7 @@ static int dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *tr /*Pad to 32bit boundary */ if (object_len % sizeof (guint32)) object_len += (sizeof (guint32) - object_len % sizeof (guint32)); - + pr_len -= object_len - COPS_OBJECT_HDR_SIZE; offset += object_len - COPS_OBJECT_HDR_SIZE; } @@ -729,7 +729,7 @@ static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *t proto_tree_add_text(reason_tree, tvb, offset, 2, "Reason Sub-code: " "Unknown object's C-Num %u, C-Type %u", tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); - } else + } else proto_tree_add_uint(reason_tree, hf_cops_reason_sub, tvb, offset, 2, reason_sub); break; @@ -755,7 +755,7 @@ static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *t case COPS_OBJ_ERROR: if (c_type != 1) break; - + error = tvb_get_ntohs(tvb, offset); error_sub = tvb_get_ntohs(tvb, offset + 2); ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: Error-Code: %s, Error Sub-code: 0x%04x", @@ -767,12 +767,12 @@ static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *t proto_tree_add_text(error_tree, tvb, offset, 2, "Error Sub-code: " "Unknown object's C-Num %u, C-Type %u", tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); - } else + } else proto_tree_add_uint(error_tree, hf_cops_error_sub, tvb, offset, 2, error_sub); break; case COPS_OBJ_CLIENTSI: - + if (c_type != 2) /*Not COPS-PR data*/ break; @@ -789,7 +789,7 @@ static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *t proto_tree_add_item(tree, hf_cops_katimer, tvb, offset + 2, 2, FALSE); if (tvb_get_ntohs(tvb, offset + 2) == 0) proto_tree_add_text(tree, tvb, offset, 0, "Value of zero implies infinity."); - + break; case COPS_OBJ_PEPID: if (c_type != 1) @@ -873,9 +873,9 @@ static gchar* xtobstr(guint8 *hex, guint len) { guint i=0,j=0,k=0, bit=0; gchar *binstr=NULL; guint8 mask = 0x80; - + binstr = g_malloc(8*sizeof(gchar)*len); - + for (i=0; i < len; i++) { for ( j=0; j<8; j++ ) { /* for each bit */ bit = (mask & hex[i]) ? 1 : 0; /* bit is 1 or 0 */ @@ -896,7 +896,7 @@ static gchar* xtobstr(guint8 *hex, guint len) { static int decode_cops_pr_asn1_data(tvbuff_t *tvb, guint32 offset, proto_tree *tree, guint epdlen, gboolean inepd) { - ASN1_SCK asn1; + ASN1_SCK asn1; int start; gboolean def; guint length; @@ -996,24 +996,24 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb, guint32 offset, i=0;/* EPD belongs to IpFilters, print as bytes (IPv6 not printed - ok - yet)*/ + ok - yet)*/ } else { /* EPD belongs to frwkPrcSupportEntry, convert hex byte(s) to - binary string*/ + binary string*/ vb_display_string = xtobstr(vb_octet_string, vb_length); - + proto_tree_add_text(tree, asn1.tvb, offset, length, "Value: %s: %s", vb_type_name, vb_display_string); - + g_free(vb_octet_string); g_free(vb_display_string); - + break; } } else { @@ -1031,7 +1031,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb, guint32 offset, /* * If some characters are not printable, * display the string as bytes. - */ + */ if (i < vb_length) { /* * We stopped, due to a non-printable @@ -1089,7 +1089,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb, guint32 offset, proto_tree_add_text(tree, asn1.tvb, offset, length, "Value: %s: %s", vb_type_name, vb_display_string); - + if (inepd) { /* we're decoding EPD */ g_free(vb_display_string); @@ -1110,9 +1110,9 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb, guint32 offset, g_assert_not_reached(); return ASN1_ERR_WRONG_TYPE; } - + asn1_close(&asn1,&offset); - + epdlen -= length; } return 0; @@ -1128,7 +1128,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree switch (s_num){ case COPS_OBJ_PRID: if (s_type != 1) /* Not Provisioning Instance Identifier (PRID) */ - break; + break; ti=proto_tree_add_text(tree, tvb, offset, len, "Contents:"); asn1_object_tree = proto_item_add_subtree(ti, ett_cops_asn1); @@ -1136,9 +1136,9 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree decode_cops_pr_asn1_data(tvb, offset, asn1_object_tree, len, FALSE); break; - case COPS_OBJ_PPRID: + case COPS_OBJ_PPRID: if (s_type != 1) /* Not Prefix Provisioning Instance Identifier (PPRID) */ - break; + break; ti = proto_tree_add_text(tree, tvb, offset, len, "Contents:"); asn1_object_tree = proto_item_add_subtree(ti, ett_cops_asn1); @@ -1148,18 +1148,18 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree break; case COPS_OBJ_EPD: if (s_type != 1) /* Not Encoded Provisioning Instance Data (EPD) */ - break; + break; ti = proto_tree_add_text(tree, tvb, offset, len, "Contents:"); asn1_object_tree = proto_item_add_subtree(ti, ett_cops_asn1); decode_cops_pr_asn1_data(tvb, offset, asn1_object_tree, len, TRUE); - + break; case COPS_OBJ_GPERR: if (s_type != 1) /* Not Global Provisioning Error Object (GPERR) */ break; - + gperror = tvb_get_ntohs(tvb, offset); gperror_sub = tvb_get_ntohs(tvb, offset + 2); ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: Error-Code: %s, Error Sub-code: 0x%04x", @@ -1171,14 +1171,14 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree proto_tree_add_text(gperror_tree, tvb, offset, 2, "Error Sub-code: " "Unknown object's C-Num %u, C-Type %u", tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); - } else + } else proto_tree_add_uint(gperror_tree, hf_cops_gperror_sub, tvb, offset, 2, gperror_sub); break; case COPS_OBJ_CPERR: if (s_type != 1) /*Not PRC Class Provisioning Error Object (CPERR) */ break; - + break; cperror = tvb_get_ntohs(tvb, offset); @@ -1192,7 +1192,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree proto_tree_add_text(cperror_tree, tvb, offset, 2, "Error Sub-code: " "Unknown object's S-Num %u, C-Type %u", tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); - } else + } else proto_tree_add_uint(cperror_tree, hf_cops_cperror_sub, tvb, offset, 2, cperror_sub); break; @@ -1217,7 +1217,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, guint32 offset, proto_tree /* Register the protocol with Ethereal */ void proto_register_cops(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_cops_ver_flags, @@ -1448,8 +1448,8 @@ void proto_register_cops(void) /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_cops, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - - /* Register our configuration options for cops, + + /* Register our configuration options for cops, * particularly our ports */ cops_module = prefs_register_protocol(proto_cops, @@ -1475,7 +1475,7 @@ proto_reg_handoff_cops(void) cops_prefs_initialized = TRUE; } else dissector_delete("tcp.port",cops_tcp_port,cops_handle); - + /* Set our port numbers for future use */ cops_tcp_port = global_cops_tcp_port; diff --git a/packet-cosine.c b/packet-cosine.c index 17364854e8..ebb5a6b5aa 100644 --- a/packet-cosine.c +++ b/packet-cosine.c @@ -1,7 +1,7 @@ /* packet-cosine.c * Routines for decoding CoSine IPNOS L2 debug output * - * $Id: packet-cosine.c,v 1.3 2002/08/16 00:41:37 guy Exp $ + * $Id: packet-cosine.c,v 1.4 2002/08/28 21:00:08 jmayer Exp $ * * Motonori Shindo <mshindo@mshindo.net> * @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -83,7 +83,7 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(fh_tree, hf_pri, tvb, 0, 0, pseudo_header->cosine.pri); proto_tree_add_uint(fh_tree, hf_rm, tvb, 0, 0, pseudo_header->cosine.rm); proto_tree_add_uint(fh_tree, hf_err, tvb, 0, 0, pseudo_header->cosine.err); - + switch (pseudo_header->cosine.encap) { case COSINE_ENCAP_ETH: break; @@ -98,10 +98,10 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case COSINE_ENCAP_HDLC: if (pseudo_header->cosine.direction == COSINE_DIR_TX) { - proto_tree_add_text(fh_tree, tvb, 0, 2, + proto_tree_add_text(fh_tree, tvb, 0, 2, "Channel handle ID"); } else if (pseudo_header->cosine.direction == COSINE_DIR_RX) { - proto_tree_add_text(fh_tree, tvb, 0, 4, + proto_tree_add_text(fh_tree, tvb, 0, 4, "Channel handle ID"); } break; @@ -112,30 +112,30 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pseudo_header->cosine.encap) { case COSINE_ENCAP_ETH: - call_dissector(eth_handle, tvb_new_subset(tvb, 0, -1, -1), + call_dissector(eth_handle, tvb_new_subset(tvb, 0, -1, -1), pinfo, tree); break; case COSINE_ENCAP_ATM: case COSINE_ENCAP_PPoATM: - call_dissector(llc_handle, tvb_new_subset(tvb, 16, -1, -1), + call_dissector(llc_handle, tvb_new_subset(tvb, 16, -1, -1), pinfo, tree); break; case COSINE_ENCAP_PPP: - call_dissector(ppp_hdlc_handle, tvb_new_subset(tvb, 4, -1, -1), + call_dissector(ppp_hdlc_handle, tvb_new_subset(tvb, 4, -1, -1), pinfo, tree); break; case COSINE_ENCAP_HDLC: if (pseudo_header->cosine.direction == COSINE_DIR_TX) { - call_dissector(chdlc_handle, tvb_new_subset(tvb, 2, -1, -1), + call_dissector(chdlc_handle, tvb_new_subset(tvb, 2, -1, -1), pinfo, tree); } else if (pseudo_header->cosine.direction == COSINE_DIR_RX) { - call_dissector(chdlc_handle, tvb_new_subset(tvb, 4, -1, -1), + call_dissector(chdlc_handle, tvb_new_subset(tvb, 4, -1, -1), pinfo, tree); } break; case COSINE_ENCAP_FR: case COSINE_ENCAP_PPoFR: - call_dissector(fr_handle, tvb_new_subset(tvb, 4, -1, -1), + call_dissector(fr_handle, tvb_new_subset(tvb, 4, -1, -1), pinfo, tree); break; case COSINE_ENCAP_TEST: @@ -151,15 +151,15 @@ void proto_register_cosine(void) { static hf_register_info hf[] = { - { &hf_pro, + { &hf_pro, { "Protocol", "cosine.pro", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_off, + { &hf_off, { "Offset", "cosine.off", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_pri, + { &hf_pri, { "Priority", "cosine.pri", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_rm, + { &hf_rm, { "Rate Marking", "cosine.rm", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_err, + { &hf_err, { "Error Code", "cosine.err", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, }; diff --git a/packet-cpha.c b/packet-cpha.c index 243a4a9b6a..1bcb165e78 100644 --- a/packet-cpha.c +++ b/packet-cpha.c @@ -1,23 +1,23 @@ /* packet-cpha.c * Routines for the Check Point High-Availability Protocol (CPHAP) - * Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il> + * Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il> * - * $Id: packet-cpha.c,v 1.3 2002/08/28 20:02:34 guy Exp $ + * $Id: packet-cpha.c,v 1.4 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -73,7 +73,7 @@ static int hf_ifn = -1; static gint ett_cphap = -1; -#define UDP_PORT_CPHA 8116 +#define UDP_PORT_CPHA 8116 #define CPHA_MAGIC 0x1A90 struct cpha_hdr { @@ -123,7 +123,7 @@ struct fwhap_if_state_s { static const char *opcode_type_str_short[NUM_OPCODE_TYPES+1] = { "Unknown", - "FWHA_MY_STATE", + "FWHA_MY_STATE", "FWHA_QUERY_STATE", "FWHA_IF_PROBE_REQ", "FWHA_IF_PROBE_REPLY", @@ -225,7 +225,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); hdr.magic_number = g_ntohs(hdr.magic_number); hdr.ha_protocol_ver = g_ntohs(hdr.ha_protocol_ver); @@ -237,10 +237,10 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr.filler = g_ntohs(hdr.filler); opcode = g_ntohs(hdr.opcode); - snprintf(info,50,"CPHAv%d: %s",g_ntohs(hdr.ha_protocol_ver), opcode2str_short(opcode)); - if (check_col(pinfo->cinfo, COL_INFO)) + snprintf(info,50,"CPHAv%d: %s",g_ntohs(hdr.ha_protocol_ver), opcode2str_short(opcode)); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO,info); - + if (tree) { ti = proto_tree_add_item(tree, proto_cphap, tvb, offset, -1, FALSE); cpha_tree = proto_item_add_subtree(ti, ett_cphap); @@ -274,13 +274,13 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hdr.ha_protocol_ver != 1) {/* 4.1 - no policy_id and filler*/ proto_tree_add_uint(cpha_tree, hf_policy_id, tvb, offset, sizeof(hdr.policy_id), hdr.policy_id); offset += sizeof(hdr.policy_id); - + proto_tree_add_uint(cpha_tree, hf_filler, tvb, offset, sizeof(hdr.filler), g_ntohs(hdr.filler)); offset += sizeof(hdr.filler); } nti = proto_tree_add_text(cpha_tree, tvb, offset, -1, opcode2str_short(opcode)); ntree = proto_item_add_subtree(nti, ett_cphap); - + switch(opcode) { case 1: dissect_my_state(tvb, offset, ntree); /* FWHAP_MY_STATE */ break; @@ -308,13 +308,13 @@ static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) { int rep_mode, i; proto_item * nti = NULL; proto_tree * ntree = NULL; - - tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); + + tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); hdr.id_num = g_ntohs(hdr.id_num); hdr.report_code = g_ntohs(hdr.report_code); hdr.ha_mode = g_ntohs(hdr.ha_mode); hdr.ha_time_unit = g_ntohs(hdr.ha_time_unit); - + proto_tree_add_uint(tree, hf_id_num, tvb, offset, sizeof(hdr.id_num), hdr.id_num); offset += sizeof(hdr.id_num); @@ -326,7 +326,7 @@ static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) { proto_tree_add_uint_format(tree, hf_ha_time_unit, tvb, offset, sizeof(hdr.ha_time_unit), hdr.ha_time_unit, "HA Time unit: %d miliseconds", hdr.ha_time_unit); offset += sizeof(hdr.ha_time_unit); - + rep_mode = is_report_ifs(hdr.report_code); if (hdr.report_code & 1) { /* states */ @@ -350,18 +350,18 @@ static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) { offset += sizeof(if_hdr.out_up_num); proto_tree_add_int(ntree, hf_out_assumed_up_num, tvb, offset, sizeof(if_hdr.out_assumed_up_num), if_hdr.out_assumed_up_num); offset += sizeof(if_hdr.out_assumed_up_num); - + for(i=0; i < hdr.id_num; i++) { proto_tree_add_text(tree, tvb, offset, sizeof(guint8), "Cluster %d: last packet seen %d time units ago", i, tvb_get_guint8(tvb, offset)); offset += sizeof(guint8); } } - + } static void dissect_lb_conf(tvbuff_t * tvb, int offset, proto_tree * tree) { struct lb_conf_hdr hdr; - + tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); hdr.slot_num = g_ntohs(hdr.slot_num); hdr.machine_num = g_ntohs(hdr.machine_num); @@ -402,11 +402,11 @@ static void dissect_probe(tvbuff_t * tvb, int offset, proto_tree * tree) { static void dissect_conf_reply(tvbuff_t * tvb, int offset, proto_tree * tree) { struct conf_reply_hdr hdr; - + tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); hdr.num_reported_ifs = g_ntohl(hdr.num_reported_ifs); hdr.is_if_trusted = g_ntohs(hdr.is_if_trusted); - + proto_tree_add_uint(tree, hf_num_reported_ifs, tvb, offset, sizeof(hdr.num_reported_ifs), hdr.num_reported_ifs); offset += sizeof(hdr.num_reported_ifs); proto_tree_add_ether(tree, hf_ethernet_add, tvb, offset, 6, hdr.ethernet_add); @@ -530,7 +530,7 @@ proto_register_cpha(void) { "IP Address", "cphap.ip", FT_IPv4, BASE_DEC, NULL, 0x0, "IP Address", HFILL}}, { &hf_slot_num, { "Slot Number", "cphap.slot_num", FT_INT16, BASE_DEC, NULL, 0x0, "Slot Number", HFILL}}, - { &hf_machine_num, + { &hf_machine_num, { "Machine Number", "cphap.machine_num", FT_INT16, BASE_DEC, NULL, 0x0, "Machine Number", HFILL}}, { &hf_seed, { "Seed", "cphap.seed", FT_UINT32, BASE_DEC, NULL, 0x0, "Seed", HFILL}}, @@ -539,24 +539,24 @@ proto_register_cpha(void) { &hf_in_up_num, { "Interfaces up in the Inbound", "cphap.in_up", FT_INT8, BASE_DEC, NULL, 0x0, "Interfaces up in the Inbound", HFILL}}, { &hf_in_assumed_up_num, - { "Interfaces assumed up in the Inbound", "cphap.in_assume_up", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL}}, + { "Interfaces assumed up in the Inbound", "cphap.in_assume_up", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL}}, { &hf_out_up_num, { "Interfaces up in the Outbound", "cphap.out_up", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_out_assumed_up_num, + { &hf_out_assumed_up_num, { "Interfaces assumed up in the Outbound", "cphap.out_assume_up", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL}}, { &hf_status, { "Status", "cphap.status", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, - { &hf_ifn, + { &hf_ifn, { "Interface Number", "cpha.ifn", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, }; static gint *ett[] = { &ett_cphap, }; - + proto_cphap = proto_register_protocol("Check Point High Availability Protocol", "CPHA", "cpha"); proto_register_field_array(proto_cphap, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); } void diff --git a/packet-cups.c b/packet-cups.c index d52a2d8aea..6bd56fa391 100644 --- a/packet-cups.c +++ b/packet-cups.c @@ -5,18 +5,18 @@ * Charles Levert <charles@comm.polymtl.ca> * Copyright 2001 Charles Levert * -* $Id: packet-cups.c,v 1.11 2002/08/02 23:35:48 jmayer Exp $ -* +* $Id: packet-cups.c,v 1.12 2002/08/28 21:00:08 jmayer Exp $ +* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-data.c b/packet-data.c index 3406dc9648..ed176bf2a6 100644 --- a/packet-data.c +++ b/packet-data.c @@ -2,22 +2,22 @@ * Routines for raw data (default case) * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-data.c,v 1.30 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-data.c,v 1.31 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-data.h b/packet-data.h index 8a3f2ff68b..5a3d503534 100644 --- a/packet-data.h +++ b/packet-data.h @@ -1,21 +1,21 @@ /* packet-data.h * - * $Id: packet-data.h,v 1.1 2002/05/10 23:20:38 guy Exp $ + * $Id: packet-data.h,v 1.2 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dccp.c b/packet-dccp.c index 1ac7db1172..2564fa151d 100644 --- a/packet-dccp.c +++ b/packet-dccp.c @@ -4,24 +4,24 @@ * * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-dccp.c,v 1.7 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-dccp.c,v 1.8 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -121,7 +121,7 @@ static gint ett_dccp_trace = -1; proto_tree_add_time(dccp_optree, hf_dccp_date, tvb, offset, 4, &ts); \ offset += 4; \ } - + #define D_CHECKSUM() { \ proto_tree *cktree, *ti; \ @@ -197,7 +197,7 @@ static const value_string dccp_target_vals[] = { }; static const value_string dccp_floodop_vals[] = { - {DCC_AOP_FLOD_CHECK, "Check"}, + {DCC_AOP_FLOD_CHECK, "Check"}, {DCC_AOP_FLOD_SHUTDOWN, "Shutdown"}, {DCC_AOP_FLOD_HALT, "Halt"}, {DCC_AOP_FLOD_RESUME, "Resume"}, @@ -234,11 +234,11 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; is_response = pinfo->srcport == DCC_PORT; - + if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "%s: %s", - is_response ? "Response" : "Request", + col_add_fstr(pinfo->cinfo, COL_INFO, + "%s: %s", + is_response ? "Response" : "Request", val_to_str(tvb_get_guint8(tvb, offset+3), dccp_op_vals, "Unknown Op: %u") ); @@ -249,7 +249,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FALSE); dccp_tree = proto_item_add_subtree(ti, ett_dccp); - proto_tree_add_item(dccp_tree, hf_dccp_len, tvb, + proto_tree_add_item(dccp_tree, hf_dccp_len, tvb, offset, 2, FALSE); if ( !tvb_bytes_exist(tvb, 0, tvb_get_ntohs(tvb, offset))) { @@ -258,16 +258,16 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset += 2; - proto_tree_add_item(dccp_tree, hf_dccp_pkt_vers, tvb, + proto_tree_add_item(dccp_tree, hf_dccp_pkt_vers, tvb, offset, 1, FALSE); offset += 1; op = tvb_get_guint8(tvb, offset); - proto_tree_add_item(dccp_tree, hf_dccp_op, tvb, + proto_tree_add_item(dccp_tree, hf_dccp_op, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(dccp_tree, hf_dccp_clientid, tvb, + proto_tree_add_item(dccp_tree, hf_dccp_clientid, tvb, offset, 4, FALSE); offset += 4; @@ -278,26 +278,26 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make some attempt to figure out if this data is little endian, not guaranteed to be correct if connection went through a firewall or similar. */ - /* Very hokey check - if all three of pid/report/retrans look like little-endian + /* Very hokey check - if all three of pid/report/retrans look like little-endian numbers, host is probably little endian. Probably innacurate on super-heavily-used DCC clients though. This should be good enough for now. */ client_is_le = ( (tvb_get_guint8(tvb, offset+4) | tvb_get_guint8(tvb, offset+4)) && (tvb_get_guint8(tvb, offset+8) | tvb_get_guint8(tvb, offset+9)) && (tvb_get_guint8(tvb, offset+12) | tvb_get_guint8(tvb, offset+13)) ); - proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_host, tvb, + proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_host, tvb, offset, 4, client_is_le); offset += 4; - proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_pid, tvb, + proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_pid, tvb, offset, 4, client_is_le); offset += 4; - proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_report, tvb, + proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_report, tvb, offset, 4, client_is_le); offset += 4; - proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_retrans, tvb, + proto_tree_add_item(dccp_opnumtree, hf_dccp_opnums_retrans, tvb, offset, 4, client_is_le); offset += 4; @@ -358,10 +358,10 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 1, FALSE); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(tvb_get_guint8(tvb,offset+4), + val_to_str(tvb_get_guint8(tvb,offset+4), dccp_adminop_vals, "Unknown (%u)")); } - + if (aop == DCC_AOP_TRACE_ON || aop == DCC_AOP_TRACE_OFF ) { ti = proto_tree_add_item(dccp_optree, hf_dccp_trace, tvb, offset, @@ -377,17 +377,17 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if ( aop == DCC_AOP_FLOD ) { - proto_tree_add_item(dccp_optree, hf_dccp_floodop, + proto_tree_add_item(dccp_optree, hf_dccp_floodop, tvb, offset, 4, FALSE); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(tvb_get_ntohl(tvb,offset), + val_to_str(tvb_get_ntohl(tvb,offset), dccp_floodop_vals, "Unknown (%u)")); } } else { - proto_tree_add_item(dccp_optree, hf_dccp_adminval, + proto_tree_add_item(dccp_optree, hf_dccp_adminval, tvb, offset, 4, FALSE); } offset += 4; @@ -408,14 +408,14 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(dccp_optree, hf_dccp_qdelay_ms, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(dccp_optree, hf_dccp_brand, tvb, offset, sizeof(DCC_BRAND), FALSE); offset += sizeof(DCC_BRAND); D_SIGNATURE(); break; - + default: /* do nothing */ break; @@ -429,83 +429,83 @@ void proto_register_dccp(void) { static hf_register_info hf[] = { - { &hf_dccp_len, { + { &hf_dccp_len, { "Packet Length", "dccp.len", FT_UINT16, BASE_DEC, NULL, 0, "Packet Length", HFILL }}, - { &hf_dccp_pkt_vers, { + { &hf_dccp_pkt_vers, { "Packet Version", "dccp.pkt_vers", FT_UINT16, BASE_DEC, NULL, 0, "Packet Version", HFILL }}, - { &hf_dccp_op, { + { &hf_dccp_op, { "Operation Type", "dccp.op", FT_UINT8, BASE_DEC, VALS(dccp_op_vals), 0, "Operation Type", HFILL }}, - { &hf_dccp_clientid, { + { &hf_dccp_clientid, { "Client ID", "dccp.clientid", FT_UINT32, BASE_DEC, NULL, 0, "Client ID", HFILL }}, - { &hf_dccp_opnums_host, { + { &hf_dccp_opnums_host, { "Host", "dccp.opnums.host", FT_IPv4, BASE_DEC, NULL, 0, "Host", HFILL }}, - { &hf_dccp_opnums_pid, { + { &hf_dccp_opnums_pid, { "Process ID", "dccp.opnums.pid", FT_UINT32, BASE_DEC, NULL, 0, "Process ID", HFILL }}, - { &hf_dccp_opnums_report, { + { &hf_dccp_opnums_report, { "Report", "dccp.opnums.report", FT_UINT32, BASE_DEC, NULL, 0, "Report", HFILL }}, - { &hf_dccp_opnums_retrans, { + { &hf_dccp_opnums_retrans, { "Retransmission", "dccp.opnums.retrans", FT_UINT32, BASE_DEC, NULL, 0, "Retransmission", HFILL }}, - { &hf_dccp_signature, { + { &hf_dccp_signature, { "Signature", "dccp.signature", FT_BYTES, BASE_HEX, NULL, 0, "Signature", HFILL }}, - { &hf_dccp_max_pkt_vers, { + { &hf_dccp_max_pkt_vers, { "Maximum Packet Version", "dccp.max_pkt_vers", FT_UINT8, BASE_DEC, NULL, 0, "Maximum Packet Version", HFILL }}, - { &hf_dccp_qdelay_ms, { + { &hf_dccp_qdelay_ms, { "Client Delay", "dccp.qdelay_ms", FT_UINT16, BASE_DEC, NULL, 0, "Client Delay", HFILL }}, - { &hf_dccp_brand, { + { &hf_dccp_brand, { "Server Brand", "dccp.brand", FT_STRING, BASE_DEC, NULL, 0, "Server Brand", HFILL }}, - { &hf_dccp_ck_type, { + { &hf_dccp_ck_type, { "Type", "dccp.checksum.type", FT_UINT8, BASE_DEC, VALS(dccp_cktype_vals), 0, "Checksum Type", HFILL }}, - { &hf_dccp_ck_len, { + { &hf_dccp_ck_len, { "Length", "dccp.checksum.length", FT_UINT8, BASE_DEC, NULL, 0, "Checksum Length", HFILL }}, - { &hf_dccp_ck_sum, { + { &hf_dccp_ck_sum, { "Sum", "dccp.checksum.sum", FT_BYTES, BASE_HEX, NULL, 0, "Checksum", HFILL }}, - { &hf_dccp_target, { + { &hf_dccp_target, { "Target", "dccp.target", FT_UINT32, BASE_HEX, NULL, 0, "Target", HFILL }}, - { &hf_dccp_date, { + { &hf_dccp_date, { "Date", "dccp.date", FT_ABSOLUTE_TIME, BASE_DEC, NULL, 0, "Date", HFILL }}, - { &hf_dccp_adminop, { + { &hf_dccp_adminop, { "Admin Op", "dccp.adminop", FT_UINT8, BASE_DEC, VALS(dccp_adminop_vals), 0, "Admin Op", HFILL }}, - { &hf_dccp_adminval, { + { &hf_dccp_adminval, { "Admin Value", "dccp.adminval", FT_UINT32, BASE_DEC, NULL, 0, "Admin Value", HFILL }}, - { &hf_dccp_trace, { + { &hf_dccp_trace, { "Trace Bits", "dccp.trace", FT_UINT32, BASE_HEX, NULL, 0, "Trace Bits", HFILL }}, diff --git a/packet-dccp.h b/packet-dccp.h index 37067b8272..50222c4cf9 100644 --- a/packet-dccp.h +++ b/packet-dccp.h @@ -4,24 +4,24 @@ * * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-dccp.h,v 1.2 2002/05/05 22:20:11 guy Exp $ + * $Id: packet-dccp.h,v 1.3 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -59,7 +59,7 @@ header. * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * Rhyolite Software DCC 1.0.53-1.45 $Revision: 1.2 $ + * Rhyolite Software DCC 1.0.53-1.45 $Revision: 1.3 $ */ #ifndef DCC_PROTO_H diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c index 5c27e5e948..55f10ebbd9 100644 --- a/packet-dcerpc-browser.c +++ b/packet-dcerpc-browser.c @@ -2,28 +2,28 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2001, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.c,v 1.7 2002/06/24 00:03:16 tpot Exp $ + * $Id: packet-dcerpc-browser.c,v 1.8 2002/08/28 21:00:08 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The IDL file for this interface can be extracted by grepping for idl +/* The IDL file for this interface can be extracted by grepping for idl * in capitals. */ @@ -50,8 +50,8 @@ static gint ett_dcerpc_browser = -1; static int -dissect_browser_long_pointer(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_browser_long_pointer(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -194,12 +194,12 @@ dissect_browser_TYPE_2(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; switch(level){ - case 100: + case 100: offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_3, NDR_POINTER_UNIQUE, "unknown TYPE_3", -1, -1); break; - case 101: + case 101: offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_4, NDR_POINTER_UNIQUE, "unknown TYPE_4", -1, -1); @@ -460,7 +460,7 @@ dissect_browser_UNKNOWN_04_reply(tvbuff_t *tvb, int offset, IDL long element_44; IDL TYPE_6 element_45; IDL } TYPE_5; - IDL + IDL IDL typedef struct { IDL hyper element_46; IDL } TYPE_6; @@ -797,12 +797,12 @@ dissect_browser_TYPE_8(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; switch(level){ - case 100: + case 100: offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_9, NDR_POINTER_UNIQUE, "unknown TYPE_9", -1, -1); break; - case 101: + case 101: offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_10, NDR_POINTER_UNIQUE, "unknown TYPE_10", -1, -1); @@ -1077,7 +1077,7 @@ dissect_browser_UNKNOWN_0b_reply(tvbuff_t *tvb, int offset, IDL } */ static dcerpc_sub_dissector dcerpc_browser_dissectors[] = { - { BROWSER_UNKNOWN_00, "BROWSER_UNKNOWN_00", + { BROWSER_UNKNOWN_00, "BROWSER_UNKNOWN_00", dissect_browser_UNKNOWN_00_rqst, dissect_browser_UNKNOWN_00_reply }, { BROWSER_UNKNOWN_01, "BROWSER_UNKNOWN_01", @@ -1110,35 +1110,35 @@ static dcerpc_sub_dissector dcerpc_browser_dissectors[] = { { BROWSER_UNKNOWN_0a, "BROWSER_UNKNOWN_0a", dissect_browser_UNKNOWN_0a_rqst, dissect_browser_UNKNOWN_0a_reply }, - { BROWSER_UNKNOWN_0b, "BROWSER_UNKNOWN_0b", + { BROWSER_UNKNOWN_0b, "BROWSER_UNKNOWN_0b", dissect_browser_UNKNOWN_0b_rqst, dissect_browser_UNKNOWN_0b_reply }, {0, NULL, NULL, NULL } }; -void +void proto_register_dcerpc_browser(void) { static hf_register_info hf[] = { - { &hf_browser_rc, { - "Return code", "rpc_browser.rc", FT_UINT32, BASE_HEX, + { &hf_browser_rc, { + "Return code", "rpc_browser.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "Browser return code", HFILL }}, - { &hf_browser_unknown_long, { - "Unknown long", "rpc_browser.unknown.long", FT_UINT32, BASE_HEX, + { &hf_browser_unknown_long, { + "Unknown long", "rpc_browser.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }}, - - { &hf_browser_unknown_hyper, { - "Unknown hyper", "rpc_browser.unknown.hyper", FT_UINT64, BASE_HEX, + + { &hf_browser_unknown_hyper, { + "Unknown hyper", "rpc_browser.unknown.hyper", FT_UINT64, BASE_HEX, NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }}, - - { &hf_browser_unknown_bytes, { - "Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_HEX, + + { &hf_browser_unknown_bytes, { + "Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_HEX, NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }}, - { &hf_browser_unknown_string, { - "Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX, + { &hf_browser_unknown_string, { + "Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX, NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }} }; @@ -1149,7 +1149,7 @@ static hf_register_info hf[] = { proto_dcerpc_browser = proto_register_protocol( "RPC Browser", "RPC_BROWSER", "rpc_browser"); - proto_register_field_array(proto_dcerpc_browser, hf, + proto_register_field_array(proto_dcerpc_browser, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } @@ -1159,7 +1159,7 @@ proto_reg_handoff_dcerpc_browser(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_browser, ett_dcerpc_browser, - &uuid_dcerpc_browser, ver_dcerpc_browser, + dcerpc_init_uuid(proto_dcerpc_browser, ett_dcerpc_browser, + &uuid_dcerpc_browser, ver_dcerpc_browser, dcerpc_browser_dissectors, -1); } diff --git a/packet-dcerpc-browser.h b/packet-dcerpc-browser.h index ce4710a479..4f5f67879a 100644 --- a/packet-dcerpc-browser.h +++ b/packet-dcerpc-browser.h @@ -2,22 +2,22 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.h,v 1.1 2002/05/28 12:07:59 sahlberg Exp $ + * $Id: packet-dcerpc-browser.h,v 1.2 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-dfs.c b/packet-dcerpc-dfs.c index 12b2228394..e68378190b 100644 --- a/packet-dcerpc-dfs.c +++ b/packet-dcerpc-dfs.c @@ -2,22 +2,22 @@ * Routines for SMB \\PIPE\\netdfs packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-dfs.c,v 1.4 2002/06/24 00:03:17 tpot Exp $ + * $Id: packet-dcerpc-dfs.c,v 1.5 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -63,7 +63,7 @@ static const value_string dfs_opnum_vals[] = { { 0, NULL }, }; -void +void proto_register_dcerpc_dfs(void) { static hf_register_info hf[] = { diff --git a/packet-dcerpc-dfs.h b/packet-dcerpc-dfs.h index e6af5931c5..3bd5bdede5 100644 --- a/packet-dcerpc-dfs.h +++ b/packet-dcerpc-dfs.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\netdfs packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-dfs.h,v 1.3 2001/12/16 20:08:22 guy Exp $ + * $Id: packet-dcerpc-dfs.h,v 1.4 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c index 70a401013e..ecacc7f195 100644 --- a/packet-dcerpc-epm.c +++ b/packet-dcerpc-epm.c @@ -2,7 +2,7 @@ * Routines for dcerpc endpoint mapper dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-epm.c,v 1.13 2002/08/04 00:45:49 sahlberg Exp $ + * $Id: packet-dcerpc-epm.c,v 1.14 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -68,8 +68,8 @@ static guint16 ver_epm = 3; static int -epm_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 dummy; @@ -106,8 +106,8 @@ epm_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, static int -epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -121,8 +121,8 @@ epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, #if 0 static int -epm_dissect_uuid (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_uuid (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, @@ -167,10 +167,10 @@ static const value_string proto_id_vals[] = { /* XXX this function assumes LE encoding. can not use the NDR routines since they assume padding. -*/ +*/ static int -epm_dissect_tower_data (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_tower_data (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint16 num_floors, i; @@ -202,7 +202,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, proto_id = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tr, hf_epm_tower_proto_id, tvb, offset, 1, proto_id); - + switch(proto_id){ case 0x0d: /* UUID */ dcerpc_tvb_get_uuid (tvb, offset+1, drep, &uuid); @@ -217,7 +217,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, break; } offset += len; - + len = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tr, hf_epm_tower_rhs_len, tvb, offset, 2, len); offset += 2; @@ -250,8 +250,8 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, } twr_t, *twr_p_t; */ static int -epm_dissect_tower (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_tower (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len; @@ -273,8 +273,8 @@ epm_dissect_tower (tvbuff_t *tvb, int offset, return offset; } static int -epm_dissect_tower_pointer (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_tower_pointer (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -283,8 +283,8 @@ epm_dissect_tower_pointer (tvbuff_t *tvb, int offset, return offset; } static int -epm_dissect_tower_array (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_tower_array (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, @@ -294,8 +294,8 @@ epm_dissect_tower_array (tvbuff_t *tvb, int offset, } static int -epm_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { /* [in] handle_t h */ @@ -328,8 +328,8 @@ epm_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, } static int -epm_dissect_ept_map_resp (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +epm_dissect_ept_map_resp (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ @@ -355,11 +355,11 @@ epm_dissect_ept_map_resp (tvbuff_t *tvb, int offset, static dcerpc_sub_dissector epm_dissectors[] = { { 0, "ept_insert", NULL, NULL }, { 1, "ept_delete", NULL, NULL }, - { 2, "ept_lookup", - epm_dissect_ept_lookup_rqst, + { 2, "ept_lookup", + epm_dissect_ept_lookup_rqst, epm_dissect_ept_lookup_resp }, - { 3, "Map", - epm_dissect_ept_map_rqst, + { 3, "Map", + epm_dissect_ept_map_rqst, epm_dissect_ept_map_resp }, { 4, "ept_lookup_handle_free", NULL, NULL }, { 5, "ept_inq_object", NULL, NULL }, @@ -400,15 +400,15 @@ proto_register_epm (void) { &hf_epm_ver_min, { "Version Minor", "epm.ver_min", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_epm_ver_opt, - { "Version Option", "epm.ver_opt", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Version Option", "epm.ver_opt", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_epm_hnd, - { "Handle", "epm.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "Context handle", HFILL }}, + { "Handle", "epm.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "Context handle", HFILL }}, { &hf_epm_max_ents, { "Max entries", "epm.max_ents", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_epm_num_ents, { "Num entries", "epm.num_ents", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_epm_uuid, - { "UUID", "epm.uuid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, + { "UUID", "epm.uuid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, { &hf_epm_tower_length, { "Length", "epm.tower.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of tower data", HFILL }}, { &hf_epm_tower_data, diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c index 2fa6087b29..2a56f27350 100644 --- a/packet-dcerpc-lsa.c +++ b/packet-dcerpc-lsa.c @@ -3,22 +3,22 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 Added LSA command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-lsa.c,v 1.57 2002/08/27 19:02:51 guy Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.58 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -160,8 +160,8 @@ static gint ett_lsa_auth_information = -1; static int -lsa_dissect_pointer_NTTIME(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +lsa_dissect_pointer_NTTIME(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -179,8 +179,8 @@ lsa_dissect_pointer_NTTIME(tvbuff_t *tvb, int offset, } static int -lsa_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +lsa_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -197,8 +197,8 @@ lsa_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, } static int -lsa_dissect_pointer_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +lsa_dissect_pointer_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -217,8 +217,8 @@ lsa_dissect_pointer_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, } static int -lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -236,7 +236,7 @@ lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, static int -lsa_dissect_LSA_SECRET_data(tvbuff_t *tvb, int offset, +lsa_dissect_LSA_SECRET_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -295,13 +295,13 @@ lsa_dissect_LSA_SECRET_pointer(tvbuff_t *tvb, int offset, } int -lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, +lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len; dcerpc_info *di; - + di=pinfo->private_data; if(di->conformant_run){ /*just a run to handle conformant arrays, nothing to dissect */ @@ -452,7 +452,7 @@ lsa_dissect_ACCESS_MASK(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_access_mask( - tvb, offset, pinfo, tree, drep, hf_lsa_access_mask, + tvb, offset, pinfo, tree, drep, hf_lsa_access_mask, lsa_specific_rights); return offset; @@ -516,7 +516,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset, lsa_dissect_LPSTR, NDR_POINTER_UNIQUE, "LSPTR pointer: ", -1, 0); - /* attribute name */ + /* attribute name */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_pointer_STRING, NDR_POINTER_UNIQUE, "NAME pointer: ", hf_lsa_obj_attr_name, 0); @@ -530,7 +530,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset, lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, "LSA_SECURITY_DESCRIPTOR pointer: ", -1, 0); - /* security quality of service */ + /* security quality of service */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_SECURITY_QUALITY_OF_SERVICE, NDR_POINTER_UNIQUE, "LSA_SECURITY_QUALITY_OF_SERVICE pointer: ", -1, 0); @@ -567,11 +567,11 @@ lsa_dissect_lsaclose_reply(tvbuff_t *tvb, int offset, character of the server name which is always '\'. This is fixed in lsa openpolicy2 but the function remains for backwards compatibility. */ -static int dissect_lsa_openpolicy_server(tvbuff_t *tvb, int offset, - packet_info *pinfo, +static int dissect_lsa_openpolicy_server(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - return dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, + return dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_lsa_server, NULL); } @@ -1047,7 +1047,7 @@ lsa_dissect_POLICY_INFORMATION(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; /* all union arms aligned to 4 bytes, case 7 and 9 need this */ switch(level){ - case 1: + case 1: offset = lsa_dissect_POLICY_AUDIT_LOG_INFO( tvb, offset, pinfo, tree, drep); break; @@ -1394,7 +1394,7 @@ static const true_false_string tfs_trust_attr_tree_root = { "Tree root is NOT set" }; static int -lsa_dissect_trust_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, +lsa_dissect_trust_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { guint32 mask; @@ -1455,7 +1455,7 @@ lsa_dissect_LSA_TRUST_INFORMATION_EX(tvbuff_t *tvb, int offset, /* type */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_lsa_trust_type, NULL); - + /* attributes */ offset = lsa_dissect_trust_attr(tvb, offset, pinfo, tree, drep); @@ -1878,7 +1878,7 @@ lsa_dissect_LSA_PRIVILEGE(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_LSA_PRIVILEGE); } - /* privilege name */ + /* privilege name */ offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_lsa_privilege_name, 0); @@ -1965,7 +1965,7 @@ lsa_dissect_lsalookupprivilegevalue_rqst(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_HANDLE(tvb, offset, pinfo, tree, drep); - /* privilege name */ + /* privilege name */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "NAME pointer: ", hf_lsa_privilege_name, 0); @@ -2380,7 +2380,7 @@ lsa_dissect_LSA_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_UNICODE_STRING_array, NDR_POINTER_UNIQUE, "UNICODE_STRING pointer: ", di->hf_index, 0); - + return offset; } @@ -2598,7 +2598,7 @@ lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; /* all union arms aligned to 4 bytes, case 7 and 9 need this */ switch(level){ - case 1: + case 1: offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_lsa_domain, 0); break; @@ -4107,7 +4107,7 @@ static const value_string lsa_opnum_vals[] = { { 0, NULL } }; -void +void proto_register_dcerpc_lsa(void) { static hf_register_info hf[] = { @@ -4121,7 +4121,7 @@ proto_register_dcerpc_lsa(void) NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_lsa_hnd, - { "Context Handle", "lsa.hnd", FT_BYTES, BASE_NONE, + { "Context Handle", "lsa.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "LSA policy handle", HFILL }}, { &hf_lsa_server, @@ -4133,211 +4133,211 @@ proto_register_dcerpc_lsa(void) NULL, 0, "Name of Domain Controller", HFILL }}, { &hf_lsa_unknown_hyper, - { "Unknown hyper", "lsa.unknown.hyper", FT_UINT64, BASE_HEX, + { "Unknown hyper", "lsa.unknown.hyper", FT_UINT64, BASE_HEX, NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_lsa_unknown_long, - { "Unknown long", "lsa.unknown.long", FT_UINT32, BASE_HEX, + { "Unknown long", "lsa.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_lsa_unknown_short, - { "Unknown short", "lsa.unknown.short", FT_UINT16, BASE_HEX, + { "Unknown short", "lsa.unknown.short", FT_UINT16, BASE_HEX, NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_lsa_unknown_char, - { "Unknown char", "lsa.unknown.char", FT_UINT8, BASE_HEX, + { "Unknown char", "lsa.unknown.char", FT_UINT8, BASE_HEX, NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_lsa_rc, - { "Return code", "lsa.rc", FT_UINT32, BASE_HEX, + { "Return code", "lsa.rc", FT_UINT32, BASE_HEX, VALS (NT_errors), 0x0, "LSA return status code", HFILL }}, { &hf_lsa_obj_attr, - { "Attributes", "lsa.obj_attr", FT_UINT32, BASE_HEX, + { "Attributes", "lsa.obj_attr", FT_UINT32, BASE_HEX, NULL, 0x0, "LSA Attributes", HFILL }}, { &hf_lsa_obj_attr_len, - { "Length", "lsa.obj_attr.len", FT_UINT32, BASE_DEC, + { "Length", "lsa.obj_attr.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of object attribute structure", HFILL }}, { &hf_lsa_obj_attr_name, - { "Name", "lsa.obj_attr.name", FT_STRING, BASE_NONE, + { "Name", "lsa.obj_attr.name", FT_STRING, BASE_NONE, NULL, 0x0, "Name of object attribute", HFILL }}, { &hf_lsa_access_mask, - { "Access Mask", "lsa.access_mask", FT_UINT32, BASE_HEX, + { "Access Mask", "lsa.access_mask", FT_UINT32, BASE_HEX, NULL, 0x0, "LSA Access Mask", HFILL }}, { &hf_lsa_info_level, - { "Level", "lsa.info.level", FT_UINT16, BASE_DEC, + { "Level", "lsa.info.level", FT_UINT16, BASE_DEC, NULL, 0x0, "Information level of requested data", HFILL }}, { &hf_lsa_trusted_info_level, - { "Info Level", "lsa.trusted.info_level", FT_UINT16, BASE_DEC, + { "Info Level", "lsa.trusted.info_level", FT_UINT16, BASE_DEC, VALS(trusted_info_level_vals), 0x0, "Information level of requested Trusted Domain Information", HFILL }}, { &hf_lsa_sd_size, - { "Size", "lsa.sd_size", FT_UINT32, BASE_DEC, + { "Size", "lsa.sd_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of lsa security descriptor", HFILL }}, { &hf_lsa_qos_len, - { "Length", "lsa.qos.len", FT_UINT32, BASE_DEC, + { "Length", "lsa.qos.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of quality of service structure", HFILL }}, { &hf_lsa_qos_impersonation_level, - { "Impersonation level", "lsa.qos.imp_lev", FT_UINT16, BASE_DEC, + { "Impersonation level", "lsa.qos.imp_lev", FT_UINT16, BASE_DEC, VALS(lsa_impersonation_level_vals), 0x0, "QOS Impersonation Level", HFILL }}, { &hf_lsa_qos_track_context, - { "Context Tracking", "lsa.qos.track_ctx", FT_UINT8, BASE_DEC, + { "Context Tracking", "lsa.qos.track_ctx", FT_UINT8, BASE_DEC, NULL, 0x0, "QOS Context Tracking Mode", HFILL }}, { &hf_lsa_qos_effective_only, - { "Effective only", "lsa.qos.effective_only", FT_UINT8, BASE_DEC, + { "Effective only", "lsa.qos.effective_only", FT_UINT8, BASE_DEC, NULL, 0x0, "QOS Flag whether this is Effective Only or not", HFILL }}, { &hf_lsa_pali_percent_full, - { "Percent Full", "lsa.pali.percent_full", FT_UINT32, BASE_DEC, + { "Percent Full", "lsa.pali.percent_full", FT_UINT32, BASE_DEC, NULL, 0x0, "How full audit log is in percentage", HFILL }}, { &hf_lsa_pali_log_size, - { "Log Size", "lsa.pali.log_size", FT_UINT32, BASE_DEC, + { "Log Size", "lsa.pali.log_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of audit log", HFILL }}, { &hf_lsa_pali_retention_period, - { "Retention Period", "lsa.pali.retention_period", FT_RELATIVE_TIME, BASE_NONE, + { "Retention Period", "lsa.pali.retention_period", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_lsa_pali_time_to_shutdown, - { "Time to shutdown", "lsa.pali.time_to_shutdown", FT_RELATIVE_TIME, BASE_NONE, + { "Time to shutdown", "lsa.pali.time_to_shutdown", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time to shutdown", HFILL }}, - { &hf_lsa_pali_shutdown_in_progress, - { "Shutdown in progress", "lsa.pali.shutdown_in_progress", FT_UINT8, BASE_DEC, + { &hf_lsa_pali_shutdown_in_progress, + { "Shutdown in progress", "lsa.pali.shutdown_in_progress", FT_UINT8, BASE_DEC, NULL, 0x0, "Flag whether shutdown is in progress or not", HFILL }}, { &hf_lsa_pali_next_audit_record, - { "Next Audit Record", "lsa.pali.next_audit_record", FT_UINT32, BASE_HEX, + { "Next Audit Record", "lsa.pali.next_audit_record", FT_UINT32, BASE_HEX, NULL, 0x0, "Next audit record", HFILL }}, { &hf_lsa_paei_enabled, - { "Enabled", "lsa.paei.enabled", FT_UINT8, BASE_DEC, + { "Enabled", "lsa.paei.enabled", FT_UINT8, BASE_DEC, NULL, 0x0, "If Audit Events Information is Enabled or not", HFILL }}, { &hf_lsa_paei_settings, - { "Settings", "lsa.paei.settings", FT_UINT32, BASE_HEX, + { "Settings", "lsa.paei.settings", FT_UINT32, BASE_HEX, NULL, 0x0, "Audit Events Information settings", HFILL }}, { &hf_lsa_count, - { "Count", "lsa.count", FT_UINT32, BASE_DEC, + { "Count", "lsa.count", FT_UINT32, BASE_DEC, NULL, 0x0, "Count of objects", HFILL }}, { &hf_lsa_max_count, - { "Max Count", "lsa.max_count", FT_UINT32, BASE_DEC, + { "Max Count", "lsa.max_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_domain, - { "Domain", "lsa.domain", FT_STRING, BASE_NONE, + { "Domain", "lsa.domain", FT_STRING, BASE_NONE, NULL, 0x0, "Domain", HFILL }}, { &hf_lsa_acct, - { "Account", "lsa.acct", FT_STRING, BASE_NONE, + { "Account", "lsa.acct", FT_STRING, BASE_NONE, NULL, 0x0, "Account", HFILL }}, { &hf_lsa_source, - { "Source", "lsa.source", FT_STRING, BASE_NONE, + { "Source", "lsa.source", FT_STRING, BASE_NONE, NULL, 0x0, "Replica Source", HFILL }}, { &hf_lsa_server_role, - { "Role", "lsa.server_role", FT_UINT16, BASE_DEC, + { "Role", "lsa.server_role", FT_UINT16, BASE_DEC, VALS(server_role_vals), 0x0, "LSA Server Role", HFILL }}, { &hf_lsa_quota_paged_pool, - { "Paged Pool", "lsa.quota.paged_pool", FT_UINT32, BASE_DEC, + { "Paged Pool", "lsa.quota.paged_pool", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of Quota Paged Pool", HFILL }}, { &hf_lsa_quota_non_paged_pool, - { "Non Paged Pool", "lsa.quota.non_paged_pool", FT_UINT32, BASE_DEC, + { "Non Paged Pool", "lsa.quota.non_paged_pool", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of Quota non-Paged Pool", HFILL }}, { &hf_lsa_quota_min_wss, - { "Min WSS", "lsa.quota.min_wss", FT_UINT32, BASE_DEC, + { "Min WSS", "lsa.quota.min_wss", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of Quota Min WSS", HFILL }}, { &hf_lsa_quota_max_wss, - { "Max WSS", "lsa.quota.max_wss", FT_UINT32, BASE_DEC, + { "Max WSS", "lsa.quota.max_wss", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of Quota Max WSS", HFILL }}, { &hf_lsa_quota_pagefile, - { "Pagefile", "lsa.quota.pagefile", FT_UINT32, BASE_DEC, + { "Pagefile", "lsa.quota.pagefile", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of quota pagefile usage", HFILL }}, { &hf_lsa_mod_seq_no, - { "Seq No", "lsa.mod.seq_no", FT_UINT64, BASE_DEC, + { "Seq No", "lsa.mod.seq_no", FT_UINT64, BASE_DEC, NULL, 0x0, "Sequence number for this modification", HFILL }}, { &hf_lsa_mod_mtime, - { "MTime", "lsa.mod.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "MTime", "lsa.mod.mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Time when this modification occured", HFILL }}, { &hf_lsa_cur_mtime, - { "Current MTime", "lsa.cur.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Current MTime", "lsa.cur.mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Current MTime to set", HFILL }}, { &hf_lsa_old_mtime, - { "Old MTime", "lsa.old.mtime", FT_ABSOLUTE_TIME, BASE_NONE, + { "Old MTime", "lsa.old.mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Old MTime for this object", HFILL }}, { &hf_lsa_name, - { "Name", "lsa.name", FT_STRING, BASE_NONE, + { "Name", "lsa.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_lsa_key, - { "Key", "lsa.key", FT_STRING, BASE_NONE, + { "Key", "lsa.key", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_lsa_flat_name, - { "Flat Name", "lsa.flat_name", FT_STRING, BASE_NONE, + { "Flat Name", "lsa.flat_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_lsa_forest, - { "Forest", "lsa.forest", FT_STRING, BASE_NONE, + { "Forest", "lsa.forest", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_lsa_info_type, - { "Info Type", "lsa.info_type", FT_UINT32, BASE_DEC, + { "Info Type", "lsa.info_type", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_new_pwd, - { "New Password", "lsa.new_pwd", FT_BYTES, BASE_HEX, + { "New Password", "lsa.new_pwd", FT_BYTES, BASE_HEX, NULL, 0x0, "New password", HFILL }}, { &hf_lsa_old_pwd, - { "Old Password", "lsa.old_pwd", FT_BYTES, BASE_HEX, + { "Old Password", "lsa.old_pwd", FT_BYTES, BASE_HEX, NULL, 0x0, "Old password", HFILL }}, { &hf_lsa_sid_type, - { "SID Type", "lsa.sid_type", FT_UINT16, BASE_DEC, + { "SID Type", "lsa.sid_type", FT_UINT16, BASE_DEC, VALS(sid_type_vals), 0x0, "Type of SID", HFILL }}, { &hf_lsa_rid, - { "RID", "lsa.rid", FT_UINT32, BASE_HEX, + { "RID", "lsa.rid", FT_UINT32, BASE_HEX, NULL, 0x0, "RID", HFILL }}, { &hf_lsa_rid_offset, - { "RID Offset", "lsa.rid.offset", FT_UINT32, BASE_HEX, + { "RID Offset", "lsa.rid.offset", FT_UINT32, BASE_HEX, NULL, 0x0, "RID Offset", HFILL }}, { &hf_lsa_index, - { "Index", "lsa.index", FT_UINT32, BASE_DEC, + { "Index", "lsa.index", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_num_mapped, - { "Num Mapped", "lsa.num_mapped", FT_UINT32, BASE_DEC, + { "Num Mapped", "lsa.num_mapped", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_policy_information_class, - { "Info Class", "lsa.policy.info", FT_UINT16, BASE_DEC, + { "Info Class", "lsa.policy.info", FT_UINT16, BASE_DEC, VALS(policy_information_class_vals), 0x0, "Policy information class", HFILL }}, { &hf_lsa_secret, @@ -4349,55 +4349,55 @@ proto_register_dcerpc_lsa(void) NULL, 0, "", HFILL }}, { &hf_nt_luid_high, - { "High", "nt.luid.high", FT_UINT32, BASE_HEX, + { "High", "nt.luid.high", FT_UINT32, BASE_HEX, NULL, 0x0, "LUID High component", HFILL }}, { &hf_nt_luid_low, - { "Low", "nt.luid.low", FT_UINT32, BASE_HEX, + { "Low", "nt.luid.low", FT_UINT32, BASE_HEX, NULL, 0x0, "LUID Low component", HFILL }}, { &hf_lsa_size, - { "Size", "lsa.size", FT_UINT32, BASE_DEC, + { "Size", "lsa.size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_size16, - { "Size", "lsa.size", FT_UINT16, BASE_DEC, + { "Size", "lsa.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_size_needed, - { "Size Needed", "lsa.size_needed", FT_UINT16, BASE_DEC, + { "Size Needed", "lsa.size_needed", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_lsa_privilege_name, - { "Name", "lsa.privilege.name", FT_STRING, BASE_NONE, + { "Name", "lsa.privilege.name", FT_STRING, BASE_NONE, NULL, 0x0, "LSA Privilege Name", HFILL }}, { &hf_lsa_rights, - { "Rights", "lsa.rights", FT_STRING, BASE_NONE, + { "Rights", "lsa.rights", FT_STRING, BASE_NONE, NULL, 0x0, "Account Rights", HFILL }}, { &hf_lsa_attr, - { "Attr", "lsa.attr", FT_UINT64, BASE_HEX, + { "Attr", "lsa.attr", FT_UINT64, BASE_HEX, NULL, 0x0, "LSA Attributes", HFILL }}, { &hf_lsa_auth_update, - { "Update", "lsa.auth.update", FT_UINT64, BASE_HEX, + { "Update", "lsa.auth.update", FT_UINT64, BASE_HEX, NULL, 0x0, "LSA Auth Info update", HFILL }}, { &hf_lsa_resume_handle, - { "Resume Handle", "lsa.resume_handle", FT_UINT32, BASE_DEC, + { "Resume Handle", "lsa.resume_handle", FT_UINT32, BASE_DEC, NULL, 0x0, "Resume Handle", HFILL }}, { &hf_lsa_trust_direction, - { "Trust Direction", "lsa.trust.direction", FT_UINT32, BASE_DEC, + { "Trust Direction", "lsa.trust.direction", FT_UINT32, BASE_DEC, VALS(trusted_direction_vals), 0x0, "Trust direction", HFILL }}, { &hf_lsa_trust_type, - { "Trust Type", "lsa.trust.type", FT_UINT32, BASE_DEC, + { "Trust Type", "lsa.trust.type", FT_UINT32, BASE_DEC, VALS(trusted_type_vals), 0x0, "Trust type", HFILL }}, { &hf_lsa_trust_attr, - { "Trust Attr", "lsa.trust.attr", FT_UINT32, BASE_HEX, + { "Trust Attr", "lsa.trust.attr", FT_UINT32, BASE_HEX, NULL, 0x0, "Trust attributes", HFILL }}, { &hf_lsa_trust_attr_non_trans, @@ -4417,70 +4417,70 @@ proto_register_dcerpc_lsa(void) TFS(&tfs_trust_attr_tree_root), 0x00800000, "Tree Root trust", HFILL }}, { &hf_lsa_auth_type, - { "Auth Type", "lsa.auth.type", FT_UINT32, BASE_DEC, + { "Auth Type", "lsa.auth.type", FT_UINT32, BASE_DEC, NULL, 0x0, "Auth Info type", HFILL }}, { &hf_lsa_auth_len, - { "Auth Len", "lsa.auth.len", FT_UINT32, BASE_DEC, + { "Auth Len", "lsa.auth.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Auth Info len", HFILL }}, { &hf_lsa_remove_all, - { "Remove All", "lsa.remove_all", FT_UINT8, BASE_DEC, + { "Remove All", "lsa.remove_all", FT_UINT8, BASE_DEC, NULL, 0x0, "Flag whether all rights should be removed or only the specified ones", HFILL }}, - + { &hf_view_local_info, - { "View local info", "lsa.access_mask.view_local_info", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_VIEW_LOCAL_INFORMATION, + { "View local info", "lsa.access_mask.view_local_info", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_VIEW_LOCAL_INFORMATION, "View local info", HFILL }}, { &hf_view_audit_info, - { "View audit info", "lsa.access_mask.view_audit_info", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_VIEW_AUDIT_INFORMATION, + { "View audit info", "lsa.access_mask.view_audit_info", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_VIEW_AUDIT_INFORMATION, "View audit info", HFILL }}, { &hf_get_private_info, - { "Get private info", "lsa.access_mask.get_privateinfo", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_GET_PRIVATE_INFORMATION, + { "Get private info", "lsa.access_mask.get_privateinfo", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_GET_PRIVATE_INFORMATION, "Get private info", HFILL }}, { &hf_trust_admin, - { "Trust admin", "lsa.access_mask.trust_admin", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_TRUST_ADMIN, + { "Trust admin", "lsa.access_mask.trust_admin", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_TRUST_ADMIN, "Trust admin", HFILL }}, { &hf_create_account, - { "Create account", "lsa.access_mask.create_account", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_ACCOUNT, + { "Create account", "lsa.access_mask.create_account", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_ACCOUNT, "Create account", HFILL }}, { &hf_create_secret, - { "Create secret", "lsa.access_mask.create_secret", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_SECRET, + { "Create secret", "lsa.access_mask.create_secret", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_SECRET, "Create secret", HFILL }}, { &hf_create_priv, - { "Create privilege", "lsa.access_mask.create_priv", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_PRIVILEGE, + { "Create privilege", "lsa.access_mask.create_priv", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_CREATE_PRIVILEGE, "Create privilege", HFILL }}, { &hf_set_default_quota_limits, - { "Set default quota limits", "lsa.access_mask.set_default_quota_limits", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SET_DEFAULT_QUOTA_LIMITS, + { "Set default quota limits", "lsa.access_mask.set_default_quota_limits", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SET_DEFAULT_QUOTA_LIMITS, "Set default quota limits", HFILL }}, { &hf_set_audit_requirements, - { "Set audit requirements", "lsa.access_mask.set_audit_requirements", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SET_AUDIT_REQUIREMENTS, + { "Set audit requirements", "lsa.access_mask.set_audit_requirements", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SET_AUDIT_REQUIREMENTS, "Set audit requirements", HFILL }}, { &hf_server_admin, - { "Server admin", "lsa.access_mask.server_admin", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SERVER_ADMIN, + { "Server admin", "lsa.access_mask.server_admin", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_SERVER_ADMIN, "Server admin", HFILL }}, { &hf_lookup_names, - { "Lookup names", "lsa.access_mask.lookup_names", - FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_LOOKUP_NAMES, + { "Lookup names", "lsa.access_mask.lookup_names", + FT_BOOLEAN, 32, TFS(&flags_set_truth), POLICY_LOOKUP_NAMES, "Lookup names", HFILL }} }; @@ -4529,7 +4529,7 @@ proto_register_dcerpc_lsa(void) /* Protocol handoff */ static e_uuid_t uuid_dcerpc_lsa = { - 0x12345778, 0x1234, 0xabcd, + 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab} }; diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h index 5c7ffa203e..b806e555ac 100644 --- a/packet-dcerpc-lsa.h +++ b/packet-dcerpc-lsa.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\lsarpc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-lsa.h,v 1.8 2002/08/21 21:31:15 tpot Exp $ + * $Id: packet-dcerpc-lsa.h,v 1.9 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -88,11 +88,11 @@ #define LSA_LSAFUNCTION_3B 0x3b int -lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, +lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep); int -lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, +lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep); int diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index 67b59cbb9b..cb777f54c6 100644 --- a/packet-dcerpc-mapi.c +++ b/packet-dcerpc-mapi.c @@ -2,22 +2,22 @@ * Routines for MS Exchange MAPI * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.c,v 1.12 2002/06/24 00:03:17 tpot Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.13 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -190,15 +190,15 @@ mapi_decrypt_pdu(tvbuff_t *tvb, int offset, It seems that ASCII text strings always are NULL terminated, also no obvious string-length-byte can be seen so it seems the - length of strings are determined by searching the terminating null + length of strings are determined by searching the terminating null byte. The first two bytes of the PDU is the length of the PDU including the two length bytes. The third byte may be a subcommand byte ? - After the PDU comes, in requests a 4 byte thing. Which is either - (not very often) 0xffffffff or something else. If it is + After the PDU comes, in requests a 4 byte thing. Which is either + (not very often) 0xffffffff or something else. If it is 'something else' these four bytes are repeated for the matching response packet. In some repsonse packets, this 4 byte trailer are sometimes followed @@ -241,7 +241,7 @@ mapi_logon_rqst(tvbuff_t *tvb, int offset, "unknown string", hf_mapi_unknown_string, -1); DISSECT_UNKNOWN(tvb_length_remaining(tvb, offset)); - + return offset; } @@ -284,7 +284,7 @@ mapi_unknown_02_request(tvbuff_t *tvb, int offset, if(!mapi_decrypt){ /* this is a unidimensional varying and conformant array of - encrypted data */ + encrypted data */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, "unknown data", hf_mapi_unknown_data, -1); @@ -310,14 +310,14 @@ mapi_unknown_02_reply(tvbuff_t *tvb, int offset, if(!mapi_decrypt){ /* this is a unidimensional varying and conformant array of - encrypted data */ + encrypted data */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, "unknown data", hf_mapi_unknown_data, -1); } else { offset = mapi_decrypt_pdu(tvb, offset, pinfo, tree, drep); } - + /* length of encrypted data */ offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_mapi_encap_datalen, NULL); @@ -353,30 +353,30 @@ mapi_logoff_reply(tvbuff_t *tvb, int offset, static dcerpc_sub_dissector dcerpc_mapi_dissectors[] = { - { MAPI_LOGON, "Logon", + { MAPI_LOGON, "Logon", mapi_logon_rqst, mapi_logon_reply }, - { MAPI_LOGOFF, "Logoff", + { MAPI_LOGOFF, "Logoff", mapi_logoff_rqst, mapi_logoff_reply }, - { MAPI_UNKNOWN_02, "unknown_02", + { MAPI_UNKNOWN_02, "unknown_02", mapi_unknown_02_request, mapi_unknown_02_reply }, {0, NULL, NULL, NULL } }; -void +void proto_register_dcerpc_mapi(void) { static hf_register_info hf[] = { { &hf_mapi_hnd, - { "Context Handle", "mapi.hnd", FT_BYTES, BASE_NONE, + { "Context Handle", "mapi.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_mapi_rc, - { "Return code", "mapi.rc", FT_UINT32, BASE_HEX, + { "Return code", "mapi.rc", FT_UINT32, BASE_HEX, VALS (NT_errors), 0x0, "", HFILL }}, { &hf_mapi_unknown_string, @@ -392,35 +392,35 @@ static hf_register_info hf[] = { NULL, 0, "Unknown data. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_mapi_encap_datalen, - { "Length", "mapi.encap_len", FT_UINT16, BASE_DEC, + { "Length", "mapi.encap_len", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of encapsulated/encrypted data", HFILL }}, { &hf_mapi_decrypted_data_maxlen, - { "Max Length", "mapi.decrypted.data.maxlen", FT_UINT32, BASE_DEC, + { "Max Length", "mapi.decrypted.data.maxlen", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum size of buffer for decrypted data", HFILL }}, { &hf_mapi_decrypted_data_offset, - { "Offset", "mapi.decrypted.data.offset", FT_UINT32, BASE_DEC, + { "Offset", "mapi.decrypted.data.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "Offset into buffer for decrypted data", HFILL }}, { &hf_mapi_decrypted_data_len, - { "Length", "mapi.decrypted.data.len", FT_UINT32, BASE_DEC, + { "Length", "mapi.decrypted.data.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Used size of buffer for decrypted data", HFILL }}, { &hf_mapi_decrypted_data, - { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_HEX, + { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_HEX, NULL, 0x0, "Decrypted data", HFILL }}, { &hf_mapi_pdu_len, - { "Length", "mapi.pdu.len", FT_UINT16, BASE_DEC, + { "Length", "mapi.pdu.len", FT_UINT16, BASE_DEC, NULL, 0x0, "Size of the command PDU", HFILL }}, { &hf_mapi_pdu_trailer, - { "Trailer", "mapi.pdu.trailer", FT_UINT32, BASE_HEX, + { "Trailer", "mapi.pdu.trailer", FT_UINT32, BASE_HEX, NULL, 0x0, "If you know what this is, contact ethereal developers", HFILL }}, { &hf_mapi_pdu_extra_trailer, - { "unknown", "mapi.pdu.extra_trailer", FT_BYTES, BASE_HEX, + { "unknown", "mapi.pdu.extra_trailer", FT_BYTES, BASE_HEX, NULL, 0x0, "If you know what this is, contact ethereal developers", HFILL }} }; @@ -434,7 +434,7 @@ static hf_register_info hf[] = { proto_dcerpc_mapi = proto_register_protocol( "Microsoft Exchange MAPI", "MAPI", "mapi"); - proto_register_field_array(proto_dcerpc_mapi, hf, + proto_register_field_array(proto_dcerpc_mapi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); mapi_module = prefs_register_protocol(proto_dcerpc_mapi, NULL); @@ -450,7 +450,7 @@ proto_reg_handoff_dcerpc_mapi(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_mapi, ett_dcerpc_mapi, - &uuid_dcerpc_mapi, ver_dcerpc_mapi, + dcerpc_init_uuid(proto_dcerpc_mapi, ett_dcerpc_mapi, + &uuid_dcerpc_mapi, ver_dcerpc_mapi, dcerpc_mapi_dissectors, -1); } diff --git a/packet-dcerpc-mapi.h b/packet-dcerpc-mapi.h index 6c30842c0c..6bfa57c38a 100644 --- a/packet-dcerpc-mapi.h +++ b/packet-dcerpc-mapi.h @@ -2,22 +2,22 @@ * Routines for MS Exchange MAPI dissection * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.h,v 1.2 2002/05/23 12:23:29 sahlberg Exp $ + * $Id: packet-dcerpc-mapi.h,v 1.3 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,4 +30,4 @@ #define MAPI_LOGOFF 0x01 #define MAPI_UNKNOWN_02 0x02 -#endif +#endif diff --git a/packet-dcerpc-ndr.c b/packet-dcerpc-ndr.c index 26fa720c7a..dcd91051fa 100644 --- a/packet-dcerpc-ndr.c +++ b/packet-dcerpc-ndr.c @@ -2,22 +2,22 @@ * Routines for DCERPC NDR dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-ndr.c,v 1.7 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-dcerpc-ndr.c,v 1.8 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -43,7 +43,7 @@ int dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint8 *pdata) { dcerpc_info *di; @@ -55,13 +55,13 @@ dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* no alignment needed */ - return dissect_dcerpc_uint8 (tvb, offset, pinfo, + return dissect_dcerpc_uint8 (tvb, offset, pinfo, tree, drep, hfindex, pdata); } int dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint16 *pdata) { dcerpc_info *di; @@ -76,13 +76,13 @@ dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, if (offset % 2) { offset++; } - return dissect_dcerpc_uint16 (tvb, offset, pinfo, + return dissect_dcerpc_uint16 (tvb, offset, pinfo, tree, drep, hfindex, pdata); } int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata) { dcerpc_info *di; @@ -97,13 +97,13 @@ dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, if (offset % 4) { offset += 4 - (offset % 4); } - return dissect_dcerpc_uint32 (tvb, offset, pinfo, + return dissect_dcerpc_uint32 (tvb, offset, pinfo, tree, drep, hfindex, pdata); } int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, unsigned char *pdata) { dcerpc_info *di; @@ -117,13 +117,13 @@ dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, if (offset % 4) { offset += 4 - (offset % 4); } - return dissect_dcerpc_uint64 (tvb, offset, pinfo, + return dissect_dcerpc_uint64 (tvb, offset, pinfo, tree, drep, hfindex, pdata); } int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, e_uuid_t *pdata) { e_uuid_t uuid; @@ -157,7 +157,7 @@ dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, e_ctx_hnd *pdata) { static e_ctx_hnd ctx_hnd; diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index ce019f4241..f6bba1d66d 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -3,22 +3,22 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c,v 1.53 2002/08/27 12:33:14 sahlberg Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.54 2002/08/28 21:00:09 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -752,7 +752,7 @@ netlogon_dissect_AUTHENTICATOR(tvbuff_t *tvb, int offset, } -/* +/* * IDL typedef struct { * IDL long user_id; * IDL long attributes; @@ -961,7 +961,7 @@ netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, * IDL long sidcount; * IDL [unique] SID_AND_ATTRIBS; * IDL } VALIDATION_SAM_INFO2; - */ + */ static int netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, @@ -1598,7 +1598,7 @@ netlogon_dissect_SENSITIVE_DATA(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_sensitive_data_len, &data_len); - proto_tree_add_item(tree, hf_netlogon_sensitive_data, tvb, offset, + proto_tree_add_item(tree, hf_netlogon_sensitive_data, tvb, offset, data_len, FALSE); offset += data_len; @@ -1993,7 +1993,7 @@ netlogon_dissect_DELTA_RENAME(tvbuff_t *tvb, int offset, static int -netlogon_dissect_RID(tvbuff_t *tvb, int offset, +netlogon_dissect_RID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2004,7 +2004,7 @@ netlogon_dissect_RID(tvbuff_t *tvb, int offset, } static int -netlogon_dissect_RID_array(tvbuff_t *tvb, int offset, +netlogon_dissect_RID_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2015,7 +2015,7 @@ netlogon_dissect_RID_array(tvbuff_t *tvb, int offset, } static int -netlogon_dissect_ATTRIB(tvbuff_t *tvb, int offset, +netlogon_dissect_ATTRIB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2026,7 +2026,7 @@ netlogon_dissect_ATTRIB(tvbuff_t *tvb, int offset, } static int -netlogon_dissect_ATTRIB_array(tvbuff_t *tvb, int offset, +netlogon_dissect_ATTRIB_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2579,7 +2579,7 @@ netlogon_dissect_CIPHER_VALUE_DATA(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_netlogon_cipher_len, &data_len); - proto_tree_add_item(tree, di->hf_index, tvb, offset, + proto_tree_add_item(tree, di->hf_index, tvb, offset, data_len, FALSE); offset += data_len; @@ -2638,7 +2638,7 @@ netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset, char *drep) { offset = netlogon_dissect_CIPHER_VALUE(tvb, offset, - pinfo, tree, drep, + pinfo, tree, drep, "CIPHER_VALUE: current cipher value", hf_netlogon_cipher_current_data); @@ -2646,7 +2646,7 @@ netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset, hf_netlogon_cipher_current_set_time); offset = netlogon_dissect_CIPHER_VALUE(tvb, offset, - pinfo, tree, drep, + pinfo, tree, drep, "CIPHER_VALUE: old cipher value", hf_netlogon_cipher_old_data); @@ -2882,13 +2882,13 @@ netlogon_dissect_DELTA_UNION(tvbuff_t *tvb, int offset, * IDL [case(10)] long rid; * IDL [case(11)] long rid; * IDL [case(12)] long rid; - * IDL [case(13)] [unique] SID *sid; - * IDL [case(14)] [unique] SID *sid; - * IDL [case(15)] [unique] SID *sid; - * IDL [case(16)] [unique] SID *sid; - * IDL [case(17)] [unique] SID *sid; - * IDL [case(18)] [unique][string] wchar_t *Name ; - * IDL [case(19)] [unique][string] wchar_t *Name ; + * IDL [case(13)] [unique] SID *sid; + * IDL [case(14)] [unique] SID *sid; + * IDL [case(15)] [unique] SID *sid; + * IDL [case(16)] [unique] SID *sid; + * IDL [case(17)] [unique] SID *sid; + * IDL [case(18)] [unique][string] wchar_t *Name ; + * IDL [case(19)] [unique][string] wchar_t *Name ; * IDL [case(20)] long rid; * IDL [case(21)] long rid; * IDL } DELTA_ID_UNION; @@ -3052,7 +3052,7 @@ netlogon_dissect_DELTA_ENUM_array(tvbuff_t *tvb, int offset, return offset; } -/* +/* * IDL typedef struct { * IDL long num_deltas; * IDL [unique][size_is(num_deltas)] DELTA_ENUM *delta_enum; @@ -3945,13 +3945,13 @@ netlogon_dissect_netlogondatabaseredo_reply(tvbuff_t *tvb, int offset, /* XXX NetMon does not recognize this as a valid function. Muddle however - * tells us what parameters it takes but not their names. + * tells us what parameters it takes but not their names. * It looks similar to logoncontrol2. perhaps it is logoncontrol3? */ /* * IDL long NetFunction_12( * IDL [in][string][unique] wchar_t *logonserver, - * IDL [in] long function_code, + * IDL [in] long function_code, * IDL [in] long level, * IDL [in][ref] CONTROL_DATA_INFORMATION *data, * IDL [out][ref] CONTROL_QUERY_INFORMATION *query @@ -4002,8 +4002,8 @@ netlogon_dissect_function_12_reply(tvbuff_t *tvb, int offset, static int -netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -4015,8 +4015,8 @@ netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset, } static int -netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -4028,8 +4028,8 @@ netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset, } static int -netlogon_dissect_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +netlogon_dissect_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep, int type, int hf_index, int levels) { proto_item *item=NULL; @@ -4486,7 +4486,7 @@ netlogon_dissect_TYPE_50_ptr(tvbuff_t *tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_50, NDR_POINTER_UNIQUE, "TYPE_50 pointer: unknown_TYPE_50", -1, 0); - + return offset; } @@ -4498,7 +4498,7 @@ netlogon_dissect_TYPE_50_ptr_ptr(tvbuff_t *tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_50_ptr, NDR_POINTER_UNIQUE, "TYPE_50* pointer: unknown_TYPE_50", -1, 0); - + return offset; } @@ -5754,7 +5754,7 @@ static const value_string netlogon_opnum_vals[] = { { 0, NULL } }; -void +void proto_register_dcerpc_netlogon(void) { @@ -5763,60 +5763,60 @@ static hf_register_info hf[] = { { "Operation", "netlogon.opnum", FT_UINT16, BASE_DEC, VALS(netlogon_opnum_vals), 0x0, "Operation", HFILL }}, - { &hf_netlogon_rc, { - "Return code", "netlogon.rc", FT_UINT32, BASE_HEX, + { &hf_netlogon_rc, { + "Return code", "netlogon.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "Netlogon return code", HFILL }}, - { &hf_netlogon_param_ctrl, { - "Param Ctrl", "netlogon.param_ctrl", FT_UINT32, BASE_HEX, + { &hf_netlogon_param_ctrl, { + "Param Ctrl", "netlogon.param_ctrl", FT_UINT32, BASE_HEX, NULL, 0x0, "Param ctrl", HFILL }}, - { &hf_netlogon_logon_id, { - "Logon ID", "netlogon.logon_id", FT_UINT64, BASE_DEC, + { &hf_netlogon_logon_id, { + "Logon ID", "netlogon.logon_id", FT_UINT64, BASE_DEC, NULL, 0x0, "Logon ID", HFILL }}, - { &hf_netlogon_modify_count, { - "Modify Count", "netlogon.modify_count", FT_UINT64, BASE_DEC, + { &hf_netlogon_modify_count, { + "Modify Count", "netlogon.modify_count", FT_UINT64, BASE_DEC, NULL, 0x0, "How many times the object has been modified", HFILL }}, - { &hf_netlogon_security_information, { - "Security Information", "netlogon.security_information", FT_UINT32, BASE_DEC, + { &hf_netlogon_security_information, { + "Security Information", "netlogon.security_information", FT_UINT32, BASE_DEC, NULL, 0x0, "Security Information", HFILL }}, - { &hf_netlogon_count, { - "Count", "netlogon.count", FT_UINT32, BASE_DEC, + { &hf_netlogon_count, { + "Count", "netlogon.count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - { &hf_netlogon_entries, { - "Entries", "netlogon.entries", FT_UINT32, BASE_DEC, + { &hf_netlogon_entries, { + "Entries", "netlogon.entries", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - { &hf_netlogon_credential, { - "Credential", "netlogon.credential", FT_BYTES, BASE_HEX, + { &hf_netlogon_credential, { + "Credential", "netlogon.credential", FT_BYTES, BASE_HEX, NULL, 0x0, "Netlogon credential", HFILL }}, - { &hf_netlogon_challenge, { - "Challenge", "netlogon.challenge", FT_BYTES, BASE_HEX, + { &hf_netlogon_challenge, { + "Challenge", "netlogon.challenge", FT_BYTES, BASE_HEX, NULL, 0x0, "Netlogon challenge", HFILL }}, - { &hf_netlogon_lm_owf_password, { - "LM Pwd", "netlogon.lm_owf_pwd", FT_BYTES, BASE_HEX, + { &hf_netlogon_lm_owf_password, { + "LM Pwd", "netlogon.lm_owf_pwd", FT_BYTES, BASE_HEX, NULL, 0x0, "LanManager OWF Password", HFILL }}, - { &hf_netlogon_user_session_key, { - "User Session Key", "netlogon.user_session_key", FT_BYTES, BASE_HEX, + { &hf_netlogon_user_session_key, { + "User Session Key", "netlogon.user_session_key", FT_BYTES, BASE_HEX, NULL, 0x0, "User Session Key", HFILL }}, - { &hf_netlogon_encrypted_lm_owf_password, { - "Encrypted LM Pwd", "netlogon.lm_owf_pwd.encrypted", FT_BYTES, BASE_HEX, + { &hf_netlogon_encrypted_lm_owf_password, { + "Encrypted LM Pwd", "netlogon.lm_owf_pwd.encrypted", FT_BYTES, BASE_HEX, NULL, 0x0, "Encrypted LanManager OWF Password", HFILL }}, - { &hf_netlogon_nt_owf_password, { - "NT Pwd", "netlogon.nt_owf_pwd", FT_BYTES, BASE_HEX, + { &hf_netlogon_nt_owf_password, { + "NT Pwd", "netlogon.nt_owf_pwd", FT_BYTES, BASE_HEX, NULL, 0x0, "NT OWF Password", HFILL }}, - { &hf_netlogon_blob, { - "BLOB", "netlogon.blob", FT_BYTES, BASE_HEX, + { &hf_netlogon_blob, { + "BLOB", "netlogon.blob", FT_BYTES, BASE_HEX, NULL, 0x0, "BLOB", HFILL }}, { &hf_netlogon_len, { @@ -5855,57 +5855,57 @@ static hf_register_info hf[] = { { "Unknown string", "netlogon.unknown_string", FT_STRING, BASE_NONE, NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_netlogon_unknown_long, - { "Unknown long", "netlogon.unknown.long", FT_UINT32, BASE_HEX, + { "Unknown long", "netlogon.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_netlogon_reserved, - { "Reserved", "netlogon.reserved", FT_UINT32, BASE_HEX, + { "Reserved", "netlogon.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, "Reserved", HFILL }}, { &hf_netlogon_unknown_short, - { "Unknown short", "netlogon.unknown.short", FT_UINT16, BASE_HEX, + { "Unknown short", "netlogon.unknown.short", FT_UINT16, BASE_HEX, NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_netlogon_unknown_char, - { "Unknown char", "netlogon.unknown.char", FT_UINT8, BASE_HEX, + { "Unknown char", "netlogon.unknown.char", FT_UINT8, BASE_HEX, NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_netlogon_acct_expiry_time, - { "Acct Expiry Time", "netlogon.acct.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE, + { "Acct Expiry Time", "netlogon.acct.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "When this account will expire", HFILL }}, { &hf_netlogon_nt_pwd_present, - { "NT PWD Present", "netlogon.nt_pwd_present", FT_UINT8, BASE_HEX, + { "NT PWD Present", "netlogon.nt_pwd_present", FT_UINT8, BASE_HEX, NULL, 0x0, "Is NT password present for this account?", HFILL }}, { &hf_netlogon_lm_pwd_present, - { "LM PWD Present", "netlogon.lm_pwd_present", FT_UINT8, BASE_HEX, + { "LM PWD Present", "netlogon.lm_pwd_present", FT_UINT8, BASE_HEX, NULL, 0x0, "Is LanManager password present for this account?", HFILL }}, { &hf_netlogon_pwd_expired, - { "PWD Expired", "netlogon.pwd_expired", FT_UINT8, BASE_HEX, + { "PWD Expired", "netlogon.pwd_expired", FT_UINT8, BASE_HEX, NULL, 0x0, "Whether this password has expired or not", HFILL }}, { &hf_netlogon_authoritative, - { "Authoritative", "netlogon.authoritative", FT_UINT8, BASE_DEC, + { "Authoritative", "netlogon.authoritative", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_sensitive_data_flag, - { "Sensitive Data", "netlogon.sensitive_data_flag", FT_UINT8, BASE_DEC, + { "Sensitive Data", "netlogon.sensitive_data_flag", FT_UINT8, BASE_DEC, NULL, 0x0, "Sensitive data flag", HFILL }}, { &hf_netlogon_auditing_mode, - { "Auditing Mode", "netlogon.auditing_mode", FT_UINT8, BASE_DEC, + { "Auditing Mode", "netlogon.auditing_mode", FT_UINT8, BASE_DEC, NULL, 0x0, "Auditing Mode", HFILL }}, { &hf_netlogon_max_audit_event_count, - { "Max Audit Event Count", "netlogon.max_audit_event_count", FT_UINT32, BASE_DEC, + { "Max Audit Event Count", "netlogon.max_audit_event_count", FT_UINT32, BASE_DEC, NULL, 0x0, "Max audit event count", HFILL }}, { &hf_netlogon_event_audit_option, - { "Event Audit Option", "netlogon.event_audit_option", FT_UINT32, BASE_HEX, + { "Event Audit Option", "netlogon.event_audit_option", FT_UINT32, BASE_HEX, NULL, 0x0, "Event audit option", HFILL }}, { &hf_netlogon_sensitive_data_len, - { "Length", "netlogon.sensitive_data_len", FT_UINT32, BASE_DEC, + { "Length", "netlogon.sensitive_data_len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of sensitive data", HFILL }}, { &hf_netlogon_nt_chal_resp, @@ -6089,75 +6089,75 @@ static hf_register_info hf[] = { NULL, 0, "Dummy string", HFILL }}, { &hf_netlogon_logon_count16, - { "Logon Count", "netlogon.logon_count16", FT_UINT16, BASE_DEC, + { "Logon Count", "netlogon.logon_count16", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of successful logins", HFILL }}, { &hf_netlogon_logon_count, - { "Logon Count", "netlogon.logon_count", FT_UINT32, BASE_DEC, + { "Logon Count", "netlogon.logon_count", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of successful logins", HFILL }}, { &hf_netlogon_bad_pw_count16, - { "Bad PW Count", "netlogon.bad_pw_count16", FT_UINT16, BASE_DEC, + { "Bad PW Count", "netlogon.bad_pw_count16", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of failed logins", HFILL }}, { &hf_netlogon_bad_pw_count, - { "Bad PW Count", "netlogon.bad_pw_count", FT_UINT32, BASE_DEC, + { "Bad PW Count", "netlogon.bad_pw_count", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of failed logins", HFILL }}, { &hf_netlogon_country, - { "Country", "netlogon.country", FT_UINT16, BASE_DEC, + { "Country", "netlogon.country", FT_UINT16, BASE_DEC, VALS(ms_country_codes), 0x0, "Country setting for this account", HFILL }}, { &hf_netlogon_codepage, - { "Codepage", "netlogon.codepage", FT_UINT16, BASE_DEC, + { "Codepage", "netlogon.codepage", FT_UINT16, BASE_DEC, NULL, 0x0, "Codepage setting for this account", HFILL }}, { &hf_netlogon_level16, - { "Level", "netlogon.level16", FT_UINT16, BASE_DEC, + { "Level", "netlogon.level16", FT_UINT16, BASE_DEC, NULL, 0x0, "Which option of the union is represented here", HFILL }}, { &hf_netlogon_validation_level, - { "Validation Level", "netlogon.validation_level", FT_UINT16, BASE_DEC, + { "Validation Level", "netlogon.validation_level", FT_UINT16, BASE_DEC, NULL, 0x0, "Requested level of validation", HFILL }}, { &hf_netlogon_minpasswdlen, - { "Min Password Len", "netlogon.min_passwd_len", FT_UINT16, BASE_DEC, + { "Min Password Len", "netlogon.min_passwd_len", FT_UINT16, BASE_DEC, NULL, 0x0, "Minimum length of password", HFILL }}, { &hf_netlogon_passwdhistorylen, - { "Passwd History Len", "netlogon.passwd_history_len", FT_UINT16, BASE_DEC, + { "Passwd History Len", "netlogon.passwd_history_len", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of password history", HFILL }}, { &hf_netlogon_secure_channel_type, - { "Sec Chn Type", "netlogon.sec_chn_type", FT_UINT16, BASE_DEC, + { "Sec Chn Type", "netlogon.sec_chn_type", FT_UINT16, BASE_DEC, NULL, 0x0, "Secure Channel Type", HFILL }}, { &hf_netlogon_restart_state, - { "Restart State", "netlogon.restart_state", FT_UINT16, BASE_DEC, + { "Restart State", "netlogon.restart_state", FT_UINT16, BASE_DEC, NULL, 0x0, "Restart State", HFILL }}, { &hf_netlogon_delta_type, - { "Delta Type", "netlogon.delta_type", FT_UINT16, BASE_DEC, + { "Delta Type", "netlogon.delta_type", FT_UINT16, BASE_DEC, VALS(delta_type_vals), 0x0, "Delta Type", HFILL }}, { &hf_netlogon_blob_size, - { "Size", "netlogon.blob.size", FT_UINT32, BASE_DEC, + { "Size", "netlogon.blob.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size in bytes of BLOB", HFILL }}, { &hf_netlogon_code, - { "Code", "netlogon.code", FT_UINT32, BASE_HEX, + { "Code", "netlogon.code", FT_UINT32, BASE_HEX, NULL, 0x0, "Code", HFILL }}, { &hf_netlogon_level, - { "Level", "netlogon.level", FT_UINT32, BASE_DEC, + { "Level", "netlogon.level", FT_UINT32, BASE_DEC, NULL, 0x0, "Which option of the union is represented here", HFILL }}, { &hf_netlogon_reference, - { "Reference", "netlogon.reference", FT_UINT32, BASE_DEC, + { "Reference", "netlogon.reference", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_next_reference, - { "Next Reference", "netlogon.next_reference", FT_UINT32, BASE_DEC, + { "Next Reference", "netlogon.next_reference", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_timestamp, @@ -6165,103 +6165,103 @@ static hf_register_info hf[] = { NULL, 0, "", HFILL }}, { &hf_netlogon_user_rid, - { "User RID", "netlogon.rid", FT_UINT32, BASE_DEC, + { "User RID", "netlogon.rid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_alias_rid, - { "Alias RID", "netlogon.alias_rid", FT_UINT32, BASE_DEC, + { "Alias RID", "netlogon.alias_rid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_group_rid, - { "Group RID", "netlogon.group_rid", FT_UINT32, BASE_DEC, + { "Group RID", "netlogon.group_rid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_num_rids, - { "Num RIDs", "netlogon.num_rids", FT_UINT32, BASE_DEC, + { "Num RIDs", "netlogon.num_rids", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of RIDs", HFILL }}, { &hf_netlogon_num_controllers, - { "Num DCs", "netlogon.num_dc", FT_UINT32, BASE_DEC, + { "Num DCs", "netlogon.num_dc", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of domain controllers", HFILL }}, { &hf_netlogon_num_other_groups, - { "Num Other Groups", "netlogon.num_other_groups", FT_UINT32, BASE_DEC, + { "Num Other Groups", "netlogon.num_other_groups", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_flags, - { "Flags", "netlogon.flags", FT_UINT32, BASE_HEX, + { "Flags", "netlogon.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_netlogon_user_flags, - { "User Flags", "netlogon.user_flags", FT_UINT32, BASE_HEX, + { "User Flags", "netlogon.user_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_netlogon_auth_flags, - { "Auth Flags", "netlogon.auth_flags", FT_UINT32, BASE_HEX, + { "Auth Flags", "netlogon.auth_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_netlogon_systemflags, - { "System Flags", "netlogon.system_flags", FT_UINT32, BASE_HEX, + { "System Flags", "netlogon.system_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_netlogon_database_id, - { "Database Id", "netlogon.database_id", FT_UINT32, BASE_DEC, + { "Database Id", "netlogon.database_id", FT_UINT32, BASE_DEC, NULL, 0x0, "Database Id", HFILL }}, { &hf_netlogon_sync_context, - { "Sync Context", "netlogon.sync_context", FT_UINT32, BASE_DEC, + { "Sync Context", "netlogon.sync_context", FT_UINT32, BASE_DEC, NULL, 0x0, "Sync Context", HFILL }}, { &hf_netlogon_max_size, - { "Max Size", "netlogon.max_size", FT_UINT32, BASE_DEC, + { "Max Size", "netlogon.max_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Max Size of database", HFILL }}, { &hf_netlogon_max_log_size, - { "Max Log Size", "netlogon.max_log_size", FT_UINT32, BASE_DEC, + { "Max Log Size", "netlogon.max_log_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Max Size of log", HFILL }}, { &hf_netlogon_pac_size, - { "Pac Size", "netlogon.pac.size", FT_UINT32, BASE_DEC, + { "Pac Size", "netlogon.pac.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of PacData in bytes", HFILL }}, { &hf_netlogon_auth_size, - { "Auth Size", "netlogon.auth.size", FT_UINT32, BASE_DEC, + { "Auth Size", "netlogon.auth.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of AuthData in bytes", HFILL }}, { &hf_netlogon_num_deltas, - { "Num Deltas", "netlogon.num_deltas", FT_UINT32, BASE_DEC, + { "Num Deltas", "netlogon.num_deltas", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of SAM Deltas in array", HFILL }}, { &hf_netlogon_logon_attempts, - { "Logon Attempts", "netlogon.logon_attempts", FT_UINT32, BASE_DEC, + { "Logon Attempts", "netlogon.logon_attempts", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of logon attempts", HFILL }}, { &hf_netlogon_pagefilelimit, - { "Page File Limit", "netlogon.page_file_limit", FT_UINT32, BASE_DEC, + { "Page File Limit", "netlogon.page_file_limit", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_pagedpoollimit, - { "Paged Pool Limit", "netlogon.paged_pool_limit", FT_UINT32, BASE_DEC, + { "Paged Pool Limit", "netlogon.paged_pool_limit", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_nonpagedpoollimit, - { "Non-Paged Pool Limit", "netlogon.nonpaged_pool_limit", FT_UINT32, BASE_DEC, + { "Non-Paged Pool Limit", "netlogon.nonpaged_pool_limit", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_minworkingsetsize, - { "Min Working Set Size", "netlogon.min_working_set_size", FT_UINT32, BASE_DEC, + { "Min Working Set Size", "netlogon.min_working_set_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_maxworkingsetsize, - { "Max Working Set Size", "netlogon.max_working_set_size", FT_UINT32, BASE_DEC, + { "Max Working Set Size", "netlogon.max_working_set_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_serial_number, - { "Serial Number", "netlogon.serial_number", FT_UINT32, BASE_DEC, + { "Serial Number", "netlogon.serial_number", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_netlogon_neg_flags, - { "Neg Flags", "netlogon.neg_flags", FT_UINT32, BASE_HEX, + { "Neg Flags", "netlogon.neg_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "Negotiation Flags", HFILL }}, { &hf_netlogon_logon_time, @@ -6347,7 +6347,7 @@ static hf_register_info hf[] = { proto_dcerpc_netlogon = proto_register_protocol( "Microsoft Network Logon", "NETLOGON", "rpc_netlogon"); - proto_register_field_array(proto_dcerpc_netlogon, hf, + proto_register_field_array(proto_dcerpc_netlogon, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } @@ -6357,7 +6357,7 @@ proto_reg_handoff_dcerpc_netlogon(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_netlogon, ett_dcerpc_netlogon, - &uuid_dcerpc_netlogon, ver_dcerpc_netlogon, + dcerpc_init_uuid(proto_dcerpc_netlogon, ett_dcerpc_netlogon, + &uuid_dcerpc_netlogon, ver_dcerpc_netlogon, dcerpc_netlogon_dissectors, hf_netlogon_opnum); } diff --git a/packet-dcerpc-netlogon.h b/packet-dcerpc-netlogon.h index e17cad44f7..4412ce1c4e 100644 --- a/packet-dcerpc-netlogon.h +++ b/packet-dcerpc-netlogon.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\NETLOGON packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-netlogon.h,v 1.7 2002/08/27 12:33:15 sahlberg Exp $ + * $Id: packet-dcerpc-netlogon.h,v 1.8 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index f260a5e15f..ab91ea85c4 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,22 +2,22 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.c,v 1.45 2002/08/22 18:24:06 guy Exp $ + * $Id: packet-dcerpc-nt.c,v 1.46 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -45,7 +45,7 @@ int prs_align(int offset, int n) { if (offset % n) offset += n - (offset % n); - + return offset; } @@ -55,14 +55,14 @@ int prs_uint8(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint8 *data, char *name) { guint8 i; - + /* No alignment required */ i = tvb_get_guint8(tvb, offset); offset++; if (name && tree) - proto_tree_add_text(tree, tvb, offset - 1, 1, + proto_tree_add_text(tree, tvb, offset - 1, 1, "%s: %u", name, i); if (data) @@ -93,14 +93,14 @@ int prs_uint16(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 *data, char *name) { guint16 i; - + offset = prs_align(offset, 2); - + i = tvb_get_letohs(tvb, offset); offset += 2; if (name && tree) - proto_tree_add_text(tree, tvb, offset - 2, 2, + proto_tree_add_text(tree, tvb, offset - 2, 2, "%s: %u", name, i); if (data) *data = i; @@ -114,9 +114,9 @@ int prs_uint16s(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int count, int *data_offset, char *name) { offset = prs_align(offset, 2); - + if (name && tree) - proto_tree_add_text(tree, tvb, offset, count * 2, + proto_tree_add_text(tree, tvb, offset, count * 2, "%s", name); if (data_offset) *data_offset = offset; @@ -132,14 +132,14 @@ int prs_uint32(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 *data, char *name) { guint32 i; - + offset = prs_align(offset, 4); - + i = tvb_get_letohl(tvb, offset); offset += 4; if (name && tree) - proto_tree_add_text(tree, tvb, offset - 4, 4, + proto_tree_add_text(tree, tvb, offset - 4, 4, "%s: %u", name, i); if (data) @@ -154,9 +154,9 @@ int prs_uint32s(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int count, int *data_offset, char *name) { offset = prs_align(offset, 4); - + if (name && tree) - proto_tree_add_text(tree, tvb, offset - 4, 4, + proto_tree_add_text(tree, tvb, offset - 4, 4, "%s", name); if (data_offset) *data_offset = offset; @@ -236,7 +236,7 @@ int prs_push_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, tree, &value, NULL); if (name && tree) - proto_tree_add_text(tree, tvb, offset - 4, 4, + proto_tree_add_text(tree, tvb, offset - 4, 4, "%s pointer: 0x%08x", name, value); p = new_ptr(name, value); @@ -328,9 +328,9 @@ int prs_UNISTR2(tvbuff_t *tvb, int offset, packet_info *pinfo, if (flags & PARSE_SCALARS) { offset = prs_uint32(tvb, offset, pinfo, tree, &len, "Length"); - offset = prs_uint32(tvb, offset, pinfo, tree, &unknown, + offset = prs_uint32(tvb, offset, pinfo, tree, &unknown, "Offset"); - offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, + offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, "Max length"); } @@ -347,14 +347,14 @@ int prs_UNISTR2(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -/* following are a few functions for dissecting common structures used by NT +/* following are a few functions for dissecting common structures used by NT services. These might need to be cleaned up at a later time but at least we get them out of the real service dissectors. */ /* UNICODE_STRING BEGIN */ -/* functions to dissect a UNICODE_STRING structure, common to many +/* functions to dissect a UNICODE_STRING structure, common to many NT services struct { short len; @@ -362,7 +362,7 @@ int prs_UNISTR2(tvbuff_t *tvb, int offset, packet_info *pinfo, [size_is(size/2), length_is(len/2), ptr] unsigned short *string; } UNICODE_STRING; - these variables can be found in packet-dcerpc-samr.c + these variables can be found in packet-dcerpc-samr.c */ extern int hf_nt_str_len; extern int hf_nt_str_off; @@ -388,8 +388,8 @@ static gint ett_nt_policy_hnd = -1; the name: string to any higher levels in the tree . */ int -dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len, off, max_len; @@ -447,14 +447,14 @@ dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, [size_is(size/2), length_is(len/2), ptr] unsigned short *string; } UNICODE_STRING; structure used by NT to transmit unicode string values. - + the function takes one additional parameter, level which specifies how many additional levels up in the tree where we should append the string. If unsure, specify levels as 0. */ int -dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep, int hf_index, int levels) { proto_item *item=NULL; @@ -493,7 +493,7 @@ dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, } /* UNICODE_STRING END */ -/* functions to dissect a STRING structure, common to many +/* functions to dissect a STRING structure, common to many NT services struct { short len; @@ -502,8 +502,8 @@ dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, } STRING; */ int -dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len, off, max_len; @@ -534,7 +534,7 @@ dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, offset = prs_uint8s(tvb, offset, pinfo, tree, len, &text_offset, NULL); text = tvb_get_ptr(tvb, text_offset, len); - proto_tree_add_string_format(tree, di->hf_index, + proto_tree_add_string_format(tree, di->hf_index, tvb, old_offset, offset-old_offset, text, "%s: %s", hfi->name, text); break; @@ -564,8 +564,8 @@ dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, } int -dissect_ndr_nt_STRING (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +dissect_ndr_nt_STRING (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep, int hf_index, int levels) { proto_item *item=NULL; @@ -604,11 +604,11 @@ dissect_ndr_nt_STRING (tvbuff_t *tvb, int offset, /* This function is used to dissect a DCERPC encoded 64 bit time value. XXX it should be fixed both here and in dissect_smb_64bit_time so - it can handle both BIG and LITTLE endian encodings + it can handle both BIG and LITTLE endian encodings */ int -dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_, int hf_index) { dcerpc_info *di; @@ -659,7 +659,7 @@ static guint pol_hash_fn(gconstpointer k) /* Bytes 4-7 of the policy handle are a timestamp so should make a reasonable hash value */ - + return key->policy_hnd[4] + (key->policy_hnd[5] << 8) + (key->policy_hnd[6] << 16) + (key->policy_hnd[7] << 24); } @@ -680,13 +680,13 @@ static gint pol_hash_compare(gconstpointer k1, gconstpointer k2) pol_hash_key *key1 = (pol_hash_key *)k1; pol_hash_key *key2 = (pol_hash_key *)k2; - return memcmp(key1->policy_hnd, key2->policy_hnd, + return memcmp(key1->policy_hnd, key2->policy_hnd, sizeof(key1->policy_hnd)) == 0; } /* Store the open and close frame numbers of a policy handle */ -void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, guint32 open_frame, +void dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, guint32 open_frame, guint32 close_frame) { pol_hash_key *key; @@ -786,7 +786,7 @@ void dcerpc_smb_store_pol_name(e_ctx_hnd *policy_hnd, char *name) /* Retrieve a policy handle */ -gboolean dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, +gboolean dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, guint32 *open_frame, guint32 *close_frame) { pol_hash_key key; @@ -810,7 +810,7 @@ gboolean dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, value = g_hash_table_lookup(pol_hash, &key); /* Return name and frame numbers */ - + if (value) { if (name) *name = value->name; @@ -852,7 +852,7 @@ static void init_pol_hash(void) pol_hash_key_chunk = g_mem_chunk_new( "Policy handle hash keys", sizeof(pol_hash_key), POL_HASH_INIT_COUNT * sizeof(pol_hash_key), G_ALLOC_ONLY); - + if (pol_hash_value_chunk) g_mem_chunk_destroy(pol_hash_value_chunk); @@ -872,7 +872,7 @@ static void init_pol_hash(void) /* Dissect an access mask. All this stuff is kind of explained at MSDN: -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/security/windows_2000_windows_nt_access_mask_format.asp +http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/security/windows_2000_windows_nt_access_mask_format.asp */ @@ -976,11 +976,11 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree_add_boolean( standard, hf_access_standard_write_owner, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( standard, hf_access_standard_write_dac, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( standard, hf_access_standard_read_control, tvb, offset - 4, 4, access); @@ -1007,67 +1007,67 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree_add_boolean( specific, hf_access_specific_15, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_14, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_13, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_12, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_11, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_10, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_9, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_8, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_7, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_6, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_5, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_4, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_3, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_2, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_1, tvb, offset - 4, 4, access); - + proto_tree_add_boolean( specific, hf_access_specific_0, tvb, offset - 4, 4, access); - + return offset; } @@ -1094,27 +1094,27 @@ void proto_register_dcerpc_smb(void) { &hf_access_generic_read, { "Generic read", "nt.access_mask.generic_read", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), GENERIC_READ_ACCESS, "Generic read", HFILL }}, { &hf_access_generic_write, { "Generic write", "nt.access_mask.generic_write", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), GENERIC_WRITE_ACCESS, "Generic write", HFILL }}, { &hf_access_generic_execute, { "Generic execute", "nt.access_mask.generic_execute", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), GENERIC_EXECUTE_ACCESS, "Generic execute", HFILL }}, { &hf_access_generic_all, { "Generic all", "nt.access_mask.generic_all", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), GENERIC_ALL_ACCESS, "Generic all", HFILL }}, { &hf_access_maximum_allowed, { "Maximum allowed", "nt.access_mask.maximum_allowed", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), MAXIMUM_ALLOWED_ACCESS, "Maximum allowed", HFILL }}, { &hf_access_sacl, @@ -1261,13 +1261,13 @@ void proto_register_dcerpc_smb(void) frame exception. For the DCERPC over SMB dissectors a long frame indicates a bug in a dissector. */ -void dcerpc_smb_check_long_frame(tvbuff_t *tvb, int offset, +void dcerpc_smb_check_long_frame(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { if (tvb_length_remaining(tvb, offset) != 0) { proto_tree_add_text( - tree, tvb, offset, tvb_length_remaining(tvb, offset), + tree, tvb, offset, tvb_length_remaining(tvb, offset), "[Long frame (%d bytes): SPOOLSS]", tvb_length_remaining(tvb, offset)); @@ -1282,7 +1282,7 @@ void dcerpc_smb_check_long_frame(tvbuff_t *tvb, int offset, int dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata) { guint32 status; @@ -1292,7 +1292,7 @@ dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (tree && status != 0 && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(status, NT_errors, + val_to_str(status, NT_errors, "Unknown error 0x%08x")); if (pdata) *pdata = status; @@ -1304,7 +1304,7 @@ dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata) { guint32 status; @@ -1314,7 +1314,7 @@ dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (tree && status != 0 && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(status, DOS_errors, + val_to_str(status, DOS_errors, "Unknown error 0x%08x")); if (pdata) *pdata = status; @@ -1326,7 +1326,7 @@ dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, char *drep, int hfindex, e_ctx_hnd *pdata, gboolean is_open, gboolean is_close) { proto_item *item; @@ -1338,16 +1338,16 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* Add to proto tree */ - item = proto_tree_add_text(tree, tvb, offset, sizeof(e_ctx_hnd), + item = proto_tree_add_text(tree, tvb, offset, sizeof(e_ctx_hnd), "Policy Handle"); subtree = proto_item_add_subtree(item, ett_nt_policy_hnd); - offset = dissect_ndr_ctx_hnd(tvb, offset, pinfo, subtree, drep, - hfindex, &hnd); + offset = dissect_ndr_ctx_hnd(tvb, offset, pinfo, subtree, drep, + hfindex, &hnd); /* Store request/reply information */ - + dcerpc_smb_store_pol_pkts(&hnd, 0, is_close ? pinfo->fd->num : 0); dcerpc_smb_store_pol_pkts(&hnd, is_open ? pinfo->fd->num: 0, 0); @@ -1381,7 +1381,7 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, char *drep, int hfindex, int length, guint8 **pdata) { guint8 *data; @@ -1400,7 +1400,7 @@ dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint8 **pdata) { dcerpc_info *di; @@ -1412,13 +1412,13 @@ dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* no alignment needed */ - return dissect_dcerpc_uint8s(tvb, offset, pinfo, + return dissect_dcerpc_uint8s(tvb, offset, pinfo, tree, drep, hfindex, length, pdata); } int dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, char *drep, int hfindex, int length, guint16 **pdata) { guint16 *data; @@ -1437,7 +1437,7 @@ dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint16 **pdata) { dcerpc_info *di; @@ -1451,6 +1451,6 @@ dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (offset % 2) offset++; - return dissect_dcerpc_uint16s(tvb, offset, pinfo, + return dissect_dcerpc_uint16s(tvb, offset, pinfo, tree, drep, hfindex, length, pdata); } diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h index 745140ba2c..b2fdef4ce6 100644 --- a/packet-dcerpc-nt.h +++ b/packet-dcerpc-nt.h @@ -2,22 +2,22 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.h,v 1.29 2002/08/22 01:13:12 tpot Exp $ + * $Id: packet-dcerpc-nt.h,v 1.30 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -88,51 +88,51 @@ guint32 prs_pop_ptr(GList **ptr_list, char *name); } int -dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep); int -dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +dissect_ndr_nt_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep, int hf_index, int levels); int -dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_STRING_string (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep); int -dissect_ndr_nt_STRING (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +dissect_ndr_nt_STRING (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep, int hf_index, int levels); -int -dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, +int +dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); int -dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep, int hf_index); int -dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, +dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); int -dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep); int -dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, +dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); int -dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, +dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); int -dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, +dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); int -dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, +dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep); @@ -142,42 +142,42 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, /* Store open and close packet numbers for a policy handle */ -void -dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, guint32 open_frame, +void +dcerpc_smb_store_pol_pkts(e_ctx_hnd *policy_hnd, guint32 open_frame, guint32 close_frame); /* Store a name with a policy handle */ -void +void dcerpc_smb_store_pol_name(e_ctx_hnd *policy_hnd, char *name); /* Fetch details stored with a policy handle */ -gboolean -dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, +gboolean +dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, guint32 *open_frame, guint32 *close_frame); /* Check for unparsed data at the end of a frame */ -void -dcerpc_smb_check_long_frame(tvbuff_t *tvb, int offset, +void +dcerpc_smb_check_long_frame(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); /* Dissect NT specific things */ int dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata); int dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata); int dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, char *drep, int hfindex, e_ctx_hnd *pdata, gboolean is_open, gboolean is_close); int @@ -187,31 +187,31 @@ dissect_nt_GUID(tvbuff_t *tvb, int offset, int dissect_nt_LUID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep); /* Stored here instead of packet-dcerpc{,-ndr}.c as they are probably not official NDR representations. */ int dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint8 **pdata); int dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint8 **pdata); int dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint16 **pdata); int dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, int length, guint16 **pdata); /* Dissect an NT access mask */ -typedef void (nt_access_mask_fn_t)(tvbuff_t *tvb, gint offset, +typedef void (nt_access_mask_fn_t)(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access); int diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c index 903a7b5ab8..86a47904c9 100644 --- a/packet-dcerpc-reg.c +++ b/packet-dcerpc-reg.c @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\winreg packet disassembly * Copyright 2001, 2002 Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.c,v 1.10 2002/08/07 01:03:10 tpot Exp $ + * $Id: packet-dcerpc-reg.c,v 1.11 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -91,7 +91,7 @@ dissect_open_data(tvbuff_t *tvb, int offset, packet_info *pinfo, * OpenHKLM */ -static int +static int RegOpenHKLM_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -99,7 +99,7 @@ RegOpenHKLM_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -112,9 +112,9 @@ RegOpenHKLM_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegOpenHKLM_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -123,7 +123,7 @@ RegOpenHKLM_r(tvbuff_t *tvb, int offset, packet_info *pinfo, e_ctx_hnd policy_hnd; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -140,13 +140,13 @@ RegOpenHKLM_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * OpenHKU */ -static int +static int RegOpenHKU_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -154,7 +154,7 @@ RegOpenHKU_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -167,9 +167,9 @@ RegOpenHKU_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegOpenHKU_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -178,7 +178,7 @@ RegOpenHKU_r(tvbuff_t *tvb, int offset, packet_info *pinfo, e_ctx_hnd policy_hnd; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -195,13 +195,13 @@ RegOpenHKU_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * OpenHKCR */ -static int +static int RegOpenHKCR_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -209,7 +209,7 @@ RegOpenHKCR_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -222,9 +222,9 @@ RegOpenHKCR_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegOpenHKCR_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -233,7 +233,7 @@ RegOpenHKCR_r(tvbuff_t *tvb, int offset, packet_info *pinfo, e_ctx_hnd policy_hnd; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -250,13 +250,13 @@ RegOpenHKCR_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * RegClose */ -static int +static int RegClose_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -264,7 +264,7 @@ RegClose_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -276,9 +276,9 @@ RegClose_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegClose_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -286,7 +286,7 @@ RegClose_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -301,13 +301,13 @@ RegClose_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * RegQueryKey */ -static int +static int RegQueryKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -315,7 +315,7 @@ RegQueryKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -330,9 +330,9 @@ RegQueryKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegQueryKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -340,7 +340,7 @@ RegQueryKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -385,13 +385,13 @@ RegQueryKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * OpenEntry */ -static int +static int RegOpenEntry_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -399,7 +399,7 @@ RegOpenEntry_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -422,9 +422,9 @@ RegOpenEntry_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegOpenEntry_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -433,7 +433,7 @@ RegOpenEntry_r(tvbuff_t *tvb, int offset, packet_info *pinfo, e_ctx_hnd policy_hnd; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -450,13 +450,13 @@ RegOpenEntry_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * Unknown1A */ -static int +static int RegUnknown1A_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -464,7 +464,7 @@ RegUnknown1A_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -476,9 +476,9 @@ RegUnknown1A_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegUnknown1A_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -486,7 +486,7 @@ RegUnknown1A_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -501,13 +501,13 @@ RegUnknown1A_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * EnumKey */ -static int +static int RegEnumKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -515,7 +515,7 @@ RegEnumKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -527,9 +527,9 @@ RegEnumKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -537,7 +537,7 @@ RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -548,7 +548,7 @@ RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} #if 0 @@ -558,7 +558,7 @@ RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, * FOO */ -static int +static int RegFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -566,7 +566,7 @@ RegFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -574,9 +574,9 @@ RegFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int +static int RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -584,7 +584,7 @@ RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -595,7 +595,7 @@ RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} #endif @@ -691,7 +691,7 @@ static const value_string reg_opnum_vals[] = { { 0, NULL } }; -void +void proto_register_dcerpc_reg(void) { static hf_register_info hf[] = { @@ -699,11 +699,11 @@ proto_register_dcerpc_reg(void) /* Global indexes */ { &hf_hnd, - { "Context handle", "reg.hnd", FT_BYTES, BASE_NONE, + { "Context handle", "reg.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "REG policy handle", HFILL }}, { &hf_rc, - { "Return code", "reg.rc", FT_UINT32, BASE_HEX, + { "Return code", "reg.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "REG return code", HFILL }}, { &hf_reg_opnum, @@ -723,7 +723,7 @@ proto_register_dcerpc_reg(void) { &hf_openhklm_unknown2, { "Unknown 2", "reg.openhklm.unknown2", FT_UINT16, BASE_HEX, NULL, 0x0, "Unknown 2", HFILL }}, - + /* QueryClass */ { &hf_querykey_class, diff --git a/packet-dcerpc-reg.h b/packet-dcerpc-reg.h index 84027af938..11a538d096 100644 --- a/packet-dcerpc-reg.h +++ b/packet-dcerpc-reg.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\winreg packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.h,v 1.4 2002/01/03 20:42:40 guy Exp $ + * $Id: packet-dcerpc-reg.h,v 1.5 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c index 6c5cc86dd4..c4f4ca43e5 100644 --- a/packet-dcerpc-samr.c +++ b/packet-dcerpc-samr.c @@ -3,22 +3,22 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 Added all command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-samr.c,v 1.56 2002/08/22 01:13:12 tpot Exp $ + * $Id: packet-dcerpc-samr.c,v 1.57 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -193,7 +193,7 @@ static gint ett_samr_hnd = -1; #endif static e_uuid_t uuid_dcerpc_samr = { - 0x12345778, 0x1234, 0xabcd, + 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xac} }; @@ -213,27 +213,27 @@ specific_rights_connect(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { proto_tree_add_boolean( - tree, hf_access_connect_open_domain, + tree, hf_access_connect_open_domain, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_connect_enum_domains, + tree, hf_access_connect_enum_domains, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_connect_unknown_08, + tree, hf_access_connect_unknown_08, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_connect_unknown_04, + tree, hf_access_connect_unknown_04, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_connect_shutdown_server, + tree, hf_access_connect_shutdown_server, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_connect_unknown_01, + tree, hf_access_connect_unknown_01, tvb, offset, 4, access); } @@ -256,47 +256,47 @@ specific_rights_domain(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { proto_tree_add_boolean( - tree, hf_access_domain_set_info3, + tree, hf_access_domain_set_info3, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_open_account, + tree, hf_access_domain_open_account, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_enum_accounts, + tree, hf_access_domain_enum_accounts, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_unknown_80, + tree, hf_access_domain_unknown_80, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_create_alias, + tree, hf_access_domain_create_alias, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_create_group, + tree, hf_access_domain_create_group, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_domain_create_user, + tree, hf_access_domain_create_user, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_domain_set_info2, + tree, hf_access_domain_set_info2, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_domain_lookup_info2, + tree, hf_access_domain_lookup_info2, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_domain_set_info1, + tree, hf_access_domain_set_info1, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_domain_lookup_info1, + tree, hf_access_domain_lookup_info1, tvb, offset, 4, access); } @@ -319,47 +319,47 @@ specific_rights_user(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { proto_tree_add_boolean( - tree, hf_access_user_unknown_400, + tree, hf_access_user_unknown_400, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_unknown_200, + tree, hf_access_user_unknown_200, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_get_groups, + tree, hf_access_user_get_groups, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_set_password, + tree, hf_access_user_set_password, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_change_password, + tree, hf_access_user_change_password, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_set_attributes, + tree, hf_access_user_set_attributes, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_unknown_10, + tree, hf_access_user_unknown_10, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_get_logoninfo, + tree, hf_access_user_get_logoninfo, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_get_loc_com, + tree, hf_access_user_get_loc_com, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_get_locale, + tree, hf_access_user_get_locale, tvb, offset, 4, access); - + proto_tree_add_boolean( - tree, hf_access_user_get_name_etc, + tree, hf_access_user_get_name_etc, tvb, offset, 4, access); } @@ -376,24 +376,24 @@ specific_rights_alias(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { proto_tree_add_boolean( - tree, hf_access_alias_set_info, + tree, hf_access_alias_set_info, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_alias_lookup_info, + tree, hf_access_alias_lookup_info, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_alias_get_members, + tree, hf_access_alias_get_members, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_alias_remove_member, + tree, hf_access_alias_remove_member, tvb, offset, 4, access); proto_tree_add_boolean( - tree, hf_access_alias_add_member, - tvb, offset, 4, access); + tree, hf_access_alias_add_member, + tvb, offset, 4, access); } /* Dissect group specific access rights */ @@ -409,29 +409,29 @@ specific_rights_group(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { proto_tree_add_boolean( - tree, hf_access_group_get_members, - tvb, offset, 4, access); - + tree, hf_access_group_get_members, + tvb, offset, 4, access); + proto_tree_add_boolean( - tree, hf_access_group_remove_member, - tvb, offset, 4, access); - + tree, hf_access_group_remove_member, + tvb, offset, 4, access); + proto_tree_add_boolean( - tree, hf_access_group_add_member, - tvb, offset, 4, access); - + tree, hf_access_group_add_member, + tvb, offset, 4, access); + proto_tree_add_boolean( - tree, hf_access_group_set_info, - tvb, offset, 4, access); - + tree, hf_access_group_set_info, + tvb, offset, 4, access); + proto_tree_add_boolean( - tree, hf_access_group_lookup_info, - tvb, offset, 4, access); -} + tree, hf_access_group_lookup_info, + tvb, offset, 4, access); +} int -dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -452,8 +452,8 @@ dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, } static int -dissect_ndr_nt_SID_ptr(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_ndr_nt_SID_ptr(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -509,7 +509,7 @@ static const true_false_string tfs_nt_acb_autolock = { "This account has NOT been auto locked" }; int -dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { guint32 mask; @@ -557,7 +557,7 @@ dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int -samr_dissect_open_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, +samr_dissect_open_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -582,8 +582,8 @@ samr_dissect_open_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -samr_dissect_open_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_open_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -600,8 +600,8 @@ samr_dissect_open_user_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_pointer_long(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_pointer_long(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -613,8 +613,8 @@ samr_dissect_pointer_long(tvbuff_t *tvb, int offset, } static int -samr_dissect_pointer_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_pointer_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -631,8 +631,8 @@ samr_dissect_pointer_STRING(tvbuff_t *tvb, int offset, } static int -samr_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -649,8 +649,8 @@ samr_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, } static int -samr_dissect_pointer_short(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_pointer_short(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -663,8 +663,8 @@ samr_dissect_pointer_short(tvbuff_t *tvb, int offset, static int -samr_dissect_query_dispinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_query_dispinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -683,8 +683,8 @@ samr_dissect_query_dispinfo_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_DISPINFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_USER_DISPINFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { proto_item *item=NULL; @@ -714,8 +714,8 @@ samr_dissect_USER_DISPINFO_1(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_DISPINFO_1_ARRAY_users(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_USER_DISPINFO_1_ARRAY_users(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -725,8 +725,8 @@ samr_dissect_USER_DISPINFO_1_ARRAY_users(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_DISPINFO_1_ARRAY (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_USER_DISPINFO_1_ARRAY (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { guint32 count; @@ -754,8 +754,8 @@ samr_dissect_USER_DISPINFO_1_ARRAY (tvbuff_t *tvb, int offset, static int -samr_dissect_USER_DISPINFO_2(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_USER_DISPINFO_2(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { proto_item *item=NULL; @@ -783,8 +783,8 @@ samr_dissect_USER_DISPINFO_2(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_DISPINFO_2_ARRAY_users (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_USER_DISPINFO_2_ARRAY_users (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -794,8 +794,8 @@ samr_dissect_USER_DISPINFO_2_ARRAY_users (tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_DISPINFO_2_ARRAY (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_USER_DISPINFO_2_ARRAY (tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { guint32 count; @@ -825,8 +825,8 @@ samr_dissect_USER_DISPINFO_2_ARRAY (tvbuff_t *tvb, int offset, static int -samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { proto_item *item=NULL; @@ -839,7 +839,7 @@ samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_samr_group_dispinfo); } - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_index, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -855,8 +855,8 @@ samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_GROUP_DISPINFO_ARRAY_groups(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_GROUP_DISPINFO_ARRAY_groups(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -866,8 +866,8 @@ samr_dissect_GROUP_DISPINFO_ARRAY_groups(tvbuff_t *tvb, int offset, } static int -samr_dissect_GROUP_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_GROUP_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { guint32 count; @@ -894,8 +894,8 @@ samr_dissect_GROUP_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, static int -samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { proto_item *item=NULL; @@ -908,7 +908,7 @@ samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_samr_ascii_dispinfo); } - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_index, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -924,8 +924,8 @@ samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_ASCII_DISPINFO_ARRAY_users(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_ASCII_DISPINFO_ARRAY_users(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -935,7 +935,7 @@ samr_dissect_ASCII_DISPINFO_ARRAY_users(tvbuff_t *tvb, int offset, } static int -samr_dissect_ASCII_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_ASCII_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -962,7 +962,7 @@ samr_dissect_ASCII_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, static int -samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, +samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -980,23 +980,23 @@ samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_level, &level); switch(level){ - case 1: + case 1: offset = samr_dissect_USER_DISPINFO_1_ARRAY( tvb, offset, pinfo, tree, drep); break; - case 2: + case 2: offset = samr_dissect_USER_DISPINFO_2_ARRAY( tvb, offset, pinfo, tree, drep); break; - case 3: + case 3: offset = samr_dissect_GROUP_DISPINFO_ARRAY( tvb, offset, pinfo, tree, drep); break; - case 4: + case 4: offset = samr_dissect_ASCII_DISPINFO_ARRAY( tvb, offset, pinfo, tree, drep); break; - case 5: + case 5: offset = samr_dissect_ASCII_DISPINFO_ARRAY( tvb, offset, pinfo, tree, drep); break; @@ -1007,8 +1007,8 @@ samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, } static int -samr_dissect_query_dispinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_query_dispinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1027,9 +1027,9 @@ samr_dissect_query_dispinfo_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_display_enumeration_index_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, - proto_tree *tree, +samr_dissect_get_display_enumeration_index_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, + proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1045,8 +1045,8 @@ samr_dissect_get_display_enumeration_index_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_display_enumeration_index_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_display_enumeration_index_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1063,7 +1063,7 @@ samr_dissect_get_display_enumeration_index_reply(tvbuff_t *tvb, int offset, static int -samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, +samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -1079,7 +1079,7 @@ samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_samr_password_info); } - + offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_unknown_short, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -1090,8 +1090,8 @@ samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_usrdom_pwinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_usrdom_pwinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1101,8 +1101,8 @@ samr_dissect_get_usrdom_pwinfo_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_usrdom_pwinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_usrdom_pwinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1117,8 +1117,8 @@ samr_dissect_get_usrdom_pwinfo_reply(tvbuff_t *tvb, int offset, static int -samr_dissect_connect2_server(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, +samr_dissect_connect2_server(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, char *drep) { proto_item *item=NULL; @@ -1131,7 +1131,7 @@ samr_dissect_connect2_server(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_samr_server); } - offset = dissect_ndr_nt_UNICODE_STRING_str(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING_str(tvb, offset, pinfo, tree, drep); proto_item_set_len(item, offset-old_offset); @@ -1139,8 +1139,8 @@ samr_dissect_connect2_server(tvbuff_t *tvb, int offset, } static int -samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1148,15 +1148,15 @@ samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset, "Server", hf_samr_server, 1); offset = dissect_nt_access_mask( - tvb, offset, pinfo, tree, drep, hf_samr_access, + tvb, offset, pinfo, tree, drep, hf_samr_access, specific_rights_connect); return offset; } static int -samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1167,15 +1167,15 @@ samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset, hf_samr_unknown_long, NULL); offset = dissect_nt_access_mask( - tvb, offset, pinfo, tree, drep, hf_samr_access, + tvb, offset, pinfo, tree, drep, hf_samr_access, specific_rights_connect); return offset; } static int -samr_dissect_connect2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_connect2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -1191,8 +1191,8 @@ samr_dissect_connect2_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_connect_anon_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_connect_anon_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { char str[2]; @@ -1209,8 +1209,8 @@ samr_dissect_connect_anon_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_connect_anon_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_connect_anon_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -1227,7 +1227,7 @@ samr_dissect_connect_anon_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_GROUP(tvbuff_t *tvb, int offset, +samr_dissect_USER_GROUP(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -1251,7 +1251,7 @@ samr_dissect_USER_GROUP(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_GROUP_ARRAY_groups (tvbuff_t *tvb, int offset, +samr_dissect_USER_GROUP_ARRAY_groups (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1262,7 +1262,7 @@ samr_dissect_USER_GROUP_ARRAY_groups (tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_GROUP_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_USER_GROUP_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -1288,7 +1288,7 @@ samr_dissect_USER_GROUP_ARRAY(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset, +samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1299,8 +1299,8 @@ samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1310,8 +1310,8 @@ samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_groups_for_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_groups_for_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1326,15 +1326,15 @@ samr_dissect_get_groups_for_user_reply(tvbuff_t *tvb, int offset, static int -samr_dissect_open_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_open_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, FALSE, FALSE); offset = dissect_nt_access_mask( - tvb, offset, pinfo, tree, drep, hf_samr_access, + tvb, offset, pinfo, tree, drep, hf_samr_access, specific_rights_domain); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1344,8 +1344,8 @@ samr_dissect_open_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -1363,8 +1363,8 @@ samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset, #if 0 static int -samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1378,8 +1378,8 @@ samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset, #endif static int -samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1395,8 +1395,8 @@ samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1406,8 +1406,8 @@ samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_3c_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_unknown_3c_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1417,8 +1417,8 @@ samr_dissect_unknown_3c_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_3c_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_unknown_3c_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1431,8 +1431,8 @@ samr_dissect_unknown_3c_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_alias_in_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_create_alias_in_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1450,8 +1450,8 @@ samr_dissect_create_alias_in_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_alias_in_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_create_alias_in_domain_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -1471,8 +1471,8 @@ samr_dissect_create_alias_in_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1485,23 +1485,23 @@ samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_ALIAS_INFO_1 (tvbuff_t *tvb, int offset, +samr_dissect_ALIAS_INFO_1 (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_rid, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_desc, 0); return offset; } static int -samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, +samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -1519,17 +1519,17 @@ samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_level, &level); switch(level){ - case 1: + case 1: offset = samr_dissect_ALIAS_INFO_1( tvb, offset, pinfo, tree, drep); break; - case 2: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + case 2: + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); break; - case 3: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + case 3: + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_desc, 0); break; @@ -1540,7 +1540,7 @@ samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset, +samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1551,8 +1551,8 @@ samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1566,8 +1566,8 @@ samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1582,8 +1582,8 @@ samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_alias_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_information_alias_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1596,8 +1596,8 @@ samr_dissect_set_information_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree, +samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset, + packet_info *pinfo _U_, proto_tree *tree, char *drep _U_) { proto_tree_add_item(tree, hf_samr_crypt_password, tvb, offset, 516, @@ -1607,8 +1607,8 @@ samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset, } static int -samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree, +samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset, + packet_info *pinfo _U_, proto_tree *tree, char *drep _U_) { proto_tree_add_item(tree, hf_samr_crypt_hash, tvb, offset, 16, @@ -1619,8 +1619,8 @@ samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset, static int -samr_dissect_oem_change_password_user2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_oem_change_password_user2_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1642,8 +1642,8 @@ samr_dissect_oem_change_password_user2_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_oem_change_password_user2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_oem_change_password_user2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1653,8 +1653,8 @@ samr_dissect_oem_change_password_user2_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_unicode_change_password_user2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_unicode_change_password_user2_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1684,8 +1684,8 @@ samr_dissect_unicode_change_password_user2_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1695,8 +1695,8 @@ samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_3b_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_unknown_3b_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1714,8 +1714,8 @@ samr_dissect_unknown_3b_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_3b_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_unknown_3b_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1725,8 +1725,8 @@ samr_dissect_unknown_3b_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_user2_in_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_create_user2_in_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1746,8 +1746,8 @@ samr_dissect_create_user2_in_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_user2_in_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_create_user2_in_domain_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -1770,8 +1770,8 @@ samr_dissect_create_user2_in_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_display_enumeration_index2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_get_display_enumeration_index2_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1786,8 +1786,8 @@ samr_dissect_get_display_enumeration_index2_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_display_enumeration_index2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_display_enumeration_index2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -1799,8 +1799,8 @@ samr_dissect_get_display_enumeration_index2_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_change_password_user_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_change_password_user_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1837,8 +1837,8 @@ samr_dissect_change_password_user_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_change_password_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_change_password_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1848,8 +1848,8 @@ samr_dissect_change_password_user_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_member_attributes_of_group_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_set_member_attributes_of_group_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1861,8 +1861,8 @@ samr_dissect_set_member_attributes_of_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_member_attributes_of_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_member_attributes_of_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1872,25 +1872,25 @@ samr_dissect_set_member_attributes_of_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_GROUP_INFO_1 (tvbuff_t *tvb, int offset, +samr_dissect_GROUP_INFO_1 (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_rid, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_attrib, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_desc, 0); return offset; } static int -samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, +samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -1908,12 +1908,12 @@ samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_level, &level); switch(level){ - case 1: + case 1: offset = samr_dissect_GROUP_INFO_1( tvb, offset, pinfo, tree, drep); break; - case 2: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + case 2: + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); break; @@ -1921,8 +1921,8 @@ samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_attrib, NULL); break; - case 4: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + case 4: + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_acct_desc, 0); break; @@ -1933,7 +1933,7 @@ samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_GROUP_INFO_ptr(tvbuff_t *tvb, int offset, +samr_dissect_GROUP_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1944,8 +1944,8 @@ samr_dissect_GROUP_INFO_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_group_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_group_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -1958,7 +1958,7 @@ samr_dissect_query_information_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_group_reply(tvbuff_t *tvb, int offset, +samr_dissect_query_information_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1972,7 +1972,7 @@ samr_dissect_query_information_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_group_rqst(tvbuff_t *tvb, int offset, +samr_dissect_set_information_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -1988,8 +1988,8 @@ samr_dissect_set_information_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_information_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -2000,8 +2000,8 @@ samr_dissect_set_information_group_reply(tvbuff_t *tvb, int offset, static int -samr_dissect_get_domain_password_information_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_get_domain_password_information_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2015,9 +2015,9 @@ samr_dissect_get_domain_password_information_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_domain_password_information_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, - proto_tree *tree, +samr_dissect_get_domain_password_information_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, + proto_tree *tree, char *drep) { /* @@ -2031,7 +2031,7 @@ samr_dissect_get_domain_password_information_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2039,7 +2039,7 @@ samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, proto_tree *tree=NULL; int old_offset=offset; - ALIGN_TO_4_BYTES; /* strcture starts with short, but is aligned for longs */ + ALIGN_TO_4_BYTES; /* strcture starts with short, but is aligned for longs */ if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, -1, @@ -2062,7 +2062,7 @@ samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, } static int -samr_dissect_DOMAIN_INFO_2(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2104,7 +2104,7 @@ samr_dissect_DOMAIN_INFO_2(tvbuff_t *tvb, int offset, } static int -samr_dissect_DOMAIN_INFO_8(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO_8(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2128,7 +2128,7 @@ samr_dissect_DOMAIN_INFO_8(tvbuff_t *tvb, int offset, } static int -samr_dissect_REPLICATION_STATUS(tvbuff_t *tvb, int offset, +samr_dissect_REPLICATION_STATUS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2154,7 +2154,7 @@ samr_dissect_REPLICATION_STATUS(tvbuff_t *tvb, int offset, } static int -samr_dissect_DOMAIN_INFO_11(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO_11(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2178,7 +2178,7 @@ samr_dissect_DOMAIN_INFO_11(tvbuff_t *tvb, int offset, } static int -samr_dissect_DOMAIN_INFO_13(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO_13(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2205,7 +2205,7 @@ samr_dissect_DOMAIN_INFO_13(tvbuff_t *tvb, int offset, static int -samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, +samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2225,11 +2225,11 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; /* all union arms aligned to 4 bytes, case 7 and 9 need this */ switch(level){ - case 1: + case 1: offset = samr_dissect_DOMAIN_INFO_1( tvb, offset, pinfo, tree, drep); break; - case 2: + case 2: offset = samr_dissect_DOMAIN_INFO_2( tvb, offset, pinfo, tree, drep); break; @@ -2239,17 +2239,17 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, hf_samr_unknown_time); break; case 4: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_unknown_string, 0); break; case 5: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_domain, 0); break; case 6: - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_controller, 0); break; @@ -2257,7 +2257,7 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_unknown_short, NULL); break; - case 8: + case 8: offset = samr_dissect_DOMAIN_INFO_8( tvb, offset, pinfo, tree, drep); break; @@ -2265,7 +2265,7 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_samr_unknown_short, NULL); break; - case 11: + case 11: offset = samr_dissect_DOMAIN_INFO_11( tvb, offset, pinfo, tree, drep); break; @@ -2273,7 +2273,7 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, offset = samr_dissect_REPLICATION_STATUS( tvb, offset, pinfo, tree, drep); break; - case 13: + case 13: offset = samr_dissect_DOMAIN_INFO_13( tvb, offset, pinfo, tree, drep); break; @@ -2284,7 +2284,7 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_domain_rqst(tvbuff_t *tvb, int offset, +samr_dissect_set_information_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2299,8 +2299,8 @@ samr_dissect_set_information_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_set_information_domain_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -2310,7 +2310,7 @@ samr_dissect_set_information_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_lookup_domain_rqst(tvbuff_t *tvb, int offset, +samr_dissect_lookup_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2325,7 +2325,7 @@ samr_dissect_lookup_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_lookup_domain_reply(tvbuff_t *tvb, int offset, +samr_dissect_lookup_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2339,7 +2339,7 @@ samr_dissect_lookup_domain_reply(tvbuff_t *tvb, int offset, } int -dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, +dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2363,7 +2363,7 @@ dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, static int -dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset, +dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2375,7 +2375,7 @@ dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset, int -dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, +dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2402,7 +2402,7 @@ dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, /* called from NETLOGON but placed here since where are where the hf_fields are defined */ int -dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, +dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2424,7 +2424,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, } int -dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, +dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2450,7 +2450,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, static int -samr_dissect_index(tvbuff_t *tvb, int offset, +samr_dissect_index(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2466,7 +2466,7 @@ samr_dissect_index(tvbuff_t *tvb, int offset, static int -samr_dissect_INDEX_ARRAY_value (tvbuff_t *tvb, int offset, +samr_dissect_INDEX_ARRAY_value (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2492,7 +2492,7 @@ plural_ending(const char *string) } static int -samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2526,7 +2526,7 @@ samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset, +samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2541,7 +2541,7 @@ samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset, +samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2556,7 +2556,7 @@ samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, +samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2577,7 +2577,7 @@ samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_index, NULL); - offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, + offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, di->hf_index, 4); proto_item_set_len(item, offset-old_offset); @@ -2585,7 +2585,7 @@ samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, } static int -samr_dissect_IDX_AND_NAME_entry (tvbuff_t *tvb, int offset, +samr_dissect_IDX_AND_NAME_entry (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2597,7 +2597,7 @@ samr_dissect_IDX_AND_NAME_entry (tvbuff_t *tvb, int offset, static int -samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2620,7 +2620,7 @@ samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, tree = proto_item_add_subtree(item, ett_samr_idx_and_name_array); } - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_count, &count); snprintf(str, 255, "IDX_AND_NAME pointer: %s%s:", field_name, @@ -2634,7 +2634,7 @@ samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, } static int -samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, +samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2654,7 +2654,7 @@ samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_domains_rqst(tvbuff_t *tvb, int offset, +samr_dissect_enum_domains_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2672,7 +2672,7 @@ samr_dissect_enum_domains_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_domains_reply(tvbuff_t *tvb, int offset, +samr_dissect_enum_domains_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2693,7 +2693,7 @@ samr_dissect_enum_domains_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_dom_groups_rqst(tvbuff_t *tvb, int offset, +samr_dissect_enum_dom_groups_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2712,7 +2712,7 @@ samr_dissect_enum_dom_groups_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_dom_groups_reply(tvbuff_t *tvb, int offset, +samr_dissect_enum_dom_groups_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2733,7 +2733,7 @@ samr_dissect_enum_dom_groups_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_dom_aliases_rqst(tvbuff_t *tvb, int offset, +samr_dissect_enum_dom_aliases_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2754,7 +2754,7 @@ samr_dissect_enum_dom_aliases_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_enum_dom_aliases_reply(tvbuff_t *tvb, int offset, +samr_dissect_enum_dom_aliases_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2777,8 +2777,8 @@ samr_dissect_enum_dom_aliases_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_members_in_alias_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_get_members_in_alias_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2788,7 +2788,7 @@ samr_dissect_get_members_in_alias_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_get_members_in_alias_reply(tvbuff_t *tvb, int offset, +samr_dissect_get_members_in_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2803,7 +2803,7 @@ samr_dissect_get_members_in_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset, +samr_dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -2813,7 +2813,7 @@ samr_dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset, +samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2837,7 +2837,7 @@ samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset, } int -dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, +dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2868,7 +2868,7 @@ dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, static int -samr_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2897,7 +2897,7 @@ samr_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_2(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2925,7 +2925,7 @@ samr_dissect_USER_INFO_2(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -2979,7 +2979,7 @@ samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3035,7 +3035,7 @@ samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_6(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_6(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3059,7 +3059,7 @@ samr_dissect_USER_INFO_6(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_18(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_18(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3087,7 +3087,7 @@ samr_dissect_USER_INFO_18(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_19(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_19(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3116,7 +3116,7 @@ samr_dissect_USER_INFO_19(tvbuff_t *tvb, int offset, } static int -samr_dissect_BUFFER_entry(tvbuff_t *tvb, int offset, +samr_dissect_BUFFER_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3127,7 +3127,7 @@ samr_dissect_BUFFER_entry(tvbuff_t *tvb, int offset, static int -samr_dissect_BUFFER_buffer(tvbuff_t *tvb, int offset, +samr_dissect_BUFFER_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3151,7 +3151,7 @@ samr_dissect_BUFFER_buffer(tvbuff_t *tvb, int offset, } static int -samr_dissect_BUFFER(tvbuff_t *tvb, int offset, +samr_dissect_BUFFER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3175,7 +3175,7 @@ samr_dissect_BUFFER(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3258,7 +3258,7 @@ samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_22(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_22(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3281,7 +3281,7 @@ samr_dissect_USER_INFO_22(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_23(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_23(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3303,7 +3303,7 @@ samr_dissect_USER_INFO_23(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_24(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_24(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3326,7 +3326,7 @@ samr_dissect_USER_INFO_24(tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3344,27 +3344,27 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, hf_samr_level, &level); switch(level){ - case 1: + case 1: offset = samr_dissect_USER_INFO_1( tvb, offset, pinfo, tree, drep); break; - case 2: + case 2: offset = samr_dissect_USER_INFO_2( tvb, offset, pinfo, tree, drep); break; - case 3: + case 3: offset = samr_dissect_USER_INFO_3( tvb, offset, pinfo, tree, drep); break; - case 4: + case 4: offset = dissect_ndr_nt_LOGON_HOURS( tvb, offset, pinfo, tree, drep); break; - case 5: + case 5: offset = samr_dissect_USER_INFO_5( tvb, offset, pinfo, tree, drep); break; - case 6: + case 6: offset = samr_dissect_USER_INFO_6( tvb, offset, pinfo, tree, drep); break; @@ -3380,7 +3380,7 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_unknown_long, NULL); break; - case 10: + case 10: offset = samr_dissect_USER_INFO_6( tvb, offset, pinfo, tree, drep); break; @@ -3408,11 +3408,11 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_samr_unknown_time); break; - case 18: + case 18: offset = samr_dissect_USER_INFO_18( tvb, offset, pinfo, tree, drep); break; - case 19: + case 19: offset = samr_dissect_USER_INFO_19( tvb, offset, pinfo, tree, drep); break; @@ -3420,19 +3420,19 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, offset = dissect_ndr_nt_UNICODE_STRING(tvb, offset, pinfo, tree, drep, hf_samr_profile, 0); break; - case 21: + case 21: offset = samr_dissect_USER_INFO_21( tvb, offset, pinfo, tree, drep); break; - case 22: + case 22: offset = samr_dissect_USER_INFO_22( tvb, offset, pinfo, tree, drep); break; - case 23: + case 23: offset = samr_dissect_USER_INFO_23( tvb, offset, pinfo, tree, drep); break; - case 24: + case 24: offset = samr_dissect_USER_INFO_24( tvb, offset, pinfo, tree, drep); break; @@ -3443,7 +3443,7 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, } static int -samr_dissect_USER_INFO_ptr(tvbuff_t *tvb, int offset, +samr_dissect_USER_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3454,7 +3454,7 @@ samr_dissect_USER_INFO_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_user2_rqst(tvbuff_t *tvb, int offset, +samr_dissect_set_information_user2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3472,8 +3472,8 @@ samr_dissect_set_information_user2_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3483,8 +3483,8 @@ samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_2f_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_unknown_2f_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3497,7 +3497,7 @@ samr_dissect_unknown_2f_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_unknown_2f_reply(tvbuff_t *tvb, int offset, +samr_dissect_unknown_2f_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3512,7 +3512,7 @@ samr_dissect_unknown_2f_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_MEMBER_ARRAY_type(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3524,7 +3524,7 @@ samr_dissect_MEMBER_ARRAY_type(tvbuff_t *tvb, int offset, static int -samr_dissect_MEMBER_ARRAY_types(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY_types(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3548,7 +3548,7 @@ samr_dissect_MEMBER_ARRAY_types(tvbuff_t *tvb, int offset, } static int -samr_dissect_MEMBER_ARRAY_rid(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY_rid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3560,7 +3560,7 @@ samr_dissect_MEMBER_ARRAY_rid(tvbuff_t *tvb, int offset, static int -samr_dissect_MEMBER_ARRAY_rids(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY_rids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3584,7 +3584,7 @@ samr_dissect_MEMBER_ARRAY_rids(tvbuff_t *tvb, int offset, } static int -samr_dissect_MEMBER_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3613,7 +3613,7 @@ samr_dissect_MEMBER_ARRAY(tvbuff_t *tvb, int offset, } static int -samr_dissect_MEMBER_ARRAY_ptr(tvbuff_t *tvb, int offset, +samr_dissect_MEMBER_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3624,8 +3624,8 @@ samr_dissect_MEMBER_ARRAY_ptr(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_groupmem_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_query_groupmem_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -3634,7 +3634,7 @@ samr_dissect_query_groupmem_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_groupmem_reply(tvbuff_t *tvb, int offset, +samr_dissect_query_groupmem_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3649,7 +3649,7 @@ samr_dissect_query_groupmem_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_sec_object_rqst(tvbuff_t *tvb, int offset, +samr_dissect_set_sec_object_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3667,8 +3667,8 @@ samr_dissect_set_sec_object_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_set_sec_object_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_set_sec_object_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3678,7 +3678,7 @@ samr_dissect_set_sec_object_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_sec_object_rqst(tvbuff_t *tvb, int offset, +samr_dissect_query_sec_object_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3692,7 +3692,7 @@ samr_dissect_query_sec_object_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_sec_object_reply(tvbuff_t *tvb, int offset, +samr_dissect_query_sec_object_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3707,7 +3707,7 @@ samr_dissect_query_sec_object_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOOKUP_NAMES_name(tvbuff_t *tvb, int offset, +samr_dissect_LOOKUP_NAMES_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3717,7 +3717,7 @@ samr_dissect_LOOKUP_NAMES_name(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOOKUP_NAMES(tvbuff_t *tvb, int offset, +samr_dissect_LOOKUP_NAMES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3740,7 +3740,7 @@ samr_dissect_LOOKUP_NAMES(tvbuff_t *tvb, int offset, static int -samr_dissect_lookup_names_rqst(tvbuff_t *tvb, int offset, +samr_dissect_lookup_names_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3758,7 +3758,7 @@ samr_dissect_lookup_names_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_lookup_names_reply(tvbuff_t *tvb, int offset, +samr_dissect_lookup_names_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3776,7 +3776,7 @@ samr_dissect_lookup_names_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOOKUP_RIDS_rid(tvbuff_t *tvb, int offset, +samr_dissect_LOOKUP_RIDS_rid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3787,7 +3787,7 @@ samr_dissect_LOOKUP_RIDS_rid(tvbuff_t *tvb, int offset, } static int -samr_dissect_LOOKUP_RIDS(tvbuff_t *tvb, int offset, +samr_dissect_LOOKUP_RIDS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3810,7 +3810,7 @@ samr_dissect_LOOKUP_RIDS(tvbuff_t *tvb, int offset, static int -samr_dissect_lookup_rids_rqst(tvbuff_t *tvb, int offset, +samr_dissect_lookup_rids_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3828,7 +3828,7 @@ samr_dissect_lookup_rids_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_UNICODE_STRING_ARRAY_name(tvbuff_t *tvb, int offset, +samr_dissect_UNICODE_STRING_ARRAY_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3838,7 +3838,7 @@ samr_dissect_UNICODE_STRING_ARRAY_name(tvbuff_t *tvb, int offset, } static int -samr_dissect_UNICODE_STRING_ARRAY_names(tvbuff_t *tvb, int offset, +samr_dissect_UNICODE_STRING_ARRAY_names(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3848,7 +3848,7 @@ samr_dissect_UNICODE_STRING_ARRAY_names(tvbuff_t *tvb, int offset, } static int -samr_dissect_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, +samr_dissect_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) { @@ -3877,7 +3877,7 @@ samr_dissect_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, static int -samr_dissect_lookup_rids_reply(tvbuff_t *tvb, int offset, +samr_dissect_lookup_rids_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -3895,7 +3895,7 @@ samr_dissect_lookup_rids_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_close_hnd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, +samr_dissect_close_hnd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3905,7 +3905,7 @@ samr_dissect_close_hnd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -samr_dissect_close_hnd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +samr_dissect_close_hnd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3918,8 +3918,8 @@ samr_dissect_close_hnd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -samr_dissect_shutdown_sam_server_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_shutdown_sam_server_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -3929,8 +3929,8 @@ samr_dissect_shutdown_sam_server_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_shutdown_sam_server_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_shutdown_sam_server_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3940,8 +3940,8 @@ samr_dissect_shutdown_sam_server_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_group_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_group_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -3951,8 +3951,8 @@ samr_dissect_delete_dom_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3962,8 +3962,8 @@ samr_dissect_delete_dom_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_member_from_group_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_remove_member_from_group_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3979,8 +3979,8 @@ samr_dissect_remove_member_from_group_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_member_from_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_remove_member_from_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3990,8 +3990,8 @@ samr_dissect_remove_member_from_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_alias_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_alias_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -4001,8 +4001,8 @@ samr_dissect_delete_dom_alias_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_alias_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_alias_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4012,8 +4012,8 @@ samr_dissect_delete_dom_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_add_alias_member_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_add_alias_member_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4026,8 +4026,8 @@ samr_dissect_add_alias_member_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_add_alias_member_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_add_alias_member_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4037,8 +4037,8 @@ samr_dissect_add_alias_member_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_alias_member_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_remove_alias_member_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4051,8 +4051,8 @@ samr_dissect_remove_alias_member_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_alias_member_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_remove_alias_member_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4062,8 +4062,8 @@ samr_dissect_remove_alias_member_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_user_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_user_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4073,8 +4073,8 @@ samr_dissect_delete_dom_user_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_delete_dom_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_delete_dom_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4084,7 +4084,7 @@ samr_dissect_delete_dom_user_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_test_private_fns_domain_rqst(tvbuff_t *tvb, int offset, +samr_dissect_test_private_fns_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -4095,8 +4095,8 @@ samr_dissect_test_private_fns_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_test_private_fns_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_test_private_fns_domain_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4106,8 +4106,8 @@ samr_dissect_test_private_fns_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_test_private_fns_user_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_test_private_fns_user_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4117,8 +4117,8 @@ samr_dissect_test_private_fns_user_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_test_private_fns_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_test_private_fns_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4128,9 +4128,9 @@ samr_dissect_test_private_fns_user_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_member_from_foreign_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, - proto_tree *tree, +samr_dissect_remove_member_from_foreign_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, + proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4144,8 +4144,8 @@ samr_dissect_remove_member_from_foreign_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_remove_member_from_foreign_domain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, - proto_tree *tree, + packet_info *pinfo, + proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4155,10 +4155,10 @@ samr_dissect_remove_member_from_foreign_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_remove_multiple_members_from_alias_rqst(tvbuff_t *tvb, - int offset, - packet_info *pinfo, - proto_tree *tree, +samr_dissect_remove_multiple_members_from_alias_rqst(tvbuff_t *tvb, + int offset, + packet_info *pinfo, + proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4172,10 +4172,10 @@ samr_dissect_remove_multiple_members_from_alias_rqst(tvbuff_t *tvb, } static int -samr_dissect_remove_multiple_members_from_alias_reply(tvbuff_t *tvb, - int offset, - packet_info *pinfo, - proto_tree *tree, +samr_dissect_remove_multiple_members_from_alias_reply(tvbuff_t *tvb, + int offset, + packet_info *pinfo, + proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4185,7 +4185,7 @@ samr_dissect_remove_multiple_members_from_alias_reply(tvbuff_t *tvb, } static int -samr_dissect_open_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, +samr_dissect_open_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4211,8 +4211,8 @@ samr_dissect_open_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -samr_dissect_open_group_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_open_group_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -4229,7 +4229,7 @@ samr_dissect_open_group_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_open_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, +samr_dissect_open_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4255,8 +4255,8 @@ samr_dissect_open_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -samr_dissect_open_alias_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_open_alias_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { e_ctx_hnd policy_hnd; @@ -4273,8 +4273,8 @@ samr_dissect_open_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_add_multiple_members_to_alias_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_add_multiple_members_to_alias_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4288,8 +4288,8 @@ samr_dissect_add_multiple_members_to_alias_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_add_multiple_members_to_alias_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_add_multiple_members_to_alias_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -4299,8 +4299,8 @@ samr_dissect_add_multiple_members_to_alias_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_group_in_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +samr_dissect_create_group_in_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4318,7 +4318,7 @@ samr_dissect_create_group_in_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_create_group_in_domain_reply(tvbuff_t *tvb, int offset, +samr_dissect_create_group_in_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -4339,8 +4339,8 @@ samr_dissect_create_group_in_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_domain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_domain_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4353,7 +4353,7 @@ samr_dissect_query_information_domain_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_domain_reply(tvbuff_t *tvb, int offset, +samr_dissect_query_information_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { @@ -4372,8 +4372,8 @@ samr_dissect_query_information_domain_reply(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_user_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_user_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -4386,8 +4386,8 @@ samr_dissect_query_information_user_rqst(tvbuff_t *tvb, int offset, } static int -samr_dissect_query_information_user_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, +samr_dissect_query_information_user_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -4410,7 +4410,7 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_SET_SEC_OBJECT, "SetSecObject", samr_dissect_set_sec_object_rqst, samr_dissect_set_sec_object_reply }, - { SAMR_QUERY_SEC_OBJECT, "QuerySecObject", + { SAMR_QUERY_SEC_OBJECT, "QuerySecObject", samr_dissect_query_sec_object_rqst, samr_dissect_query_sec_object_reply }, { SAMR_SHUTDOWN_SAM_SERVER, "ShutdownSamServer", @@ -4452,7 +4452,7 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_GET_ALIAS_MEMBERSHIP, "GetAliasMem", samr_dissect_get_alias_membership_rqst, samr_dissect_get_alias_membership_reply }, - { SAMR_LOOKUP_NAMES, "LookupNames", + { SAMR_LOOKUP_NAMES, "LookupNames", samr_dissect_lookup_names_rqst, samr_dissect_lookup_names_reply }, { SAMR_LOOKUP_RIDS, "LookupRIDs", @@ -4503,8 +4503,8 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_GET_MEMBERS_IN_ALIAS, "GetAliasMem", samr_dissect_get_members_in_alias_rqst, samr_dissect_get_members_in_alias_reply }, - { SAMR_OPEN_USER, "OpenUser", - samr_dissect_open_user_rqst, + { SAMR_OPEN_USER, "OpenUser", + samr_dissect_open_user_rqst, samr_dissect_open_user_reply }, { SAMR_DELETE_DOM_USER, "DeleteUser", samr_dissect_delete_dom_user_rqst, @@ -4521,11 +4521,11 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_GET_GROUPS_FOR_USER, "GetGroups", samr_dissect_get_groups_for_user_rqst, samr_dissect_get_groups_for_user_reply }, - { SAMR_QUERY_DISPINFO, "QueryDispinfo", - samr_dissect_query_dispinfo_rqst, + { SAMR_QUERY_DISPINFO, "QueryDispinfo", + samr_dissect_query_dispinfo_rqst, samr_dissect_query_dispinfo_reply }, - { SAMR_GET_DISPLAY_ENUMERATION_INDEX, "GetDispEnumNDX", - samr_dissect_get_display_enumeration_index_rqst, + { SAMR_GET_DISPLAY_ENUMERATION_INDEX, "GetDispEnumNDX", + samr_dissect_get_display_enumeration_index_rqst, samr_dissect_get_display_enumeration_index_reply }, { SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN, "TestPrivateFnsDomain", samr_dissect_test_private_fns_domain_rqst, @@ -4572,7 +4572,7 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_GET_DOM_PWINFO, "GetDomainPasswordInfo", samr_dissect_get_domain_password_information_rqst, samr_dissect_get_domain_password_information_reply }, - { SAMR_CONNECT2, "Connect2", + { SAMR_CONNECT2, "Connect2", samr_dissect_connect2_rqst, samr_dissect_connect2_reply }, { SAMR_SET_USERINFO, "SetUserInfo", @@ -4581,10 +4581,10 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_UNKNOWN_3B, "Unknown 0x3b", samr_dissect_unknown_3b_rqst, samr_dissect_unknown_3b_reply }, - { SAMR_UNKNOWN_3C, "Unknown 0x3c", + { SAMR_UNKNOWN_3C, "Unknown 0x3c", samr_dissect_unknown_3c_rqst, samr_dissect_unknown_3c_reply }, - { SAMR_CONNECT4, "Connect4", + { SAMR_CONNECT4, "Connect4", samr_dissect_connect4_rqst, samr_dissect_connect2_reply }, {0, NULL, NULL, NULL } @@ -4657,7 +4657,7 @@ static const value_string samr_opnum_vals[] = { { 0, NULL } }; -void +void proto_register_dcerpc_samr(void) { static hf_register_info hf[] = { @@ -4684,42 +4684,42 @@ proto_register_dcerpc_samr(void) { "Return code", "samr.rc", FT_UINT32, BASE_HEX, VALS (NT_errors), 0x0, "", HFILL }}, { &hf_samr_level, - { "Level", "samr.level", FT_UINT16, BASE_DEC, + { "Level", "samr.level", FT_UINT16, BASE_DEC, NULL, 0x0, "Level requested/returned for Information", HFILL }}, { &hf_samr_start_idx, - { "Start Idx", "samr.start_idx", FT_UINT32, BASE_DEC, + { "Start Idx", "samr.start_idx", FT_UINT32, BASE_DEC, NULL, 0x0, "Start Index for returned Information", HFILL }}, { &hf_samr_entries, - { "Entries", "samr.entries", FT_UINT32, BASE_DEC, + { "Entries", "samr.entries", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of entries to return", HFILL }}, { &hf_samr_max_entries, - { "Max Entries", "samr.max_entries", FT_UINT32, BASE_DEC, + { "Max Entries", "samr.max_entries", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum number of entries", HFILL }}, { &hf_samr_pref_maxsize, - { "Pref MaxSize", "samr.pref_maxsize", FT_UINT32, BASE_DEC, + { "Pref MaxSize", "samr.pref_maxsize", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum Size of data to return", HFILL }}, { &hf_samr_total_size, - { "Total Size", "samr.total_size", FT_UINT32, BASE_DEC, + { "Total Size", "samr.total_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Total size of data", HFILL }}, { &hf_samr_bad_pwd_count, - { "Bad Pwd Count", "samr.bad_pwd_count", FT_UINT16, BASE_DEC, + { "Bad Pwd Count", "samr.bad_pwd_count", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of bad pwd entries for this user", HFILL }}, { &hf_samr_logon_count, - { "Logon Count", "samr.logon_count", FT_UINT16, BASE_DEC, + { "Logon Count", "samr.logon_count", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of logons for this user", HFILL }}, { &hf_samr_ret_size, - { "Returned Size", "samr.ret_size", FT_UINT32, BASE_DEC, + { "Returned Size", "samr.ret_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of returned objects in this PDU", HFILL }}, { &hf_samr_index, - { "Index", "samr.index", FT_UINT32, BASE_DEC, + { "Index", "samr.index", FT_UINT32, BASE_DEC, NULL, 0x0, "Index", HFILL }}, { &hf_samr_count, @@ -4790,46 +4790,46 @@ proto_register_dcerpc_samr(void) NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_samr_unknown_hyper, - { "Unknown hyper", "samr.unknown.hyper", FT_UINT64, BASE_HEX, + { "Unknown hyper", "samr.unknown.hyper", FT_UINT64, BASE_HEX, NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_samr_unknown_long, - { "Unknown long", "samr.unknown.long", FT_UINT32, BASE_HEX, + { "Unknown long", "samr.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_samr_unknown_short, - { "Unknown short", "samr.unknown.short", FT_UINT16, BASE_HEX, + { "Unknown short", "samr.unknown.short", FT_UINT16, BASE_HEX, NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_samr_unknown_char, - { "Unknown char", "samr.unknown.char", FT_UINT8, BASE_HEX, + { "Unknown char", "samr.unknown.char", FT_UINT8, BASE_HEX, NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }}, { &hf_samr_revision, - { "Revision", "samr.revision", FT_UINT64, BASE_HEX, + { "Revision", "samr.revision", FT_UINT64, BASE_HEX, NULL, 0x0, "Revision number for this structure", HFILL }}, - + { &hf_samr_nt_pwd_set, - { "NT Pwd Set", "samr.nt_pwd_set", FT_UINT8, BASE_HEX, + { "NT Pwd Set", "samr.nt_pwd_set", FT_UINT8, BASE_HEX, NULL, 0x0, "Flag indicating whether the NT password has been set", HFILL }}, - + { &hf_samr_lm_pwd_set, - { "LM Pwd Set", "samr.lm_pwd_set", FT_UINT8, BASE_HEX, + { "LM Pwd Set", "samr.lm_pwd_set", FT_UINT8, BASE_HEX, NULL, 0x0, "Flag indicating whether the LanManager password has been set", HFILL }}, - + { &hf_samr_pwd_expired, - { "Expired flag", "samr.pwd_Expired", FT_UINT8, BASE_HEX, + { "Expired flag", "samr.pwd_Expired", FT_UINT8, BASE_HEX, NULL, 0x0, "Flag indicating if the password for this account has expired or not", HFILL }}, { &hf_samr_access, - { "Access Mask", "samr.access", FT_UINT32, BASE_HEX, + { "Access Mask", "samr.access", FT_UINT32, BASE_HEX, NULL, 0x0, "Access", HFILL }}, { &hf_samr_access_granted, - { "Access Granted", "samr.access_granted", FT_UINT32, BASE_HEX, + { "Access Granted", "samr.access_granted", FT_UINT32, BASE_HEX, NULL, 0x0, "Access Granted", HFILL }}, { &hf_samr_mask, - { "Mask", "samr.mask", FT_UINT32, BASE_HEX, + { "Mask", "samr.mask", FT_UINT32, BASE_HEX, NULL, 0x0, "Mask", HFILL }}, { &hf_samr_crypt_password, { @@ -4909,27 +4909,27 @@ proto_register_dcerpc_samr(void) /* these are used by packet-dcerpc-nt.c */ { &hf_nt_string_length, - { "Length", "nt.string.length", FT_UINT16, BASE_DEC, + { "Length", "nt.string.length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of string in bytes", HFILL }}, { &hf_nt_string_size, - { "Size", "nt.string.size", FT_UINT16, BASE_DEC, + { "Size", "nt.string.size", FT_UINT16, BASE_DEC, NULL, 0x0, "Size of string in bytes", HFILL }}, { &hf_nt_str_len, - { "Length", "nt.str.len", FT_UINT32, BASE_DEC, + { "Length", "nt.str.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of string in short integers", HFILL }}, { &hf_nt_str_off, - { "Offset", "nt.str.offset", FT_UINT32, BASE_DEC, + { "Offset", "nt.str.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "Offset into string in short integers", HFILL }}, { &hf_nt_str_max_len, - { "Max Length", "nt.str.max_len", FT_UINT32, BASE_DEC, + { "Max Length", "nt.str.max_len", FT_UINT32, BASE_DEC, NULL, 0x0, "Max Length of string in short integers", HFILL }}, { &hf_nt_acct_ctrl, - { "Acct Ctrl", "nt.acct_ctrl", FT_UINT32, BASE_HEX, + { "Acct Ctrl", "nt.acct_ctrl", FT_UINT32, BASE_HEX, NULL, 0x0, "Acct CTRL", HFILL }}, { &hf_nt_acb_disabled, { diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h index 2c6073b892..fd520d4946 100644 --- a/packet-dcerpc-samr.h +++ b/packet-dcerpc-samr.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\samr packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-samr.h,v 1.7 2002/08/21 21:31:15 tpot Exp $ + * $Id: packet-dcerpc-samr.h,v 1.8 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c index a19f18e0a0..3786c1e1da 100644 --- a/packet-dcerpc-spoolss.c +++ b/packet-dcerpc-spoolss.c @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001-2002, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-spoolss.c,v 1.51 2002/08/27 07:38:36 tpot Exp $ + * $Id: packet-dcerpc-spoolss.c,v 1.52 2002/08/28 21:00:10 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -482,7 +482,7 @@ static int hf_spoolss_printerdata_size = -1; static int hf_spoolss_printerdata_data = -1; /* - * Dissect SPOOLSS specific access rights + * Dissect SPOOLSS specific access rights */ static int hf_server_access_admin = -1; @@ -502,11 +502,11 @@ spoolss_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, proto_tree_add_boolean( tree, hf_printer_access_use, tvb, offset, 4, access); - + proto_tree_add_boolean( tree, hf_printer_access_admin, tvb, offset, 4, access); - + proto_tree_add_boolean( tree, hf_server_access_enum, tvb, offset, 4, access); @@ -516,8 +516,8 @@ spoolss_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, tvb, offset, 4, access); } -/* - * Routines to dissect a spoolss BUFFER +/* + * Routines to dissect a spoolss BUFFER */ typedef struct { @@ -580,10 +580,10 @@ dissect_spoolss_buffer(tvbuff_t *tvb, gint offset, packet_info *pinfo, return offset; } -/* +/* * New system for handling pointers and buffers. We act more like the NDR * specification and have a list of deferred pointers which are processed - * after a structure has been parsed. + * after a structure has been parsed. * * Each structure has a parse function which takes as an argument a GList. * As pointers are processed, they are appended onto this list. When the @@ -622,7 +622,7 @@ static void defer_ptr(GList **list, prs_fn *fn, proto_tree *tree) dr->fn = fn; dr->tree = tree; - + *list = g_list_append(*list, dr); } @@ -636,7 +636,7 @@ static int prs_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, tree, &ptr, NULL); if (tree && name) - proto_tree_add_text(tree, tvb, offset - 4, 4, + proto_tree_add_text(tree, tvb, offset - 4, 4, "%s pointer: 0x%08x", name, ptr); if (data) @@ -654,7 +654,7 @@ static void dr_iterator(gpointer data, gpointer user_data) /* Parse pointer */ - *s->poffset = dp->fn(s->tvb, *s->poffset, s->pinfo, dp->tree, + *s->poffset = dp->fn(s->tvb, *s->poffset, s->pinfo, dp->tree, s->dp_list, s->ptr_data); if (s->ptr_data) @@ -663,7 +663,7 @@ static void dr_iterator(gpointer data, gpointer user_data) /* Call the parse function for each element in the deferred pointers list. If there are any additional pointers in these structures they are pushed - onto parent_dp_list. */ + onto parent_dp_list. */ static int prs_referents(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree _U_, GList **dp_list, GList **list, @@ -692,7 +692,7 @@ static int prs_referents(tvbuff_t *tvb, int offset, packet_info *pinfo, s.dp_list = dp_list; s.ptr_data = ptr_data ? *ptr_data : NULL; - g_list_foreach(*list, dr_iterator, &s); + g_list_foreach(*list, dr_iterator, &s); *list = NULL; /* XXX: free list */ @@ -720,7 +720,7 @@ static int prs_struct_and_referents(tvbuff_t *tvb, int offset, */ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -729,7 +729,7 @@ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, char *pol_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -748,15 +748,15 @@ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, return offset; } -static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -764,7 +764,7 @@ static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset, offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, FALSE, FALSE); - + offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_spoolss_rc, NULL); @@ -787,20 +787,20 @@ static int prs_UNISTR2_dp(tvbuff_t *tvb, int offset, packet_info *pinfo, int old_offset = offset; int data16_offset; char *text; - + offset = prs_uint32(tvb, offset, pinfo, tree, &length, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, &the_offset, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, NULL); offset = prs_uint16s(tvb, offset, pinfo, tree, max_len, &data16_offset, NULL); - + text = fake_unicode(tvb, data16_offset, max_len); item = proto_tree_add_text(tree, tvb, old_offset, offset - old_offset, "UNISTR2: %s", text); - subtree = proto_item_add_subtree(item, ett_UNISTR2); + subtree = proto_item_add_subtree(item, ett_UNISTR2); if (data) *data = text; @@ -811,7 +811,7 @@ static int prs_UNISTR2_dp(tvbuff_t *tvb, int offset, packet_info *pinfo, old_offset += 4; - proto_tree_add_text(subtree, tvb, old_offset, 4, "Offset: %u", + proto_tree_add_text(subtree, tvb, old_offset, 4, "Offset: %u", the_offset); old_offset += 4; @@ -834,8 +834,8 @@ static int prs_UNISTR2_dp(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_printerdata_data = -1; static gint ett_printerdata_value = -1; -static int dissect_printerdata_data(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int dissect_printerdata_data(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { proto_item *item; @@ -863,7 +863,7 @@ static int dissect_printerdata_data(tvbuff_t *tvb, int offset, */ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -871,7 +871,7 @@ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, char *value_name = NULL; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -898,14 +898,14 @@ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, } static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -930,7 +930,7 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, */ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -938,7 +938,7 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, char *key_name, *value_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -962,7 +962,7 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, NULL); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s/%s", + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s/%s", key_name, value_name); /* @@ -984,7 +984,7 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, } static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -992,7 +992,7 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, guint32 size; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1001,7 +1001,7 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, hf_spoolss_printerdata_type, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, &size, "Size"); - + offset = prs_uint8s(tvb, offset, pinfo, tree, size, NULL, "Data"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed"); @@ -1019,7 +1019,7 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, */ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -1027,7 +1027,7 @@ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, char *value_name = NULL; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1058,14 +1058,14 @@ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, } static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1083,7 +1083,7 @@ static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset, */ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -1092,7 +1092,7 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, guint32 max_len; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1132,14 +1132,14 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, } static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1198,9 +1198,9 @@ static int prs_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, text = fake_unicode(tvb, offset, remaining); len = strlen(text); - if (name) - proto_tree_add_text(tree, tvb, offset, (len + 1) * 2, - "%s: %s", name ? name : "UINT16UNI", + if (name) + proto_tree_add_text(tree, tvb, offset, (len + 1) * 2, + "%s: %s", name ? name : "UINT16UNI", text); if (data) @@ -1274,7 +1274,7 @@ static int prs_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Reserved"); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Panning width"); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Panning height"); - + if (extra != 0) offset = prs_uint8s(tvb, offset, pinfo, subtree, extra, NULL, "Private"); @@ -1302,16 +1302,16 @@ dissect_spoolss_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, item = proto_tree_add_string(tree, hf_index, tvb, offset, 4, ""); - subtree = proto_item_add_subtree(item, ett_RELSTR); + subtree = proto_item_add_subtree(item, ett_RELSTR); offset = dissect_ndr_uint32(tvb, offset, pinfo, subtree, drep, hf_spoolss_relstr_offset, &relstr_offset); - + /* A relative offset of zero is a NULL string */ relstr_start = relstr_offset + struct_start; - + if (relstr_offset) relstr_end = dissect_spoolss_uint16uni( tvb, relstr_start, pinfo, subtree, drep, &text); @@ -1328,7 +1328,7 @@ dissect_spoolss_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, *data = text; else g_free(text); - + return offset; } @@ -1350,16 +1350,16 @@ dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo, item = proto_tree_add_string(tree, hf_index, tvb, offset, 4, ""); - subtree = proto_item_add_subtree(item, ett_RELSTR_ARRAY); + subtree = proto_item_add_subtree(item, ett_RELSTR_ARRAY); offset = dissect_ndr_uint32(tvb, offset, pinfo, subtree, drep, hf_spoolss_relstr_offset, &relstr_offset); - + /* A relative offset of zero is a NULL string */ relstr_start = relstr_offset + struct_start; - + if (relstr_offset) relstr_end = dissect_spoolss_uint16uni( tvb, relstr_start, pinfo, subtree, drep, &text); @@ -1376,7 +1376,7 @@ dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo, *data = text; else g_free(text); - + return offset; } @@ -1394,15 +1394,15 @@ static int prs_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, /* A relative offset of zero is a NULL string */ relstr_start = relstr_offset + struct_start; - + if (relstr_offset) - relstr_end = prs_uint16uni(tvb, relstr_start, pinfo, tree, + relstr_end = prs_uint16uni(tvb, relstr_start, pinfo, tree, (void **)&text, NULL); else relstr_end = offset; - - item = proto_tree_add_text(tree, tvb, relstr_start, - relstr_end - relstr_start, "%s: %s", + + item = proto_tree_add_text(tree, tvb, relstr_start, + relstr_end - relstr_start, "%s: %s", name ? name : "RELSTR", text); subtree = proto_item_add_subtree(item, ett_RELSTR); @@ -1412,10 +1412,10 @@ static int prs_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, else g_free(text); - proto_tree_add_text(subtree, tvb, offset - 4, 4, + proto_tree_add_text(subtree, tvb, offset - 4, 4, "Relative offset: %d", relstr_offset); - proto_tree_add_text(subtree, tvb, relstr_start, + proto_tree_add_text(subtree, tvb, relstr_start, relstr_end - relstr_start, "Data"); return offset; @@ -1428,7 +1428,7 @@ static int prs_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_INFO_0 = -1; static int prs_PRINTER_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, GList **dp_list, + proto_tree *tree, GList **dp_list, void **data _U_) { int struct_start = offset; @@ -1492,22 +1492,22 @@ static int prs_PRINTER_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_INFO_1 = -1; static int prs_PRINTER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, GList **dp_list, + proto_tree *tree, GList **dp_list, void **data _U_) { int struct_start = offset; offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Description"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Comment"); - + return offset; } @@ -1600,61 +1600,61 @@ dissect_printer_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, subtree = proto_item_add_subtree(item, ett_printer_attributes); proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_published, + subtree, hf_spoolss_printer_attributes_published, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_raw_only, + subtree, hf_spoolss_printer_attributes_raw_only, tvb, offset - 4, 4, attributes); proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_enable_bidi, + subtree, hf_spoolss_printer_attributes_enable_bidi, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_work_offline, + subtree, hf_spoolss_printer_attributes_work_offline, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_do_complete_first, + subtree, hf_spoolss_printer_attributes_do_complete_first, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_keep_printed_jobs, + subtree, hf_spoolss_printer_attributes_keep_printed_jobs, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_enable_devq, + subtree, hf_spoolss_printer_attributes_enable_devq, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_local, + subtree, hf_spoolss_printer_attributes_local, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_hidden, + subtree, hf_spoolss_printer_attributes_hidden, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_network, + subtree, hf_spoolss_printer_attributes_network, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_shared, + subtree, hf_spoolss_printer_attributes_shared, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_default, + subtree, hf_spoolss_printer_attributes_default, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_direct, + subtree, hf_spoolss_printer_attributes_direct, tvb, offset - 4, 4, attributes); - + proto_tree_add_boolean( - subtree, hf_spoolss_printer_attributes_queued, + subtree, hf_spoolss_printer_attributes_queued, tvb, offset - 4, 4, attributes); - + return offset; } @@ -1665,30 +1665,30 @@ dissect_printer_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_INFO_2 = -1; static int prs_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, int len, GList **dp_list, + proto_tree *tree, int len, GList **dp_list, void **data _U_) { int struct_start = offset; guint32 rel_offset; - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Server name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Printer name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Share name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Port name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Driver name"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Comment"); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Location"); @@ -1696,9 +1696,9 @@ static int prs_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, tree, &rel_offset, NULL); - prs_DEVMODE(tvb, struct_start + rel_offset - 4, pinfo, tree, + prs_DEVMODE(tvb, struct_start + rel_offset - 4, pinfo, tree, dp_list, NULL); - + offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start, NULL, "Separator file"); @@ -1723,14 +1723,14 @@ static int prs_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, * lacking the "len" argument, so that won't work. */ dissect_nt_sec_desc(tvb, struct_start + rel_offset, tree, len); - + /* offset = dissect_printer_attributes(tvb, offset, pinfo, tree, drep); */ offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Attributes"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Priority"); - offset = prs_uint32(tvb, offset, pinfo, tree, NULL, + offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Default priority"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Start time"); @@ -1753,7 +1753,7 @@ static int prs_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_INFO_3 = -1; static int prs_PRINTER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, int len, GList **dp_list _U_, + proto_tree *tree, int len, GList **dp_list _U_, void **data _U_) { offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags"); @@ -1781,11 +1781,11 @@ static int prs_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, subtree = proto_item_add_subtree(item, ett_DEVMODE_CTR); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Size"); - + offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Devicemode"); if (ptr) - offset = prs_DEVMODE(tvb, offset, pinfo, subtree, dp_list, + offset = prs_DEVMODE(tvb, offset, pinfo, subtree, dp_list, data); return offset; @@ -1797,8 +1797,8 @@ static int prs_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_DEFAULT = -1; -static int prs_PRINTER_DEFAULT(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, GList **dp_list, +static int prs_PRINTER_DEFAULT(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, GList **dp_list, void **data _U_) { GList *child_dp_list = NULL; @@ -1817,12 +1817,12 @@ static int prs_PRINTER_DEFAULT(tvbuff_t *tvb, int offset, packet_info *pinfo, two structures stuck together. */ if (ptr) - offset = prs_UNISTR2_dp(tvb, offset, pinfo, subtree, dp_list, + offset = prs_UNISTR2_dp(tvb, offset, pinfo, subtree, dp_list, NULL); offset = prs_DEVMODE_CTR(tvb, offset, pinfo, subtree, &child_dp_list, NULL); - + offset = dissect_nt_access_mask( tvb, offset, pinfo, subtree, &drep, hf_access_required, spoolss_specific_rights); @@ -1839,8 +1839,8 @@ static int prs_PRINTER_DEFAULT(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_USER_LEVEL_1 = -1; -static int prs_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, GList **dp_list, +static int prs_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, GList **dp_list, void **data _U_) { proto_item *item; @@ -1870,7 +1870,7 @@ static int prs_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Minor"); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Processor"); - + return offset; } @@ -1880,7 +1880,7 @@ static int prs_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_USER_LEVEL = -1; -static int prs_USER_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo, +static int prs_USER_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, GList **parent_dp_list, void **data _U_) { @@ -1904,7 +1904,7 @@ static int prs_USER_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo, break; default: proto_tree_add_text( - tree, tvb, offset, 0, + tree, tvb, offset, 0, "[GetPrinter level %d not decoded]", level); break; } @@ -1917,8 +1917,8 @@ static int prs_USER_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo, * SpoolssOpenPrinterEx */ -static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -1926,7 +1926,7 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, guint32 ptr = 0; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1937,14 +1937,14 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, char *printer_name; offset = prs_struct_and_referents(tvb, offset, pinfo, tree, - prs_UNISTR2_dp, + prs_UNISTR2_dp, (void **)&printer_name, - NULL); + NULL); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", printer_name); - + /* Store printer name to match with reply packet */ dcv->private_data = printer_name; @@ -1964,7 +1964,7 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, } static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -1974,7 +1974,7 @@ static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset, int start_offset = offset; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* We need the value of the policy handle and status before we @@ -2075,25 +2075,25 @@ static const value_string job_notify_option_data_vals[] = { { 0, NULL} }; -static int +static int dissect_notify_field(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep, guint16 type, - guint16 *data) + guint16 *data) { guint16 field; char *str; offset = dissect_ndr_uint16( - tvb, offset, pinfo, NULL, drep, + tvb, offset, pinfo, NULL, drep, hf_spoolss_notify_field, &field); - + switch(type) { case PRINTER_NOTIFY_TYPE: - str = val_to_str(field, printer_notify_option_data_vals, + str = val_to_str(field, printer_notify_option_data_vals, "Unknown"); break; case JOB_NOTIFY_TYPE: - str = val_to_str(field, job_notify_option_data_vals, + str = val_to_str(field, job_notify_option_data_vals, "Unknown"); break; default: @@ -2110,9 +2110,9 @@ dissect_notify_field(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -static int +static int dissect_NOTIFY_OPTION_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, char *drep) { dcerpc_info *di = pinfo->private_data; guint32 count, i; @@ -2124,7 +2124,7 @@ dissect_NOTIFY_OPTION_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, type = di->levels; offset = dissect_ndr_uint32( - tvb, offset, pinfo, tree, drep, + tvb, offset, pinfo, tree, drep, hf_spoolss_notify_option_data_count, &count); for (i = 0; i < count; i++) @@ -2143,9 +2143,9 @@ static const value_string printer_notify_types[] = static gint ett_NOTIFY_OPTION = -1; -static int +static int dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, char *drep) { proto_item *item; proto_tree *subtree; @@ -2158,7 +2158,7 @@ dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_uint16(tvb, offset, pinfo, subtree, drep, hf_spoolss_notify_option_type, &type); - proto_item_append_text(item, ": %s", + proto_item_append_text(item, ": %s", val_to_str(type, printer_notify_types, "Unknown (%d)")); offset = dissect_ndr_uint16(tvb, offset, pinfo, subtree, drep, @@ -2174,7 +2174,7 @@ dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, hf_spoolss_notify_option_count, NULL); offset = dissect_ndr_pointer( - tvb, offset, pinfo, subtree, drep, + tvb, offset, pinfo, subtree, drep, dissect_NOTIFY_OPTION_DATA, NDR_POINTER_UNIQUE, "NOTIFY_OPTION_DATA", -1, type); @@ -2182,8 +2182,8 @@ dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_NOTIFY_OPTIONS_ARRAY(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_NOTIFY_OPTIONS_ARRAY(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { /* Why is a check for di->conformant_run not required here? */ @@ -2219,15 +2219,15 @@ dissect_notify_options_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, subtree = proto_item_add_subtree(item, ett_notify_options_flags); proto_tree_add_boolean( - subtree, hf_spoolss_notify_options_flags_refresh, + subtree, hf_spoolss_notify_options_flags_refresh, tvb, offset, 4, flags); - + return offset; } static int -dissect_NOTIFY_OPTIONS_ARRAY_CTR(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +dissect_NOTIFY_OPTIONS_ARRAY_CTR(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = pinfo->private_data; @@ -2384,8 +2384,8 @@ static const true_false_string tfs_rffpcnex_flags_timeout = { "Don't notify on timeout" }; -static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -2395,7 +2395,7 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, proto_tree *flags_subtree; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2403,7 +2403,7 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, FALSE, FALSE); - offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, hf_spoolss_rffpcnex_flags, &flags); flags_item = proto_tree_add_text(tree, tvb, offset - 4, 4, @@ -2412,85 +2412,85 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, flags_subtree = proto_item_add_subtree(flags_item, ett_rffpcnex_flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_timeout, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_timeout, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_delete_driver, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_delete_driver, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_set_driver, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_set_driver, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_driver, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_add_driver, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, - hf_spoolss_rffpcnex_flags_delete_print_processor, tvb, + flags_subtree, + hf_spoolss_rffpcnex_flags_delete_print_processor, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_print_processor, + flags_subtree, hf_spoolss_rffpcnex_flags_add_print_processor, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_delete_port, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_delete_port, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_configure_port, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_configure_port, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_port, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_add_port, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_delete_form, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_delete_form, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_set_form, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_set_form, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_form, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_add_form, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_write_job, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_write_job, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_delete_job, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_delete_job, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_set_job, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_set_job, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_job, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_add_job, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, - hf_spoolss_rffpcnex_flags_failed_printer_connection, tvb, + flags_subtree, + hf_spoolss_rffpcnex_flags_failed_printer_connection, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_delete_printer, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_delete_printer, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_set_printer, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_set_printer, tvb, offset - 4, 4, flags); proto_tree_add_boolean( - flags_subtree, hf_spoolss_rffpcnex_flags_add_printer, tvb, + flags_subtree, hf_spoolss_rffpcnex_flags_add_printer, tvb, offset - 4, 4, flags); if (flags & PRINTER_CHANGE_PRINTER) @@ -2530,14 +2530,14 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, } static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2554,8 +2554,8 @@ static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset, * SpoolssReplyOpenPrinter */ -static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -2563,7 +2563,7 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, guint32 printerlocal; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2588,10 +2588,10 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -2599,7 +2599,7 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, e_ctx_hnd policy_hnd; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2616,7 +2616,7 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * BUFFER_DATA @@ -2628,7 +2628,7 @@ static gint ett_BUFFER_DATA_BUFFER = -1; struct BUFFER_DATA { proto_item *item; /* proto_item holding proto_tree */ proto_tree *tree; /* proto_tree holding buffer data */ - tvbuff_t *tvb; + tvbuff_t *tvb; int offset; /* Offset where data starts in tvb*/ int size; /* Size of buffer data */ }; @@ -2711,7 +2711,7 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2735,7 +2735,7 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -2748,7 +2748,7 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, gint16 level = (guint32)dcv->private_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); if (check_col(pinfo->cinfo, COL_INFO)) @@ -2767,15 +2767,15 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, switch (level) { case 0: - prs_PRINTER_INFO_0(bd->tvb, bd->offset, pinfo, + prs_PRINTER_INFO_0(bd->tvb, bd->offset, pinfo, bd->tree, &dp_list, NULL); break; - + case 1: - prs_PRINTER_INFO_1(bd->tvb, bd->offset, pinfo, + prs_PRINTER_INFO_1(bd->tvb, bd->offset, pinfo, bd->tree, &dp_list, NULL); break; - + case 2: prs_PRINTER_INFO_2(bd->tvb, bd->offset, pinfo, bd->tree, bd->size, &dp_list, NULL); @@ -2801,7 +2801,7 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SEC_DESC_BUF @@ -2810,7 +2810,7 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_SEC_DESC_BUF = -1; static int prs_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, GList **dp_list _U_, + proto_tree *tree, GList **dp_list _U_, void **Data _U_) { proto_item *item; @@ -2824,7 +2824,7 @@ static int prs_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, subtree, &len, "Max length"); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Undocumented"); offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Length"); - + dissect_nt_sec_desc(tvb, offset, subtree, len); offset += len; @@ -2838,15 +2838,15 @@ static int prs_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_SPOOL_PRINTER_INFO_LEVEL = -1; -static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, GList **dp_list, void **data _U_) { proto_item *item; proto_tree *subtree; guint32 level; - item = proto_tree_add_text(tree, tvb, offset, 0, + item = proto_tree_add_text(tree, tvb, offset, 0, "SPOOL_PRINTER_INFO_LEVEL"); subtree = proto_item_add_subtree(item, ett_SPOOL_PRINTER_INFO_LEVEL); @@ -2868,7 +2868,7 @@ static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset, if (ptr) defer_ptr(dp_list, prs_SEC_DESC_BUF, subtree); - + break; } case 2: { @@ -2891,7 +2891,7 @@ static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset, default: proto_tree_add_text(subtree, tvb, offset, 0, "[Unknown info level %d]", level); - break; + break; } return offset; @@ -2909,7 +2909,7 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2934,7 +2934,7 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -2943,7 +2943,7 @@ static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2954,7 +2954,7 @@ static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * FORM_REL @@ -3034,7 +3034,7 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3058,7 +3058,7 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3070,7 +3070,7 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int buffer_offset; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3084,7 +3084,7 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level); - + offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_spoolss_enumforms_num, &count); @@ -3100,7 +3100,7 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int struct_start = buffer.offset; buffer_offset = dissect_FORM_REL( - tvb, buffer_offset, pinfo, buffer.tree, drep, + tvb, buffer_offset, pinfo, buffer.tree, drep, struct_start); } @@ -3110,21 +3110,21 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SpoolssDeletePrinter */ -static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3136,17 +3136,17 @@ static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3161,28 +3161,28 @@ static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * AddPrinterEx */ #if 0 -static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; guint32 ptr; - + if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ - + offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Server name"); - + if (ptr) { char *printer_name; @@ -3193,24 +3193,24 @@ static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset, if (printer_name) dcv->private_data = printer_name; } - + offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Level"); - + /* TODO: PRINTER INFO LEVEL */ - + offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown"); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown"); - + offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "User switch"); - + /* TODO: USER LEVEL */ - + dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); - + return offset; -} +} #endif static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3221,7 +3221,7 @@ static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 status; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3241,7 +3241,7 @@ static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr( - pinfo->cinfo, COL_INFO, ", %s", + pinfo->cinfo, COL_INFO, ", %s", (char *)dcv->private_data); dcerpc_smb_store_pol_name( @@ -3255,14 +3255,14 @@ static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SpoolssEnumPrinterData */ -static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -3270,7 +3270,7 @@ static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, guint32 ndx; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3278,26 +3278,26 @@ static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, offset = dissect_nt_policy_hnd( tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, FALSE, FALSE); - + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, - hf_spoolss_enumprinterdata_index, &ndx); + hf_spoolss_enumprinterdata_index, &ndx); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", index %d", ndx); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, - hf_spoolss_enumprinterdata_value_offered, NULL); + hf_spoolss_enumprinterdata_value_offered, NULL); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, - hf_spoolss_enumprinterdata_data_offered, NULL); + hf_spoolss_enumprinterdata_data_offered, NULL); dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -3308,7 +3308,7 @@ static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, int uint16s_offset; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3317,30 +3317,30 @@ static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, value_subtree = proto_item_add_subtree(value_item, ett_printerdata_value); - offset = prs_uint32(tvb, offset, pinfo, value_subtree, &value_size, + offset = prs_uint32(tvb, offset, pinfo, value_subtree, &value_size, "Value size"); - + offset = prs_uint16s(tvb, offset, pinfo, value_subtree, value_size, &uint16s_offset, NULL); - + if (value_size) { char *text = fake_unicode(tvb, uint16s_offset, value_size); - + proto_tree_add_text(value_subtree, tvb, uint16s_offset, value_size * 2, "Value: %s", text); - + proto_item_append_text(value_item, ": %s", text); - + if (text[0] && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", text); - + g_free(text); } proto_item_set_len(value_item, value_size * 2 + 4); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, - hf_spoolss_enumprinterdata_value_needed, NULL); + hf_spoolss_enumprinterdata_value_needed, NULL); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_printerdata_type, NULL); @@ -3348,15 +3348,15 @@ static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, offset = dissect_printerdata_data(tvb, offset, pinfo, tree, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, - hf_spoolss_enumprinterdata_data_needed, NULL); + hf_spoolss_enumprinterdata_data_needed, NULL); offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_spoolss_rc, NULL); - + dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SpoolssEnumPrinters @@ -3382,7 +3382,7 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item *flags_item; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3430,11 +3430,11 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, prs_UNISTR2_dp, NULL, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level"); - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", level, %d", level); - - offset = prs_struct_and_referents(tvb, offset, pinfo, tree, + + offset = prs_struct_and_referents(tvb, offset, pinfo, tree, prs_BUFFER, NULL, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered"); @@ -3442,7 +3442,7 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3451,12 +3451,12 @@ static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ - offset = prs_struct_and_referents(tvb, offset, pinfo, tree, + offset = prs_struct_and_referents(tvb, offset, pinfo, tree, prs_BUFFER, NULL, NULL); offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed"); @@ -3469,21 +3469,21 @@ static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * AddPrinterDriver */ #if 0 -static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3499,17 +3499,17 @@ static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} #endif -static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3520,7 +3520,7 @@ static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * FORM_1 @@ -3656,7 +3656,7 @@ static int dissect_form_name(tvbuff_t *tvb, int offset, packet_info *pinfo, * AddForm */ -static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, +static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -3664,7 +3664,7 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3689,7 +3689,7 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3698,7 +3698,7 @@ static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3709,7 +3709,7 @@ static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * DeleteForm @@ -3722,7 +3722,7 @@ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3737,7 +3737,7 @@ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3746,7 +3746,7 @@ static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3757,13 +3757,13 @@ static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SetForm */ -static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, +static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -3771,7 +3771,7 @@ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3791,11 +3791,11 @@ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level); offset = dissect_FORM_CTR(tvb, offset, pinfo, tree, drep); - + dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3804,7 +3804,7 @@ static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3815,7 +3815,7 @@ static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * GetForm @@ -3829,7 +3829,7 @@ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -3860,7 +3860,7 @@ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -3872,7 +3872,7 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level = (guint32)dcv->private_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -3886,8 +3886,8 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level); - - if (!buffer.size) + + if (!buffer.size) goto done; buffer_offset = buffer.offset; @@ -3915,24 +3915,24 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* A generic reply function that just parses the status code. Useful for unimplemented dissectors so the status code can be inserted into the INFO column. */ -static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, +static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; int len = tvb_length(tvb); - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "[Unimplemented dissector: SPOOLSS]"); if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); offset = dissect_doserror(tvb, len - 4, pinfo, tree, drep, @@ -3948,7 +3948,7 @@ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_SYSTEM_TIME; static int -dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { proto_item *item; @@ -3996,7 +3996,7 @@ dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_JOB_INFO_1; static int -dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { proto_item *item; @@ -4110,8 +4110,8 @@ static int prs_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = prs_uint32(tvb, offset, pinfo, tree, &rel_offset, NULL); - prs_DEVMODE(tvb, struct_start + rel_offset - 4, pinfo, tree, - dp_list, NULL); + prs_DEVMODE(tvb, struct_start + rel_offset - 4, pinfo, tree, + dp_list, NULL); /* XXX security descriptor */ @@ -4155,7 +4155,7 @@ static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %d", dcv->rep_frame); /* Parse packet */ @@ -4187,7 +4187,7 @@ static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep _U_) @@ -4200,13 +4200,13 @@ static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int buffer_offset; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %d", dcv->req_frame); /* Parse packet */ offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep, - &buffer); + &buffer); offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, @@ -4226,7 +4226,7 @@ static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo, case 2: default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, buffer.size, + buffer.tree, tvb, buffer_offset, buffer.size, "[Unknown info level %d]", level); goto done; } @@ -4240,7 +4240,7 @@ done: dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * SetJob @@ -4271,7 +4271,7 @@ static int SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 jobid, cmd; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4298,7 +4298,7 @@ static int SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssSetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -4307,7 +4307,7 @@ static int SpoolssSetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4318,7 +4318,7 @@ static int SpoolssSetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * GetJob @@ -4332,7 +4332,7 @@ static int SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 level, jobid; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4357,12 +4357,12 @@ static int SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, - hf_spoolss_offered, NULL); + hf_spoolss_offered, NULL); dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -4374,12 +4374,12 @@ static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int buffer_offset; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ - offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep, + offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep, &buffer); if (!buffer.size) @@ -4395,7 +4395,7 @@ static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, case 2: default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, buffer.size, + buffer.tree, tvb, buffer_offset, buffer.size, "[Unknown info level %d]", level); goto done; } @@ -4411,14 +4411,14 @@ done: dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * StartPagePrinter */ -static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4427,7 +4427,7 @@ static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, char *pol_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4445,17 +4445,17 @@ static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssStartPagePrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssStartPagePrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4466,14 +4466,14 @@ static int SpoolssStartPagePrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * EndPagePrinter */ -static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4482,7 +4482,7 @@ static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, char *pol_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4500,17 +4500,17 @@ static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssEndPagePrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEndPagePrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4521,7 +4521,7 @@ static int SpoolssEndPagePrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * DOC_INFO_1 @@ -4563,7 +4563,7 @@ dissect_spoolss_doc_info_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = pinfo->private_data; - + if (di->conformant_run) return offset; @@ -4629,8 +4629,8 @@ dissect_spoolss_doc_info_ctr(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_uint32(tvb, offset, pinfo, subtree, drep, hf_spoolss_level, NULL); - offset = dissect_spoolss_doc_info( - tvb, offset, pinfo, subtree, drep); + offset = dissect_spoolss_doc_info( + tvb, offset, pinfo, subtree, drep); return offset; } @@ -4639,8 +4639,8 @@ dissect_spoolss_doc_info_ctr(tvbuff_t *tvb, int offset, packet_info *pinfo, * StartDocPrinter */ -static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4649,7 +4649,7 @@ static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, char *pol_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4669,17 +4669,17 @@ static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssStartDocPrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssStartDocPrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4693,14 +4693,14 @@ static int SpoolssStartDocPrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * EndDocPrinter */ -static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4709,7 +4709,7 @@ static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, char *pol_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4727,17 +4727,17 @@ static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssEndDocPrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEndDocPrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4748,7 +4748,7 @@ static int SpoolssEndDocPrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * WritePrinter @@ -4768,7 +4768,7 @@ static int SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *subtree; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4801,7 +4801,7 @@ static int SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssWritePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -4810,7 +4810,7 @@ static int SpoolssWritePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4824,14 +4824,14 @@ static int SpoolssWritePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * DeletePrinterData */ -static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4839,7 +4839,7 @@ static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, char *value_name; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -4860,17 +4860,17 @@ static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -4881,7 +4881,7 @@ static int SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* @@ -4890,8 +4890,8 @@ static int SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, static gint ett_DRIVER_INFO_1 = -1; -static int dissect_DRIVER_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int dissect_DRIVER_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { proto_item *item; @@ -4923,8 +4923,8 @@ static const value_string driverinfo_cversion_vals[] = static gint ett_DRIVER_INFO_3 = -1; -static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { proto_item *item; @@ -4972,7 +4972,7 @@ static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, offset = dissect_spoolss_relstr( tvb, offset, pinfo, subtree, drep, hf_spoolss_defaultdatatype, - struct_start, NULL); + struct_start, NULL); return offset; } @@ -4981,8 +4981,8 @@ static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, * EnumPrinterDrivers */ -static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -4990,7 +4990,7 @@ static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -5022,10 +5022,10 @@ static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -5035,7 +5035,7 @@ static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, BUFFER buffer; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5065,12 +5065,12 @@ static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, break; default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, buffer.size, + buffer.tree, tvb, buffer_offset, buffer.size, "[Unknown info level %d]", level); goto done; } } - + done: offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_spoolss_rc, NULL); @@ -5078,14 +5078,14 @@ done: dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * GetPrinterDriver2 */ -static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -5095,7 +5095,7 @@ static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, guint32 level; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -5138,10 +5138,10 @@ static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -5150,12 +5150,12 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, BUFFER buffer; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ - offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep, + offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep, &buffer); switch(level) { @@ -5169,7 +5169,7 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, break; default: proto_tree_add_text( - buffer.tree, tvb, buffer.offset, buffer.size, + buffer.tree, tvb, buffer.offset, buffer.size, "[Unknown info level %d]", level); break; } @@ -5190,7 +5190,7 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int dissect_notify_info_data_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, @@ -5210,9 +5210,9 @@ dissect_notify_info_data_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -static int +static int dissect_NOTIFY_INFO_DATA_printer(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, guint16 field) + proto_tree *tree, char *drep, guint16 field) { guint32 value1; @@ -5238,16 +5238,16 @@ dissect_NOTIFY_INFO_DATA_printer(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, - dissect_notify_info_data_buffer, - NDR_POINTER_UNIQUE, "String", + dissect_notify_info_data_buffer, + NDR_POINTER_UNIQUE, "String", hf_spoolss_notify_info_data_buffer, value1 / 2); break; case PRINTER_NOTIFY_ATTRIBUTES: - + /* Value 1 is the printer attributes */ - + offset = dissect_printer_attributes( tvb, offset, pinfo, tree, drep); @@ -5282,8 +5282,8 @@ dissect_NOTIFY_INFO_DATA_printer(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, - dissect_notify_info_data_buffer, - NDR_POINTER_UNIQUE, "Buffer", + dissect_notify_info_data_buffer, + NDR_POINTER_UNIQUE, "Buffer", hf_spoolss_notify_info_data_buffer, value1 / 2); break; @@ -5302,9 +5302,9 @@ dissect_NOTIFY_INFO_DATA_printer(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -static int +static int dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, guint16 field) + proto_tree *tree, char *drep, guint16 field) { guint32 value1; @@ -5330,8 +5330,8 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, - dissect_notify_info_data_buffer, - NDR_POINTER_UNIQUE, "String", + dissect_notify_info_data_buffer, + NDR_POINTER_UNIQUE, "String", hf_spoolss_notify_info_data_buffer, value1 / 2); break; @@ -5357,7 +5357,7 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, - dissect_SYSTEM_TIME, NDR_POINTER_UNIQUE, + dissect_SYSTEM_TIME, NDR_POINTER_UNIQUE, "SYSTEM_TIME", -1, 0); break; @@ -5372,8 +5372,8 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, - dissect_notify_info_data_buffer, - NDR_POINTER_UNIQUE, "Buffer", + dissect_notify_info_data_buffer, + NDR_POINTER_UNIQUE, "Buffer", hf_spoolss_notify_info_data_buffer, value1 / 2); break; @@ -5392,9 +5392,9 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_NOTIFY_INFO_DATA; -static int +static int dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, char *drep) { proto_item *item; proto_tree *subtree; @@ -5428,8 +5428,8 @@ dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, } proto_item_append_text( - item, ": %s, %s", - val_to_str(type, printer_notify_types, "Unknown (%d)"), + item, ": %s, %s", + val_to_str(type, printer_notify_types, "Unknown (%d)"), field_string); offset = dissect_ndr_uint32( @@ -5467,9 +5467,9 @@ dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } -static int +static int dissect_NOTIFY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_notify_info_version, NULL); @@ -5497,14 +5497,14 @@ static int SpoolssRFNPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ offset = dissect_nt_policy_hnd( tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, - FALSE, FALSE); + FALSE, FALSE); offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, @@ -5518,7 +5518,7 @@ static int SpoolssRFNPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -5527,7 +5527,7 @@ static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5543,7 +5543,7 @@ static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * RRPCN @@ -5556,14 +5556,14 @@ static int SpoolssRRPCN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ offset = dissect_nt_policy_hnd( tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, - FALSE, FALSE); + FALSE, FALSE); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_rrpcn_changelow, NULL); @@ -5587,7 +5587,7 @@ static int SpoolssRRPCN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssRRPCN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -5596,7 +5596,7 @@ static int SpoolssRRPCN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5610,21 +5610,21 @@ static int SpoolssRRPCN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * ReplyClosePrinter */ -static int SpoolssReplyClosePrinter_q(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssReplyClosePrinter_q(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -5636,17 +5636,17 @@ static int SpoolssReplyClosePrinter_q(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} -static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5661,7 +5661,7 @@ static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * FCPN @@ -5674,19 +5674,19 @@ static int SpoolssFCPN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, - FALSE, FALSE); + FALSE, FALSE); dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -5695,7 +5695,7 @@ static int SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5706,7 +5706,7 @@ static int SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} /* * RouterReplyPrinter @@ -5719,14 +5719,14 @@ static int SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *p dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_spoolss_hnd, NULL, - FALSE, FALSE); + FALSE, FALSE); offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, @@ -5743,7 +5743,7 @@ static int SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *p dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -5752,7 +5752,7 @@ static int SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *p dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5763,7 +5763,7 @@ static int SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *p dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} #if 0 @@ -5780,7 +5780,7 @@ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->rep_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Reply in frame %u", dcv->rep_frame); /* Parse packet */ @@ -5788,7 +5788,7 @@ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) @@ -5797,7 +5797,7 @@ static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; if (dcv->req_frame != 0) - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -5808,7 +5808,7 @@ static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree); return offset; -} +} #endif @@ -5817,167 +5817,167 @@ static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static dcerpc_sub_dissector dcerpc_spoolss_dissectors[] = { - { SPOOLSS_ENUMPRINTERS, "EnumPrinters", + { SPOOLSS_ENUMPRINTERS, "EnumPrinters", SpoolssEnumPrinters_q, SpoolssEnumPrinters_r }, - { SPOOLSS_OPENPRINTER, "OpenPrinter", + { SPOOLSS_OPENPRINTER, "OpenPrinter", NULL, SpoolssGeneric_r }, - { SPOOLSS_SETJOB, "SetJob", + { SPOOLSS_SETJOB, "SetJob", SpoolssSetJob_q, SpoolssSetJob_r }, - { SPOOLSS_GETJOB, "GetJob", + { SPOOLSS_GETJOB, "GetJob", SpoolssGetJob_q, SpoolssGetJob_r }, - { SPOOLSS_ENUMJOBS, "EnumJobs", + { SPOOLSS_ENUMJOBS, "EnumJobs", SpoolssEnumJobs_q, SpoolssEnumJobs_r }, - { SPOOLSS_ADDPRINTER, "AddPrinter", + { SPOOLSS_ADDPRINTER, "AddPrinter", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTER, "DeletePrinter", + { SPOOLSS_DELETEPRINTER, "DeletePrinter", SpoolssDeletePrinter_q, SpoolssDeletePrinter_r }, - { SPOOLSS_SETPRINTER, "SetPrinter", + { SPOOLSS_SETPRINTER, "SetPrinter", SpoolssSetPrinter_q, SpoolssSetPrinter_r }, - { SPOOLSS_GETPRINTER, "GetPrinter", + { SPOOLSS_GETPRINTER, "GetPrinter", SpoolssGetPrinter_q, SpoolssGetPrinter_r }, - { SPOOLSS_ADDPRINTERDRIVER, "AddPrinterDriver", + { SPOOLSS_ADDPRINTERDRIVER, "AddPrinterDriver", NULL, SpoolssAddPrinterDriver_r }, - { SPOOLSS_ENUMPRINTERDRIVERS, "EnumPrinterDrivers", + { SPOOLSS_ENUMPRINTERDRIVERS, "EnumPrinterDrivers", SpoolssEnumPrinterDrivers_q, SpoolssEnumPrinterDrivers_r }, - { SPOOLSS_GETPRINTERDRIVER, "GetPrinterDriver", + { SPOOLSS_GETPRINTERDRIVER, "GetPrinterDriver", NULL, SpoolssGeneric_r }, - { SPOOLSS_GETPRINTERDRIVERDIRECTORY, "GetPrinterDriverDirectory", + { SPOOLSS_GETPRINTERDRIVERDIRECTORY, "GetPrinterDriverDirectory", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTERDRIVER, "DeletePrinterDriver", + { SPOOLSS_DELETEPRINTERDRIVER, "DeletePrinterDriver", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDPRINTPROCESSOR, "AddPrintProcessor", + { SPOOLSS_ADDPRINTPROCESSOR, "AddPrintProcessor", NULL, SpoolssGeneric_r }, - { SPOOLSS_ENUMPRINTPROCESSORS, "EnumPrintProcessor", + { SPOOLSS_ENUMPRINTPROCESSORS, "EnumPrintProcessor", NULL, SpoolssGeneric_r }, - { SPOOLSS_GETPRINTPROCESSORDIRECTORY, "GetPrintProcessorDirectory", + { SPOOLSS_GETPRINTPROCESSORDIRECTORY, "GetPrintProcessorDirectory", NULL, SpoolssGeneric_r }, - { SPOOLSS_STARTDOCPRINTER, "StartDocPrinter", + { SPOOLSS_STARTDOCPRINTER, "StartDocPrinter", SpoolssStartDocPrinter_q, SpoolssStartDocPrinter_r }, - { SPOOLSS_STARTPAGEPRINTER, "StartPagePrinter", + { SPOOLSS_STARTPAGEPRINTER, "StartPagePrinter", SpoolssStartPagePrinter_q, SpoolssStartPagePrinter_r }, - { SPOOLSS_WRITEPRINTER, "WritePrinter", + { SPOOLSS_WRITEPRINTER, "WritePrinter", SpoolssWritePrinter_q, SpoolssWritePrinter_r }, - { SPOOLSS_ENDPAGEPRINTER, "EndPagePrinter", + { SPOOLSS_ENDPAGEPRINTER, "EndPagePrinter", SpoolssEndPagePrinter_q, SpoolssEndPagePrinter_r }, - { SPOOLSS_ABORTPRINTER, "AbortPrinter", + { SPOOLSS_ABORTPRINTER, "AbortPrinter", NULL, SpoolssGeneric_r }, - { SPOOLSS_READPRINTER, "ReadPrinter", + { SPOOLSS_READPRINTER, "ReadPrinter", NULL, SpoolssGeneric_r }, - { SPOOLSS_ENDDOCPRINTER, "EndDocPrinter", + { SPOOLSS_ENDDOCPRINTER, "EndDocPrinter", SpoolssEndDocPrinter_q, SpoolssEndDocPrinter_r }, - { SPOOLSS_ADDJOB, "AddJob", + { SPOOLSS_ADDJOB, "AddJob", NULL, SpoolssGeneric_r }, - { SPOOLSS_SCHEDULEJOB, "ScheduleJob", + { SPOOLSS_SCHEDULEJOB, "ScheduleJob", NULL, SpoolssGeneric_r }, - { SPOOLSS_GETPRINTERDATA, "GetPrinterData", - SpoolssGetPrinterData_q, SpoolssGetPrinterData_r }, - { SPOOLSS_SETPRINTERDATA, "SetPrinterData", + { SPOOLSS_GETPRINTERDATA, "GetPrinterData", + SpoolssGetPrinterData_q, SpoolssGetPrinterData_r }, + { SPOOLSS_SETPRINTERDATA, "SetPrinterData", SpoolssSetPrinterData_q, SpoolssSetPrinterData_r }, - { SPOOLSS_WAITFORPRINTERCHANGE, "WaitForPrinterChange", + { SPOOLSS_WAITFORPRINTERCHANGE, "WaitForPrinterChange", NULL, SpoolssGeneric_r }, - { SPOOLSS_CLOSEPRINTER, "ClosePrinter", + { SPOOLSS_CLOSEPRINTER, "ClosePrinter", SpoolssClosePrinter_q, SpoolssClosePrinter_r }, - { SPOOLSS_ADDFORM, "AddForm", + { SPOOLSS_ADDFORM, "AddForm", SpoolssAddForm_q, SpoolssAddForm_r }, - { SPOOLSS_DELETEFORM, "DeleteForm", + { SPOOLSS_DELETEFORM, "DeleteForm", SpoolssDeleteForm_q, SpoolssDeleteForm_r }, - { SPOOLSS_GETFORM, "GetForm", + { SPOOLSS_GETFORM, "GetForm", SpoolssGetForm_q, SpoolssGetForm_r }, - { SPOOLSS_SETFORM, "SetForm", + { SPOOLSS_SETFORM, "SetForm", SpoolssSetForm_q, SpoolssSetForm_r }, - { SPOOLSS_ENUMFORMS, "EnumForms", + { SPOOLSS_ENUMFORMS, "EnumForms", SpoolssEnumForms_q, SpoolssEnumForms_r }, - { SPOOLSS_ENUMPORTS, "EnumPorts", + { SPOOLSS_ENUMPORTS, "EnumPorts", NULL, SpoolssGeneric_r }, - { SPOOLSS_ENUMMONITORS, "EnumMonitors", + { SPOOLSS_ENUMMONITORS, "EnumMonitors", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDPORT, "AddPort", + { SPOOLSS_ADDPORT, "AddPort", NULL, SpoolssGeneric_r }, - { SPOOLSS_CONFIGUREPORT, "ConfigurePort", + { SPOOLSS_CONFIGUREPORT, "ConfigurePort", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPORT, "DeletePort", + { SPOOLSS_DELETEPORT, "DeletePort", NULL, SpoolssGeneric_r }, - { SPOOLSS_CREATEPRINTERIC, "CreatePrinterIC", + { SPOOLSS_CREATEPRINTERIC, "CreatePrinterIC", NULL, SpoolssGeneric_r }, - { SPOOLSS_PLAYGDISCRIPTONPRINTERIC, "PlayDiscriptOnPrinterIC", + { SPOOLSS_PLAYGDISCRIPTONPRINTERIC, "PlayDiscriptOnPrinterIC", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTERIC, "DeletePrinterIC", + { SPOOLSS_DELETEPRINTERIC, "DeletePrinterIC", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDPRINTERCONNECTION, "AddPrinterConnection", + { SPOOLSS_ADDPRINTERCONNECTION, "AddPrinterConnection", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTERCONNECTION, "DeletePrinterConnection", + { SPOOLSS_DELETEPRINTERCONNECTION, "DeletePrinterConnection", NULL, SpoolssGeneric_r }, - { SPOOLSS_PRINTERMESSAGEBOX, "PrinterMessageBox", + { SPOOLSS_PRINTERMESSAGEBOX, "PrinterMessageBox", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDMONITOR, "AddMonitor", + { SPOOLSS_ADDMONITOR, "AddMonitor", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEMONITOR, "DeleteMonitor", + { SPOOLSS_DELETEMONITOR, "DeleteMonitor", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTPROCESSOR, "DeletePrintProcessor", + { SPOOLSS_DELETEPRINTPROCESSOR, "DeletePrintProcessor", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDPRINTPROVIDER, "AddPrintProvider", + { SPOOLSS_ADDPRINTPROVIDER, "AddPrintProvider", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTPROVIDER, "DeletePrintProvider", + { SPOOLSS_DELETEPRINTPROVIDER, "DeletePrintProvider", NULL, SpoolssGeneric_r }, - { SPOOLSS_ENUMPRINTPROCDATATYPES, "EnumPrintProcDataTypes", + { SPOOLSS_ENUMPRINTPROCDATATYPES, "EnumPrintProcDataTypes", NULL, SpoolssGeneric_r }, - { SPOOLSS_RESETPRINTER, "ResetPrinter", + { SPOOLSS_RESETPRINTER, "ResetPrinter", NULL, SpoolssGeneric_r }, - { SPOOLSS_GETPRINTERDRIVER2, "GetPrinterDriver2", + { SPOOLSS_GETPRINTERDRIVER2, "GetPrinterDriver2", SpoolssGetPrinterDriver2_q, SpoolssGetPrinterDriver2_r }, - { SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION, - "FindFirstPrinterChangeNotification", + { SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION, + "FindFirstPrinterChangeNotification", NULL, SpoolssGeneric_r }, - { SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION, - "FindNextPrinterChangeNotification", + { SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION, + "FindNextPrinterChangeNotification", NULL, SpoolssGeneric_r }, - { SPOOLSS_FCPN, "FCPN", + { SPOOLSS_FCPN, "FCPN", SpoolssFCPN_q, SpoolssFCPN_r }, - { SPOOLSS_ROUTERFINDFIRSTPRINTERNOTIFICATIONOLD, - "RouterFindFirstPrinterNotificationOld", + { SPOOLSS_ROUTERFINDFIRSTPRINTERNOTIFICATIONOLD, + "RouterFindFirstPrinterNotificationOld", NULL, SpoolssGeneric_r }, - { SPOOLSS_REPLYOPENPRINTER, "ReplyOpenPrinter", + { SPOOLSS_REPLYOPENPRINTER, "ReplyOpenPrinter", SpoolssReplyOpenPrinter_q, SpoolssReplyOpenPrinter_r }, - { SPOOLSS_ROUTERREPLYPRINTER, "RouterReplyPrinter", + { SPOOLSS_ROUTERREPLYPRINTER, "RouterReplyPrinter", SpoolssRouterReplyPrinter_q, SpoolssRouterReplyPrinter_r }, - { SPOOLSS_REPLYCLOSEPRINTER, "ReplyClosePrinter", + { SPOOLSS_REPLYCLOSEPRINTER, "ReplyClosePrinter", SpoolssReplyClosePrinter_q, SpoolssReplyClosePrinter_r }, - { SPOOLSS_ADDPORTEX, "AddPortEx", + { SPOOLSS_ADDPORTEX, "AddPortEx", NULL, SpoolssGeneric_r }, - { SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFICATION, - "RemoteFindFirstPrinterChangeNotification", + { SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFICATION, + "RemoteFindFirstPrinterChangeNotification", NULL, SpoolssGeneric_r }, - { SPOOLSS_SPOOLERINIT, "SpoolerInit", + { SPOOLSS_SPOOLERINIT, "SpoolerInit", NULL, SpoolssGeneric_r }, - { SPOOLSS_RESETPRINTEREX, "ResetPrinterEx", + { SPOOLSS_RESETPRINTEREX, "ResetPrinterEx", NULL, SpoolssGeneric_r }, - { SPOOLSS_RFFPCNEX, "RFFPCNEX", + { SPOOLSS_RFFPCNEX, "RFFPCNEX", SpoolssRFFPCNEX_q, SpoolssRFFPCNEX_r }, - { SPOOLSS_RRPCN, "RRPCN", + { SPOOLSS_RRPCN, "RRPCN", SpoolssRRPCN_q, SpoolssRRPCN_r }, - { SPOOLSS_RFNPCNEX, "RFNPCNEX", + { SPOOLSS_RFNPCNEX, "RFNPCNEX", SpoolssRFNPCNEX_q, SpoolssRFNPCNEX_r }, - { SPOOLSS_OPENPRINTEREX, "OpenPrinterEx", + { SPOOLSS_OPENPRINTEREX, "OpenPrinterEx", SpoolssOpenPrinterEx_q, SpoolssOpenPrinterEx_r }, - { SPOOLSS_ADDPRINTEREX, "AddPrinterEx", + { SPOOLSS_ADDPRINTEREX, "AddPrinterEx", NULL, SpoolssAddPrinterEx_r }, - { SPOOLSS_ENUMPRINTERDATA, "EnumPrinterData", + { SPOOLSS_ENUMPRINTERDATA, "EnumPrinterData", SpoolssEnumPrinterData_q, SpoolssEnumPrinterData_r }, - { SPOOLSS_DELETEPRINTERDATA, "DeletePrinterData", + { SPOOLSS_DELETEPRINTERDATA, "DeletePrinterData", SpoolssDeletePrinterData_q, SpoolssDeletePrinterData_r }, - { SPOOLSS_GETPRINTERDATAEX, "GetPrinterDataEx", + { SPOOLSS_GETPRINTERDATAEX, "GetPrinterDataEx", SpoolssGetPrinterDataEx_q, SpoolssGetPrinterDataEx_r }, - { SPOOLSS_SETPRINTERDATAEX, "SetPrinterDataEx", + { SPOOLSS_SETPRINTERDATAEX, "SetPrinterDataEx", SpoolssSetPrinterDataEx_q, SpoolssSetPrinterDataEx_r }, - { SPOOLSS_ENUMPRINTERDATAEX, "EnumPrinterDataEx", + { SPOOLSS_ENUMPRINTERDATAEX, "EnumPrinterDataEx", NULL, SpoolssGeneric_r }, - { SPOOLSS_ENUMPRINTERKEY, "EnumPrinterKey", + { SPOOLSS_ENUMPRINTERKEY, "EnumPrinterKey", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTERDATAEX, "DeletePrinterDataEx", + { SPOOLSS_DELETEPRINTERDATAEX, "DeletePrinterDataEx", NULL, SpoolssGeneric_r }, - { SPOOLSS_DELETEPRINTERDRIVEREX, "DeletePrinterDriverEx", + { SPOOLSS_DELETEPRINTERDRIVEREX, "DeletePrinterDriverEx", NULL, SpoolssGeneric_r }, - { SPOOLSS_ADDPRINTERDRIVEREX, "AddPrinterDriverEx", + { SPOOLSS_ADDPRINTERDRIVEREX, "AddPrinterDriverEx", NULL, SpoolssGeneric_r }, { 0, NULL, NULL, NULL }, @@ -5992,7 +5992,7 @@ static dcerpc_sub_dissector dcerpc_spoolss_dissectors[] = { static int proto_dcerpc_spoolss = -1; static gint ett_dcerpc_spoolss = -1; -void +void proto_register_dcerpc_spoolss(void) { static hf_register_info hf[] = { @@ -6004,22 +6004,22 @@ proto_register_dcerpc_spoolss(void) VALS(spoolss_opnum_vals), 0x0, "Operation", HFILL }}, { &hf_spoolss_hnd, - { "Context handle", "spoolss.hnd", FT_BYTES, BASE_NONE, + { "Context handle", "spoolss.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "SPOOLSS policy handle", HFILL }}, { &hf_spoolss_rc, - { "Return code", "spoolss.rc", FT_UINT32, BASE_HEX, + { "Return code", "spoolss.rc", FT_UINT32, BASE_HEX, VALS(DOS_errors), 0x0, "SPOOLSS return code", HFILL }}, { &hf_spoolss_offered, - { "Offered", "spoolss.offered", FT_UINT32, BASE_DEC, + { "Offered", "spoolss.offered", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of buffer offered in this request", HFILL }}, { &hf_spoolss_needed, - { "Needed", "spoolss.needed", FT_UINT32, BASE_DEC, + { "Needed", "spoolss.needed", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of buffer required for request", HFILL }}, { &hf_spoolss_returned, - { "Returned", "spoolss.returned", FT_UINT32, BASE_DEC, + { "Returned", "spoolss.returned", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of items returned", HFILL }}, { &hf_spoolss_relstr_offset, - { "Relative string offset", "spoolss.relstr.offset", FT_UINT32, BASE_DEC, + { "Relative string offset", "spoolss.relstr.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "Offset of relative string data", HFILL }}, { &hf_spoolss_printername, { "Printer name", "spoolss.printername", FT_STRING, BASE_NONE, @@ -6049,124 +6049,124 @@ proto_register_dcerpc_spoolss(void) { "Text status", "spoolss.textstatus", FT_STRING, BASE_NONE, NULL, 0, "Text status", HFILL }}, { &hf_spoolss_buffer_size, - { "Buffer size", "spoolss.buffer.size", FT_UINT32, BASE_DEC, + { "Buffer size", "spoolss.buffer.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of buffer", HFILL }}, { &hf_spoolss_buffer_data, - { "Buffer data", "spoolss.buffer.data", FT_BYTES, BASE_HEX, + { "Buffer data", "spoolss.buffer.data", FT_BYTES, BASE_HEX, NULL, 0x0, "Contents of buffer", HFILL }}, { &hf_spoolss_enumjobs_firstjob, - { "First job", "spoolss.enumjobs.firstjob", FT_UINT32, BASE_DEC, + { "First job", "spoolss.enumjobs.firstjob", FT_UINT32, BASE_DEC, NULL, 0x0, "Index of first job to return", HFILL }}, { &hf_spoolss_enumjobs_numjobs, - { "Num jobs", "spoolss.enumjobs.numjobs", FT_UINT32, BASE_DEC, + { "Num jobs", "spoolss.enumjobs.numjobs", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of jobs to return", HFILL }}, { &hf_spoolss_level, - { "Info level", "spoolss.enumjobs.level", FT_UINT32, BASE_DEC, + { "Info level", "spoolss.enumjobs.level", FT_UINT32, BASE_DEC, NULL, 0x0, "Info level", HFILL }}, /* Print jobs */ { &hf_spoolss_jobid, - { "Job ID", "spoolss.job.id", FT_UINT32, BASE_DEC, + { "Job ID", "spoolss.job.id", FT_UINT32, BASE_DEC, NULL, 0x0, "Job identification number", HFILL }}, { &hf_spoolss_job_status, - { "Job status", "spoolss.job.status", FT_UINT32, BASE_DEC, + { "Job status", "spoolss.job.status", FT_UINT32, BASE_DEC, NULL, 0x0, "Job status", HFILL }}, - + { &hf_spoolss_job_status_paused, - { "Paused", "spoolss.job.status.paused", FT_BOOLEAN, 32, + { "Paused", "spoolss.job.status.paused", FT_BOOLEAN, 32, TFS(&tfs_job_status_paused), JOB_STATUS_PAUSED, "Paused", HFILL }}, - + { &hf_spoolss_job_status_error, - { "Error", "spoolss.job.status.error", FT_BOOLEAN, 32, + { "Error", "spoolss.job.status.error", FT_BOOLEAN, 32, TFS(&tfs_job_status_error), JOB_STATUS_ERROR, "Error", HFILL }}, - + { &hf_spoolss_job_status_deleting, - { "Deleting", "spoolss.job.status.deleting", FT_BOOLEAN, 32, + { "Deleting", "spoolss.job.status.deleting", FT_BOOLEAN, 32, TFS(&tfs_job_status_deleting), JOB_STATUS_DELETING, "Deleting", HFILL }}, - + { &hf_spoolss_job_status_spooling, - { "Spooling", "spoolss.job.status.spooling", FT_BOOLEAN, 32, + { "Spooling", "spoolss.job.status.spooling", FT_BOOLEAN, 32, TFS(&tfs_job_status_spooling), JOB_STATUS_SPOOLING, "Spooling", HFILL }}, - + { &hf_spoolss_job_status_printing, - { "Printing", "spoolss.job.status.printing", FT_BOOLEAN, 32, + { "Printing", "spoolss.job.status.printing", FT_BOOLEAN, 32, TFS(&tfs_job_status_printing), JOB_STATUS_PRINTING, "Printing", HFILL }}, - + { &hf_spoolss_job_status_offline, - { "Offline", "spoolss.job.status.offline", FT_BOOLEAN, 32, + { "Offline", "spoolss.job.status.offline", FT_BOOLEAN, 32, TFS(&tfs_job_status_offline), JOB_STATUS_OFFLINE, "Offline", HFILL }}, - + { &hf_spoolss_job_status_paperout, - { "Paperout", "spoolss.job.status.paperout", FT_BOOLEAN, 32, + { "Paperout", "spoolss.job.status.paperout", FT_BOOLEAN, 32, TFS(&tfs_job_status_paperout), JOB_STATUS_PAPEROUT, "Paperout", HFILL }}, - + { &hf_spoolss_job_status_printed, - { "Printed", "spoolss.job.status.printed", FT_BOOLEAN, 32, + { "Printed", "spoolss.job.status.printed", FT_BOOLEAN, 32, TFS(&tfs_job_status_printed), JOB_STATUS_PRINTED, "Printed", HFILL }}, - + { &hf_spoolss_job_status_deleted, - { "Deleted", "spoolss.job.status.deleted", FT_BOOLEAN, 32, + { "Deleted", "spoolss.job.status.deleted", FT_BOOLEAN, 32, TFS(&tfs_job_status_deleted), JOB_STATUS_DELETED, "Deleted", HFILL }}, - + { &hf_spoolss_job_status_blocked, - { "Blocked", "spoolss.job.status.blocked", FT_BOOLEAN, 32, + { "Blocked", "spoolss.job.status.blocked", FT_BOOLEAN, 32, TFS(&tfs_job_status_blocked), JOB_STATUS_BLOCKED, "Blocked", HFILL }}, - + { &hf_spoolss_job_status_user_intervention, - { "User intervention", "spoolss.job.status.user_intervention", FT_BOOLEAN, 32, + { "User intervention", "spoolss.job.status.user_intervention", FT_BOOLEAN, 32, TFS(&tfs_job_status_user_intervention), JOB_STATUS_USER_INTERVENTION, "User intervention", HFILL }}, - + { &hf_spoolss_jobpriority, - { "Job priority", "spoolss.job.priority", FT_UINT32, BASE_DEC, + { "Job priority", "spoolss.job.priority", FT_UINT32, BASE_DEC, NULL, 0x0, "Job priority", HFILL }}, { &hf_spoolss_jobposition, - { "Job position", "spoolss.job.position", FT_UINT32, BASE_DEC, + { "Job position", "spoolss.job.position", FT_UINT32, BASE_DEC, NULL, 0x0, "Job position", HFILL }}, { &hf_spoolss_jobtotalpages, - { "Job total pages", "spoolss.job.totalpages", FT_UINT32, BASE_DEC, + { "Job total pages", "spoolss.job.totalpages", FT_UINT32, BASE_DEC, NULL, 0x0, "Job total pages", HFILL }}, { &hf_spoolss_jobpagesprinted, - { "Job pages printed", "spoolss.job.pagesprinted", FT_UINT32, BASE_DEC, + { "Job pages printed", "spoolss.job.pagesprinted", FT_UINT32, BASE_DEC, NULL, 0x0, "Job identification number", HFILL }}, /* SYSTEM_TIME */ { &hf_spoolss_time_year, - { "Year", "spoolss.time.year", FT_UINT32, BASE_DEC, + { "Year", "spoolss.time.year", FT_UINT32, BASE_DEC, NULL, 0x0, "Year", HFILL }}, { &hf_spoolss_time_month, - { "Month", "spoolss.time.month", FT_UINT32, BASE_DEC, + { "Month", "spoolss.time.month", FT_UINT32, BASE_DEC, NULL, 0x0, "Month", HFILL }}, { &hf_spoolss_time_dow, - { "Day of week", "spoolss.time.dow", FT_UINT32, BASE_DEC, + { "Day of week", "spoolss.time.dow", FT_UINT32, BASE_DEC, NULL, 0x0, "Day of week", HFILL }}, { &hf_spoolss_time_day, - { "Day", "spoolss.time.day", FT_UINT32, BASE_DEC, + { "Day", "spoolss.time.day", FT_UINT32, BASE_DEC, NULL, 0x0, "Day", HFILL }}, { &hf_spoolss_time_hour, - { "Hour", "spoolss.time.hour", FT_UINT32, BASE_DEC, + { "Hour", "spoolss.time.hour", FT_UINT32, BASE_DEC, NULL, 0x0, "Hour", HFILL }}, { &hf_spoolss_time_minute, - { "Minute", "spoolss.time.minute", FT_UINT32, BASE_DEC, + { "Minute", "spoolss.time.minute", FT_UINT32, BASE_DEC, NULL, 0x0, "Minute", HFILL }}, { &hf_spoolss_time_second, - { "Second", "spoolss.time.second", FT_UINT32, BASE_DEC, + { "Second", "spoolss.time.second", FT_UINT32, BASE_DEC, NULL, 0x0, "Second", HFILL }}, { &hf_spoolss_time_msec, - { "Millisecond", "spoolss.time.msec", FT_UINT32, BASE_DEC, + { "Millisecond", "spoolss.time.msec", FT_UINT32, BASE_DEC, NULL, 0x0, "Millisecond", HFILL }}, /* Printer data */ @@ -6182,50 +6182,50 @@ proto_register_dcerpc_spoolss(void) /* SetJob RPC */ { &hf_spoolss_setjob_cmd, - { "Set job command", "spoolss.setjob.cmd", FT_UINT32, BASE_DEC, + { "Set job command", "spoolss.setjob.cmd", FT_UINT32, BASE_DEC, VALS(setjob_commands), 0x0, "Printer data name", HFILL }}, /* WritePrinter */ { &hf_spoolss_writeprinter_numwritten, - { "Num written", "spoolss.writeprinter.numwritten", FT_UINT32, BASE_DEC, + { "Num written", "spoolss.writeprinter.numwritten", FT_UINT32, BASE_DEC, NULL, 0x0, "Number of bytes written", HFILL }}, /* EnumPrinterData */ { &hf_spoolss_enumprinterdata_index, - { "Enum index", "spoolss.enumprinterdata.index", FT_UINT32, BASE_DEC, + { "Enum index", "spoolss.enumprinterdata.index", FT_UINT32, BASE_DEC, NULL, 0x0, "Index for start of enumeration", HFILL }}, { &hf_spoolss_enumprinterdata_value_offered, - { "Value size offered", "spoolss.enumprinterdata.value_offered", FT_UINT32, BASE_DEC, + { "Value size offered", "spoolss.enumprinterdata.value_offered", FT_UINT32, BASE_DEC, NULL, 0x0, "Buffer size offered for printerdata value", HFILL }}, { &hf_spoolss_enumprinterdata_data_offered, - { "Data size offered", "spoolss.enumprinterdata.data_offered", FT_UINT32, BASE_DEC, + { "Data size offered", "spoolss.enumprinterdata.data_offered", FT_UINT32, BASE_DEC, NULL, 0x0, "Buffer size offered for printerdata data", HFILL }}, { &hf_spoolss_enumprinterdata_value_needed, - { "Value size needed", "spoolss.enumprinterdata.value_needed", FT_UINT32, BASE_DEC, + { "Value size needed", "spoolss.enumprinterdata.value_needed", FT_UINT32, BASE_DEC, NULL, 0x0, "Buffer size needed for printerdata value", HFILL }}, { &hf_spoolss_enumprinterdata_data_needed, - { "Data size needed", "spoolss.enumprinterdata.data_needed", FT_UINT32, BASE_DEC, + { "Data size needed", "spoolss.enumprinterdata.data_needed", FT_UINT32, BASE_DEC, NULL, 0x0, "Buffer size needed for printerdata data", HFILL }}, /* GetPrinterDriver2 */ { &hf_spoolss_clientmajorversion, - { "Client major version", "spoolss.clientmajorversion", FT_UINT32, BASE_DEC, + { "Client major version", "spoolss.clientmajorversion", FT_UINT32, BASE_DEC, NULL, 0x0, "Client printer driver major version", HFILL }}, { &hf_spoolss_clientminorversion, - { "Client minor version", "spoolss.clientminorversion", FT_UINT32, BASE_DEC, + { "Client minor version", "spoolss.clientminorversion", FT_UINT32, BASE_DEC, NULL, 0x0, "Client printer driver minor version", HFILL }}, { &hf_spoolss_servermajorversion, - { "Server major version", "spoolss.servermajorversion", FT_UINT32, BASE_DEC, + { "Server major version", "spoolss.servermajorversion", FT_UINT32, BASE_DEC, NULL, 0x0, "Server printer driver major version", HFILL }}, { &hf_spoolss_serverminorversion, - { "Server minor version", "spoolss.serverminorversion", FT_UINT32, BASE_DEC, + { "Server minor version", "spoolss.serverminorversion", FT_UINT32, BASE_DEC, NULL, 0x0, "Server printer driver minor version", HFILL }}, { &hf_spoolss_driverpath, { "Driver path", "spoolss.driverpath", FT_STRING, BASE_NONE, @@ -6256,209 +6256,209 @@ proto_register_dcerpc_spoolss(void) { &hf_spoolss_rffpcnex_options, { "Options", "spoolss.rffpcnex.options", FT_UINT32, BASE_DEC, - NULL, 0, "RFFPCNEX options", HFILL }}, + NULL, 0, "RFFPCNEX options", HFILL }}, { &hf_spoolss_printerlocal, { "Printer local", "spoolss.printer_local", FT_UINT32, BASE_DEC, - NULL, 0, "Printer local", HFILL }}, + NULL, 0, "Printer local", HFILL }}, { &hf_spoolss_rffpcnex_flags, { "RFFPCNEX flags", "spoolss.rffpcnex.flags", FT_UINT32, BASE_DEC, - NULL, 0, "RFFPCNEX flags", HFILL }}, + NULL, 0, "RFFPCNEX flags", HFILL }}, { &hf_spoolss_rffpcnex_flags_add_printer, - { "Add printer", "spoolss.rffpcnex.flags.add_printer", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_printer), + { "Add printer", "spoolss.rffpcnex.flags.add_printer", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_printer), PRINTER_CHANGE_ADD_PRINTER, "Add printer", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_set_printer, - { "Set printer", "spoolss.rffpcnex.flags.set_printer", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_printer), + { "Set printer", "spoolss.rffpcnex.flags.set_printer", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_printer), PRINTER_CHANGE_SET_PRINTER, "Set printer", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_printer, - { "Delete printer", "spoolss.rffpcnex.flags.delete_printer", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_printer), + { "Delete printer", "spoolss.rffpcnex.flags.delete_printer", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_printer), PRINTER_CHANGE_DELETE_PRINTER, "Delete printer", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_add_job, - { "Add job", "spoolss.rffpcnex.flags.add_job", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_job), + { "Add job", "spoolss.rffpcnex.flags.add_job", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_job), PRINTER_CHANGE_ADD_JOB, "Add job", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_set_job, - { "Set job", "spoolss.rffpcnex.flags.set_job", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_job), + { "Set job", "spoolss.rffpcnex.flags.set_job", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_job), PRINTER_CHANGE_SET_JOB, "Set job", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_job, - { "Delete job", "spoolss.rffpcnex.flags.delete_job", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_job), + { "Delete job", "spoolss.rffpcnex.flags.delete_job", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_job), PRINTER_CHANGE_DELETE_JOB, "Delete job", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_write_job, - { "Write job", "spoolss.rffpcnex.flags.write_job", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_write_job), + { "Write job", "spoolss.rffpcnex.flags.write_job", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_write_job), PRINTER_CHANGE_WRITE_JOB, "Write job", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_add_form, - { "Add form", "spoolss.rffpcnex.flags.add_form", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_form), + { "Add form", "spoolss.rffpcnex.flags.add_form", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_form), PRINTER_CHANGE_ADD_FORM, "Add form", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_set_form, - { "Set form", "spoolss.rffpcnex.flags.set_form", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_form), + { "Set form", "spoolss.rffpcnex.flags.set_form", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_form), PRINTER_CHANGE_SET_FORM, "Set form", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_form, - { "Delete form", "spoolss.rffpcnex.flags.delete_form", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_form), + { "Delete form", "spoolss.rffpcnex.flags.delete_form", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_form), PRINTER_CHANGE_DELETE_FORM, "Delete form", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_add_port, - { "Add port", "spoolss.rffpcnex.flags.add_port", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_port), + { "Add port", "spoolss.rffpcnex.flags.add_port", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_port), PRINTER_CHANGE_ADD_PORT, "Add port", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_configure_port, - { "Configure port", "spoolss.rffpcnex.flags.configure_port", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_configure_port), + { "Configure port", "spoolss.rffpcnex.flags.configure_port", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_configure_port), PRINTER_CHANGE_CONFIGURE_PORT, "Configure port", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_port, - { "Delete port", "spoolss.rffpcnex.flags.delete_port", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_port), + { "Delete port", "spoolss.rffpcnex.flags.delete_port", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_port), PRINTER_CHANGE_DELETE_PORT, "Delete port", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_add_print_processor, - { "Add processor", "spoolss.rffpcnex.flags.add_processor", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_print_processor), + { "Add processor", "spoolss.rffpcnex.flags.add_processor", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_print_processor), PRINTER_CHANGE_ADD_PRINT_PROCESSOR, "Add processor", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_print_processor, - { "Delete processor", "spoolss.rffpcnex.flags.delete_processor", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_print_processor), + { "Delete processor", "spoolss.rffpcnex.flags.delete_processor", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_print_processor), PRINTER_CHANGE_DELETE_PRINT_PROCESSOR, "Delete processor", HFILL }}, { &hf_spoolss_rffpcnex_flags_add_driver, - { "Add driver", "spoolss.rffpcnex.flags.add_driver", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_driver), + { "Add driver", "spoolss.rffpcnex.flags.add_driver", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_driver), PRINTER_CHANGE_ADD_PRINTER_DRIVER, "Add driver", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_set_driver, - { "Set driver", "spoolss.rffpcnex.flags.set_driver", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_driver), + { "Set driver", "spoolss.rffpcnex.flags.set_driver", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_driver), PRINTER_CHANGE_SET_PRINTER_DRIVER, "Set driver", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_delete_driver, - { "Delete driver", "spoolss.rffpcnex.flags.delete_driver", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_driver), + { "Delete driver", "spoolss.rffpcnex.flags.delete_driver", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_driver), PRINTER_CHANGE_DELETE_PRINTER_DRIVER, "Delete driver", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_timeout, - { "Timeout", "spoolss.rffpcnex.flags.timeout", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_timeout), + { "Timeout", "spoolss.rffpcnex.flags.timeout", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_timeout), PRINTER_CHANGE_TIMEOUT, "Timeout", HFILL }}, - + { &hf_spoolss_rffpcnex_flags_failed_printer_connection, - { "Failed printer connection", "spoolss.rffpcnex.flags.failed_connection_printer", - FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_failed_connection_printer), + { "Failed printer connection", "spoolss.rffpcnex.flags.failed_connection_printer", + FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_failed_connection_printer), PRINTER_CHANGE_FAILED_CONNECTION_PRINTER, "Failed printer connection", HFILL }}, - + { &hf_spoolss_notify_options_version, { "Version", "spoolss.notify_options.version", FT_UINT32, BASE_DEC, - NULL, 0, "Version", HFILL }}, + NULL, 0, "Version", HFILL }}, { &hf_spoolss_notify_options_flags, { "Flags", "spoolss.notify_options.flags", FT_UINT32, BASE_DEC, - NULL, 0, "Flags", HFILL }}, + NULL, 0, "Flags", HFILL }}, { &hf_spoolss_notify_options_count, { "Count", "spoolss.notify_options.count", FT_UINT32, BASE_DEC, - NULL, 0, "Count", HFILL }}, + NULL, 0, "Count", HFILL }}, { &hf_spoolss_notify_option_type, { "Type", "spoolss.notify_option.type", FT_UINT16, BASE_DEC, - VALS(printer_notify_types), 0, "Type", HFILL }}, + VALS(printer_notify_types), 0, "Type", HFILL }}, { &hf_spoolss_notify_option_reserved1, { "Reserved1", "spoolss.notify_option.reserved1", FT_UINT16, BASE_DEC, - NULL, 0, "Reserved1", HFILL }}, + NULL, 0, "Reserved1", HFILL }}, { &hf_spoolss_notify_option_reserved2, { "Reserved2", "spoolss.notify_option.reserved2", FT_UINT32, BASE_DEC, - NULL, 0, "Reserved2", HFILL }}, + NULL, 0, "Reserved2", HFILL }}, { &hf_spoolss_notify_option_reserved3, { "Reserved3", "spoolss.notify_option.reserved3", FT_UINT32, BASE_DEC, - NULL, 0, "Reserved3", HFILL }}, + NULL, 0, "Reserved3", HFILL }}, { &hf_spoolss_notify_option_count, { "Count", "spoolss.notify_option.count", FT_UINT32, BASE_DEC, - NULL, 0, "Count", HFILL }}, + NULL, 0, "Count", HFILL }}, { &hf_spoolss_notify_option_data_count, { "Count", "spoolss.notify_option_data.count", FT_UINT32, BASE_DEC, - NULL, 0, "Count", HFILL }}, + NULL, 0, "Count", HFILL }}, { &hf_spoolss_notify_options_flags_refresh, { "Refresh", "spoolss.notify_options.flags", FT_BOOLEAN, 32, - TFS(&tfs_notify_options_flags_refresh), PRINTER_NOTIFY_OPTIONS_REFRESH, - "Refresh", HFILL }}, + TFS(&tfs_notify_options_flags_refresh), PRINTER_NOTIFY_OPTIONS_REFRESH, + "Refresh", HFILL }}, { &hf_spoolss_notify_info_count, { "Count", "spoolss.notify_info.count", FT_UINT32, BASE_DEC, - NULL, 0, "Count", HFILL }}, + NULL, 0, "Count", HFILL }}, { &hf_spoolss_notify_info_version, { "Version", "spoolss.notify_info.version", FT_UINT32, BASE_DEC, - NULL, 0, "Version", HFILL }}, + NULL, 0, "Version", HFILL }}, { &hf_spoolss_notify_info_flags, { "Flags", "spoolss.notify_info.flags", FT_UINT32, BASE_HEX, - NULL, 0, "Flags", HFILL }}, + NULL, 0, "Flags", HFILL }}, { &hf_spoolss_notify_info_data_type, { "Type", "spoolss.notify_info_data.type", FT_UINT16, BASE_DEC, - VALS(printer_notify_types), 0, "Type", HFILL }}, + VALS(printer_notify_types), 0, "Type", HFILL }}, { &hf_spoolss_notify_field, { "Field", "spoolss.notify_field", FT_UINT16, BASE_DEC, - NULL, 0, "Field", HFILL }}, + NULL, 0, "Field", HFILL }}, { &hf_spoolss_notify_info_data_count, { "Count", "spoolss.notify_info_data.count", FT_UINT32, BASE_DEC, - NULL, 0, "Count", HFILL }}, + NULL, 0, "Count", HFILL }}, { &hf_spoolss_notify_info_data_id, { "Job Id", "spoolss.notify_info_data.jobid", FT_UINT32, BASE_DEC, - NULL, 0, "Job Id", HFILL }}, + NULL, 0, "Job Id", HFILL }}, { &hf_spoolss_notify_info_data_value1, { "Value1", "spoolss.notify_info_data.value1", FT_UINT32, BASE_HEX, - NULL, 0, "Value1", HFILL }}, + NULL, 0, "Value1", HFILL }}, { &hf_spoolss_notify_info_data_value2, { "Value2", "spoolss.notify_info_data.value2", FT_UINT32, BASE_HEX, - NULL, 0, "Value2", HFILL }}, + NULL, 0, "Value2", HFILL }}, { &hf_spoolss_notify_info_data_bufsize, { "Buffer size", "spoolss.notify_info_data.bufsize", FT_UINT32, BASE_DEC, - NULL, 0, "Buffer size", HFILL }}, + NULL, 0, "Buffer size", HFILL }}, { &hf_spoolss_notify_info_data_buffer, { "Buffer", "spoolss.notify_info_data.buffer", FT_UINT32, BASE_HEX, - NULL, 0, "Buffer", HFILL }}, + NULL, 0, "Buffer", HFILL }}, { &hf_spoolss_notify_info_data_buffer_len, { "Buffer length", "spoolss.notify_info_data.buffer.len", FT_UINT32, BASE_HEX, - NULL, 0, "Buffer length", HFILL }}, + NULL, 0, "Buffer length", HFILL }}, { &hf_spoolss_notify_info_data_buffer_data, { "Buffer data", "spoolss.notify_info_data.buffer.data", FT_BYTES, BASE_HEX, - NULL, 0, "Buffer data", HFILL }}, + NULL, 0, "Buffer data", HFILL }}, { &hf_spoolss_rrpcn_changelow, { "Change low", "spoolss.rrpcn.changelow", FT_UINT32, BASE_DEC, - NULL, 0, "Change low", HFILL }}, + NULL, 0, "Change low", HFILL }}, { &hf_spoolss_rrpcn_changehigh, { "Change high", "spoolss.rrpcn.changehigh", FT_UINT32, BASE_DEC, - NULL, 0, "Change high", HFILL }}, + NULL, 0, "Change high", HFILL }}, { &hf_spoolss_rrpcn_unk0, { "Unknown 0", "spoolss.rrpcn.unk0", FT_UINT32, BASE_DEC, - NULL, 0, "Unknown 0", HFILL }}, + NULL, 0, "Unknown 0", HFILL }}, { &hf_spoolss_rrpcn_unk1, { "Unknown 1", "spoolss.rrpcn.unk1", FT_UINT32, BASE_DEC, - NULL, 0, "Unknown 1", HFILL }}, + NULL, 0, "Unknown 1", HFILL }}, { &hf_spoolss_replyopenprinter_unk0, { "Unknown 0", "spoolss.replyopenprinter.unk0", FT_UINT32, BASE_DEC, - NULL, 0, "Unknown 0", HFILL }}, + NULL, 0, "Unknown 0", HFILL }}, { &hf_spoolss_replyopenprinter_unk1, { "Unknown 1", "spoolss.replyopenprinter.unk1", FT_UINT32, BASE_DEC, - NULL, 0, "Unknown 1", HFILL }}, + NULL, 0, "Unknown 1", HFILL }}, { &hf_spoolss_printer_status, { "Status", "spoolss.printer_status", FT_UINT32, BASE_DEC, @@ -6467,77 +6467,77 @@ proto_register_dcerpc_spoolss(void) /* Printer attributes */ { &hf_spoolss_printer_attributes, - { "Attributes", "spoolss.printer_attributes", FT_UINT32, + { "Attributes", "spoolss.printer_attributes", FT_UINT32, BASE_HEX, NULL, 0, "Attributes", HFILL }}, { &hf_spoolss_printer_attributes_queued, { "Queued", "spoolss.printer_attributes.queued", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_queued), + 32, TFS(&tfs_printer_attributes_queued), PRINTER_ATTRIBUTE_QUEUED, "Queued", HFILL }}, { &hf_spoolss_printer_attributes_direct, { "Direct", "spoolss.printer_attributes.direct", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_direct), + 32, TFS(&tfs_printer_attributes_direct), PRINTER_ATTRIBUTE_DIRECT, "Direct", HFILL }}, { &hf_spoolss_printer_attributes_default, { "Default (9x/ME only)", "spoolss.printer_attributes.default",FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_default), + 32, TFS(&tfs_printer_attributes_default), PRINTER_ATTRIBUTE_DEFAULT, "Default", HFILL }}, { &hf_spoolss_printer_attributes_shared, { "Shared", "spoolss.printer_attributes.shared", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_shared), + 32, TFS(&tfs_printer_attributes_shared), PRINTER_ATTRIBUTE_SHARED, "Shared", HFILL }}, { &hf_spoolss_printer_attributes_network, { "Network", "spoolss.printer_attributes.network", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_network), + 32, TFS(&tfs_printer_attributes_network), PRINTER_ATTRIBUTE_NETWORK, "Network", HFILL }}, { &hf_spoolss_printer_attributes_hidden, { "Hidden", "spoolss.printer_attributes.hidden", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_hidden), + 32, TFS(&tfs_printer_attributes_hidden), PRINTER_ATTRIBUTE_HIDDEN, "Hidden", HFILL }}, { &hf_spoolss_printer_attributes_local, { "Local", "spoolss.printer_attributes.local", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_local), + 32, TFS(&tfs_printer_attributes_local), PRINTER_ATTRIBUTE_LOCAL, "Local", HFILL }}, { &hf_spoolss_printer_attributes_enable_devq, { "Enable devq", "spoolss.printer_attributes.enable_devq", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_enable_devq), + 32, TFS(&tfs_printer_attributes_enable_devq), PRINTER_ATTRIBUTE_ENABLE_DEVQ, "Enable evq", HFILL }}, { &hf_spoolss_printer_attributes_keep_printed_jobs, { "Keep printed jobs", "spoolss.printer_attributes.keep_printed_jobs", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_keep_printed_jobs), + 32, TFS(&tfs_printer_attributes_keep_printed_jobs), PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS, "Keep printed jobs", HFILL }}, { &hf_spoolss_printer_attributes_do_complete_first, { "Do complete first", "spoolss.printer_attributes.do_complete_first", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_do_complete_first), + 32, TFS(&tfs_printer_attributes_do_complete_first), PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST, "Do complete first", HFILL }}, { &hf_spoolss_printer_attributes_work_offline, { "Work offline (9x/ME only)", "spoolss.printer_attributes.work_offline", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_work_offline), + 32, TFS(&tfs_printer_attributes_work_offline), PRINTER_ATTRIBUTE_WORK_OFFLINE, "Work offline", HFILL }}, { &hf_spoolss_printer_attributes_enable_bidi, { "Enable bidi (9x/ME only)", "spoolss.printer_attributes.enable_bidi", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_enable_bidi), + 32, TFS(&tfs_printer_attributes_enable_bidi), PRINTER_ATTRIBUTE_ENABLE_BIDI, "Enable bidi", HFILL }}, { &hf_spoolss_printer_attributes_raw_only, { "Raw only", "spoolss.printer_attributes.raw_only", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_raw_only), + 32, TFS(&tfs_printer_attributes_raw_only), PRINTER_ATTRIBUTE_RAW_ONLY, "Raw only", HFILL }}, { &hf_spoolss_printer_attributes_published, { "Published", "spoolss.printer_attributes.published", FT_BOOLEAN, - 32, TFS(&tfs_printer_attributes_published), + 32, TFS(&tfs_printer_attributes_published), PRINTER_ATTRIBUTE_PUBLISHED, "Published", HFILL }}, /* Setprinter RPC */ @@ -6549,160 +6549,160 @@ proto_register_dcerpc_spoolss(void) /* RouterReplyPrinter RPC */ { &hf_spoolss_routerreplyprinter_condition, - { "Condition", "spoolss.routerreplyprinter.condition", FT_UINT32, + { "Condition", "spoolss.routerreplyprinter.condition", FT_UINT32, BASE_DEC, NULL, 0, "Condition", HFILL }}, { &hf_spoolss_routerreplyprinter_unknown1, - { "Unknown1", "spoolss.routerreplyprinter.unknown1", FT_UINT32, + { "Unknown1", "spoolss.routerreplyprinter.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "Unknown1", HFILL }}, { &hf_spoolss_routerreplyprinter_changeid, - { "Change id", "spoolss.routerreplyprinter.changeid", FT_UINT32, + { "Change id", "spoolss.routerreplyprinter.changeid", FT_UINT32, BASE_DEC, NULL, 0, "Change id", HFILL }}, /* Forms */ { &hf_spoolss_form_level, - { "Level", "spoolss.form.level", FT_UINT32, + { "Level", "spoolss.form.level", FT_UINT32, BASE_DEC, NULL, 0, "Level", HFILL }}, - + { &hf_spoolss_form_name, { "Name", "spoolss.form.name", FT_STRING, BASE_NONE, NULL, 0, "Name", HFILL }}, { &hf_spoolss_form_flags, - { "Flags", "spoolss.form.flags", FT_UINT32, + { "Flags", "spoolss.form.flags", FT_UINT32, BASE_DEC, NULL, 0, "Flags", HFILL }}, - + { &hf_spoolss_form_unknown, - { "Unknown", "spoolss.form.unknown", FT_UINT32, + { "Unknown", "spoolss.form.unknown", FT_UINT32, BASE_HEX, NULL, 0, "Unknown", HFILL }}, - + { &hf_spoolss_form_width, - { "Width", "spoolss.form.width", FT_UINT32, + { "Width", "spoolss.form.width", FT_UINT32, BASE_DEC, NULL, 0, "Width", HFILL }}, - + { &hf_spoolss_form_height, - { "Height", "spoolss.form.height", FT_UINT32, + { "Height", "spoolss.form.height", FT_UINT32, BASE_DEC, NULL, 0, "Height", HFILL }}, - + { &hf_spoolss_form_left_margin, - { "Left margin", "spoolss.form.left", FT_UINT32, + { "Left margin", "spoolss.form.left", FT_UINT32, BASE_DEC, NULL, 0, "Left", HFILL }}, - + { &hf_spoolss_form_top_margin, - { "Top", "spoolss.form.top", FT_UINT32, + { "Top", "spoolss.form.top", FT_UINT32, BASE_DEC, NULL, 0, "Top", HFILL }}, - + { &hf_spoolss_form_horiz_len, - { "Horizontal", "spoolss.form.horiz", FT_UINT32, + { "Horizontal", "spoolss.form.horiz", FT_UINT32, BASE_DEC, NULL, 0, "Horizontal", HFILL }}, - + { &hf_spoolss_form_vert_len, - { "Vertical", "spoolss.form.vert", FT_UINT32, + { "Vertical", "spoolss.form.vert", FT_UINT32, BASE_DEC, NULL, 0, "Vertical", HFILL }}, /* GetForm RPC */ { &hf_spoolss_getform_level, - { "Level", "spoolss.getform.level", FT_UINT32, + { "Level", "spoolss.getform.level", FT_UINT32, BASE_DEC, NULL, 0, "Level", HFILL }}, /* SetForm RPC */ { &hf_spoolss_setform_level, - { "Level", "spoolss.setform.level", FT_UINT32, + { "Level", "spoolss.setform.level", FT_UINT32, BASE_DEC, NULL, 0, "Level", HFILL }}, /* AddForm RPC */ { &hf_spoolss_addform_level, - { "Level", "spoolss.addform.level", FT_UINT32, + { "Level", "spoolss.addform.level", FT_UINT32, BASE_DEC, NULL, 0, "Level", HFILL }}, /* EnumForms RPC */ { &hf_spoolss_enumforms_num, - { "Num", "spoolss.enumforms.num", FT_UINT32, + { "Num", "spoolss.enumforms.num", FT_UINT32, BASE_DEC, NULL, 0, "Num", HFILL }}, /* Printerdata */ { &hf_spoolss_printerdata_size, - { "Size", "spoolss.printerdata.size", FT_UINT32, + { "Size", "spoolss.printerdata.size", FT_UINT32, BASE_DEC, NULL, 0, "Size", HFILL }}, { &hf_spoolss_printerdata_data, - { "Data", "spoolss.printerdata.data", FT_BYTES, + { "Data", "spoolss.printerdata.data", FT_BYTES, BASE_HEX, NULL, 0, "Data", HFILL }}, /* Specific access rights */ { &hf_access_required, { "Access required", "spoolss.access_required", - FT_UINT32, BASE_HEX, NULL, 0x0, "Access REQUIRED", + FT_UINT32, BASE_HEX, NULL, 0x0, "Access REQUIRED", HFILL }}, { &hf_server_access_admin, { "Server admin", "spoolss.access_mask.server_admin", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), SERVER_ACCESS_ADMINISTER, "Server admin", HFILL }}, { &hf_server_access_enum, { "Server enum", "spoolss.access_mask.server_enum", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), SERVER_ACCESS_ENUMERATE, "Server enum", HFILL }}, { &hf_printer_access_admin, { "Printer admin", "spoolss.access_mask.printer_admin", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ACCESS_ADMINISTER, "Printer admin", HFILL }}, { &hf_printer_access_use, { "Printer use", "spoolss.access_mask.printer_use", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ACCESS_USE, "Printer use", HFILL }}, { &hf_job_access_admin, { "Job admin", "spoolss.access_mask.job_admin", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), JOB_ACCESS_ADMINISTER, "Job admin", HFILL }}, /* Enumprinters */ { &hf_enumprinters_flags_local, { "Enum local", "spoolss.enumprinters.flags.enum_local", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_LOCAL, "Enum local", HFILL }}, { &hf_enumprinters_flags_name, { "Enum name", "spoolss.enumprinters.flags.enum_name", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_NAME, "Enum name", HFILL }}, { &hf_enumprinters_flags_shared, { "Enum shared", "spoolss.enumprinters.flags.enum_shared", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_SHARED, "Enum shared", HFILL }}, { &hf_enumprinters_flags_default, { "Enum default", "spoolss.enumprinters.flags.enum_default", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_DEFAULT, "Enum default", HFILL }}, { &hf_enumprinters_flags_connections, { "Enum connections", "spoolss.enumprinters.flags.enum_connections", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_CONNECTIONS, "Enum connections", HFILL }}, { &hf_enumprinters_flags_network, { "Enum network", "spoolss.enumprinters.flags.enum_network", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_NETWORK, "Enum network", HFILL }}, { &hf_enumprinters_flags_remote, { "Enum remote", "spoolss.enumprinters.flags.enum_remote", - FT_BOOLEAN, 32, TFS(&flags_set_truth), + FT_BOOLEAN, 32, TFS(&flags_set_truth), PRINTER_ENUM_REMOTE, "Enum remote", HFILL }} }; @@ -6770,7 +6770,7 @@ proto_reg_handoff_dcerpc_spoolss(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_spoolss, ett_dcerpc_spoolss, - &uuid_dcerpc_spoolss, ver_dcerpc_spoolss, + dcerpc_init_uuid(proto_dcerpc_spoolss, ett_dcerpc_spoolss, + &uuid_dcerpc_spoolss, ver_dcerpc_spoolss, dcerpc_spoolss_dissectors, hf_spoolss_opnum); } diff --git a/packet-dcerpc-spoolss.h b/packet-dcerpc-spoolss.h index 63ee4f3a3b..dbd1f98098 100644 --- a/packet-dcerpc-spoolss.h +++ b/packet-dcerpc-spoolss.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-spoolss.h,v 1.12 2002/08/27 07:38:36 tpot Exp $ + * $Id: packet-dcerpc-spoolss.h,v 1.13 2002/08/28 21:00:11 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,7 +26,7 @@ #ifndef __PACKET_DCERPC_SPOOLSS_H #define __PACKET_DCERPC_SPOOLSS_H -/* Functions available on the SPOOLSS pipe. From Samba, +/* Functions available on the SPOOLSS pipe. From Samba, include/rpc_spoolss.h */ #define SPOOLSS_ENUMPRINTERS 0x00 diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c index 153bc399db..5cdd944a3f 100644 --- a/packet-dcerpc-srvsvc.c +++ b/packet-dcerpc-srvsvc.c @@ -10,22 +10,22 @@ * sources. * * - * $Id: packet-dcerpc-srvsvc.c,v 1.42 2002/08/21 09:58:59 sahlberg Exp $ + * $Id: packet-dcerpc-srvsvc.c,v 1.43 2002/08/28 21:00:11 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -255,8 +255,8 @@ static e_uuid_t uuid_dcerpc_srvsvc = { static guint16 ver_dcerpc_srvsvc = 3; static int -srvsvc_dissect_pointer_long(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_pointer_long(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -268,8 +268,8 @@ srvsvc_dissect_pointer_long(tvbuff_t *tvb, int offset, } static int -srvsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { @@ -280,8 +280,8 @@ srvsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, } static int -srvsvc_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -292,7 +292,7 @@ srvsvc_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, return offset; } - offset = dissect_ndr_nt_UNICODE_STRING_str(tvb, offset, pinfo, tree, + offset = dissect_ndr_nt_UNICODE_STRING_str(tvb, offset, pinfo, tree, drep); return offset; } @@ -307,20 +307,20 @@ srvsvc_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, * IDL } CHARDEV_INFO_0; */ static int -srvsvc_dissect_CHARDEV_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char Device", hf_srvsvc_chrdev, 0); - + return offset; } static int -srvsvc_dissect_CHARDEV_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -336,8 +336,8 @@ srvsvc_dissect_CHARDEV_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } CHARDEV_INFO_0_CONTAINER; */ static int -srvsvc_dissect_CHARDEV_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -359,19 +359,19 @@ srvsvc_dissect_CHARDEV_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CHARDEV_INFO_1; */ static int -srvsvc_dissect_CHARDEV_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char Device", hf_srvsvc_chrdev, 0); - + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chrdev_status, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); @@ -383,8 +383,8 @@ srvsvc_dissect_CHARDEV_INFO_1(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_CHARDEV_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -400,8 +400,8 @@ srvsvc_dissect_CHARDEV_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } CHARDEV_INFO_1_CONTAINER; */ static int -srvsvc_dissect_CHARDEV_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -421,8 +421,8 @@ srvsvc_dissect_CHARDEV_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CHARDEV_ENUM_UNION; */ static int -srvsvc_dissect_CHARDEV_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -456,8 +456,8 @@ srvsvc_dissect_CHARDEV_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } CHARDEV_ENUM_STRUCT; */ static int -srvsvc_dissect_CHARDEV_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -475,8 +475,8 @@ srvsvc_dissect_CHARDEV_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL } CHARDEV_INFO_UNION; */ static int -srvsvc_dissect_CHARDEV_INFO_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEV_INFO_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -513,16 +513,16 @@ srvsvc_dissect_CHARDEV_INFO_UNION(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_ENUM_STRUCT, NDR_POINTER_REF, "CHARDEV_ENUM_STRUCT", -1, 0); @@ -537,11 +537,11 @@ srvsvc_dissect_netrchardevenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_ENUM_STRUCT, NDR_POINTER_REF, "CHARDEV_ENUM_STRUCT", -1, 0); @@ -569,16 +569,16 @@ srvsvc_dissect_netrchardevenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevgetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevgetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Char Device", hf_srvsvc_chrdev, 0); @@ -589,8 +589,8 @@ srvsvc_dissect_netrchardevgetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevgetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevgetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -607,20 +607,20 @@ srvsvc_dissect_netrchardevgetinfo_reply(tvbuff_t *tvb, int offset, * IDL long NetrCharDevControl( * IDL [in] [string] [unique] wchar_t *ServerName, * IDL [in] [string] [ref] wchar_t *DevName, - * IDL [in] long Opcode + * IDL [in] long Opcode * IDL ); */ static int -srvsvc_dissect_netrchardevcontrol_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevcontrol_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Char Device", hf_srvsvc_chrdev, 0); @@ -631,8 +631,8 @@ srvsvc_dissect_netrchardevcontrol_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevcontrol_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevcontrol_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -649,20 +649,20 @@ srvsvc_dissect_netrchardevcontrol_reply(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_INFO_0; */ static int -srvsvc_dissect_CHARDEVQ_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char QDevice", hf_srvsvc_chrdev, 0); - + return offset; } static int -srvsvc_dissect_CHARDEVQ_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -678,8 +678,8 @@ srvsvc_dissect_CHARDEVQ_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_INFO_0_CONTAINER; */ static int -srvsvc_dissect_CHARDEVQ_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -702,23 +702,23 @@ srvsvc_dissect_CHARDEVQ_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_INFO_1; */ static int -srvsvc_dissect_CHARDEVQ_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char Device", hf_srvsvc_chrdev, 0); - + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chrqpri, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char Devices", hf_srvsvc_chrdevq, 0); - + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chrqnumusers, 0); @@ -728,8 +728,8 @@ srvsvc_dissect_CHARDEVQ_INFO_1(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_CHARDEVQ_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -745,8 +745,8 @@ srvsvc_dissect_CHARDEVQ_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_INFO_1_CONTAINER; */ static int -srvsvc_dissect_CHARDEVQ_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -766,8 +766,8 @@ srvsvc_dissect_CHARDEVQ_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_ENUM_UNION; */ static int -srvsvc_dissect_CHARDEVQ_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -801,8 +801,8 @@ srvsvc_dissect_CHARDEVQ_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_ENUM_STRUCT; */ static int -srvsvc_dissect_CHARDEVQ_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -820,8 +820,8 @@ srvsvc_dissect_CHARDEVQ_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL } CHARDEVQ_INFO; */ static int -srvsvc_dissect_CHARDEVQ_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CHARDEVQ_INFO(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -860,21 +860,21 @@ srvsvc_dissect_CHARDEVQ_INFO(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevqenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_ENUM_STRUCT, NDR_POINTER_REF, "CHARDEVQ_ENUM_STRUCT", -1, 0); @@ -889,11 +889,11 @@ srvsvc_dissect_netrchardevqenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevqenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_ENUM_STRUCT, NDR_POINTER_REF, "CHARDEVQ_ENUM_STRUCT", -1, 0); @@ -921,33 +921,33 @@ srvsvc_dissect_netrchardevqenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevqgetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqgetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Device Queue", hf_srvsvc_chrdevq, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "User", hf_srvsvc_user, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, NULL); return offset; } static int -srvsvc_dissect_netrchardevqgetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqgetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -970,24 +970,24 @@ srvsvc_dissect_netrchardevqgetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevqsetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqsetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Device Queue", hf_srvsvc_chrdevq, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_INFO, NDR_POINTER_REF, "CHARDEVQ_INFO", -1, 0); @@ -999,8 +999,8 @@ srvsvc_dissect_netrchardevqsetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevqsetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqsetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1020,16 +1020,16 @@ srvsvc_dissect_netrchardevqsetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevqpurge_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqpurge_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Device Queue", hf_srvsvc_chrdevq, 0); @@ -1037,8 +1037,8 @@ srvsvc_dissect_netrchardevqpurge_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevqpurge_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqpurge_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1055,21 +1055,21 @@ srvsvc_dissect_netrchardevqpurge_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrchardevqpurgeself_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqpurgeself_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Device Queue", hf_srvsvc_chrdevq, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Computer", hf_srvsvc_computer, 0); @@ -1077,8 +1077,8 @@ srvsvc_dissect_netrchardevqpurgeself_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrchardevqpurgeself_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrchardevqpurgeself_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1095,18 +1095,18 @@ srvsvc_dissect_netrchardevqpurgeself_reply(tvbuff_t *tvb, int offset, * IDL } CONNECT_INFO_0; */ static int -srvsvc_dissect_CONNECT_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_con_id, NULL); - + return offset; } static int -srvsvc_dissect_CONNECT_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1122,8 +1122,8 @@ srvsvc_dissect_CONNECT_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } CONNECT_INFO_0_CONTAINER; */ static int -srvsvc_dissect_CONNECT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1149,8 +1149,8 @@ srvsvc_dissect_CONNECT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CONNECT_INFO_1; */ static int -srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -1168,12 +1168,12 @@ srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_con_time, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Share", hf_srvsvc_share, 0); @@ -1181,8 +1181,8 @@ srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_CONNECT_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1198,8 +1198,8 @@ srvsvc_dissect_CONNECT_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } CONNECT_INFO_1_CONTAINER; */ static int -srvsvc_dissect_CONNECT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1220,8 +1220,8 @@ srvsvc_dissect_CONNECT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, * IDL } CONNECT_ENUM_UNION; */ static int -srvsvc_dissect_CONNECT_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -1256,8 +1256,8 @@ srvsvc_dissect_CONNECT_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } CONNECT_ENUM_STRUCT; */ static int -srvsvc_dissect_CONNECT_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_CONNECT_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1280,21 +1280,21 @@ srvsvc_dissect_CONNECT_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrconnectionenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrconnectionenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Qualifier", hf_srvsvc_qualifier, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CONNECT_ENUM_STRUCT, NDR_POINTER_REF, "CONNECT_ENUM_STRUCT:", -1, 0); @@ -1309,11 +1309,11 @@ srvsvc_dissect_netrconnectionenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrconnectionenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrconnectionenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CONNECT_ENUM_STRUCT, NDR_POINTER_REF, "CONNECT_ENUM_STRUCT:", -1, 0); @@ -1337,18 +1337,18 @@ srvsvc_dissect_netrconnectionenum_reply(tvbuff_t *tvb, int offset, * IDL } FILE_INFO_2; */ static int -srvsvc_dissect_FILE_INFO_2(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_2(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_file_id, NULL); - + return offset; } static int -srvsvc_dissect_FILE_INFO_2_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_2_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1364,8 +1364,8 @@ srvsvc_dissect_FILE_INFO_2_array(tvbuff_t *tvb, int offset, * IDL } FILE_INFO_2_CONTAINER; */ static int -srvsvc_dissect_FILE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1389,8 +1389,8 @@ srvsvc_dissect_FILE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, * IDL } FILE_INFO_3; */ static int -srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -1401,13 +1401,13 @@ srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_file_num_locks, NULL); - - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Path", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); @@ -1415,8 +1415,8 @@ srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_FILE_INFO_3_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_3_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1432,8 +1432,8 @@ srvsvc_dissect_FILE_INFO_3_array(tvbuff_t *tvb, int offset, * IDL } FILE_INFO_3_CONTAINER; */ static int -srvsvc_dissect_FILE_INFO_3_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_3_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1454,8 +1454,8 @@ srvsvc_dissect_FILE_INFO_3_CONTAINER(tvbuff_t *tvb, int offset, * IDL } FILE_ENUM_UNION; */ static int -srvsvc_dissect_FILE_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -1489,8 +1489,8 @@ srvsvc_dissect_FILE_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } FILE_INFO_UNION; */ static int -srvsvc_dissect_FILE_INFO_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_INFO_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -1525,8 +1525,8 @@ srvsvc_dissect_FILE_INFO_UNION(tvbuff_t *tvb, int offset, * IDL } FILE_ENUM_STRUCT; */ static int -srvsvc_dissect_FILE_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_FILE_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1550,26 +1550,26 @@ srvsvc_dissect_FILE_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrfileenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfileenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Path", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_ENUM_STRUCT, NDR_POINTER_REF, "FILE_ENUM_STRUCT:", -1, 0); @@ -1584,11 +1584,11 @@ srvsvc_dissect_netrfileenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrfileenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfileenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_ENUM_STRUCT, NDR_POINTER_REF, "FILE_ENUM_STRUCT:", -1, 0); @@ -1616,11 +1616,11 @@ srvsvc_dissect_netrfileenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrfilegetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfilegetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1634,8 +1634,8 @@ srvsvc_dissect_netrfilegetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrfilegetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfilegetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1656,11 +1656,11 @@ srvsvc_dissect_netrfilegetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrfileclose_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfileclose_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1671,8 +1671,8 @@ srvsvc_dissect_netrfileclose_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrfileclose_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrfileclose_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -1687,20 +1687,20 @@ srvsvc_dissect_netrfileclose_reply(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_0; */ static int -srvsvc_dissect_SESSION_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); - + return offset; } static int -srvsvc_dissect_SESSION_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1716,8 +1716,8 @@ srvsvc_dissect_SESSION_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_0_CONTAINER; */ static int -srvsvc_dissect_SESSION_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1741,20 +1741,20 @@ srvsvc_dissect_SESSION_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_1; */ static int -srvsvc_dissect_SESSION_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_num_opens, NULL); @@ -1770,8 +1770,8 @@ srvsvc_dissect_SESSION_INFO_1(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_SESSION_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1787,8 +1787,8 @@ srvsvc_dissect_SESSION_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_1_CONTAINER; */ static int -srvsvc_dissect_SESSION_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1813,20 +1813,20 @@ srvsvc_dissect_SESSION_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_2; */ static int -srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_num_opens, NULL); @@ -1839,7 +1839,7 @@ srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_user_flags, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Client Type:", hf_srvsvc_client_type, 0); @@ -1847,8 +1847,8 @@ srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_SESSION_INFO_2_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_2_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1864,8 +1864,8 @@ srvsvc_dissect_SESSION_INFO_2_array(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_2_CONTAINER; */ static int -srvsvc_dissect_SESSION_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1887,20 +1887,20 @@ srvsvc_dissect_SESSION_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_10; */ static int -srvsvc_dissect_SESSION_INFO_10(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_10(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_time, NULL); @@ -1910,8 +1910,8 @@ srvsvc_dissect_SESSION_INFO_10(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_SESSION_INFO_10_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_10_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -1927,8 +1927,8 @@ srvsvc_dissect_SESSION_INFO_10_array(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_10_CONTAINER; */ static int -srvsvc_dissect_SESSION_INFO_10_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_10_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1954,20 +1954,20 @@ srvsvc_dissect_SESSION_INFO_10_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_502; */ static int -srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_num_opens, NULL); @@ -1980,12 +1980,12 @@ srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_session_user_flags, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Client Type:", hf_srvsvc_client_type, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Transport:", hf_srvsvc_transport, 0); @@ -1993,8 +1993,8 @@ srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_SESSION_INFO_502_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_502_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2010,8 +2010,8 @@ srvsvc_dissect_SESSION_INFO_502_array(tvbuff_t *tvb, int offset, * IDL } SESSION_INFO_502_CONTAINER; */ static int -srvsvc_dissect_SESSION_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2034,8 +2034,8 @@ srvsvc_dissect_SESSION_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SESSION_ENUM_UNION; */ static int -srvsvc_dissect_SESSION_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -2087,8 +2087,8 @@ srvsvc_dissect_SESSION_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } SESSION_ENUM_STRUCT; */ static int -srvsvc_dissect_SESSION_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SESSION_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2112,26 +2112,26 @@ srvsvc_dissect_SESSION_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsessionenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsessionenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Computer", hf_srvsvc_computer, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User", hf_srvsvc_user, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_ENUM_STRUCT, NDR_POINTER_REF, "SESSION_ENUM_STRUCT", -1, 0); @@ -2146,11 +2146,11 @@ srvsvc_dissect_netrsessionenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsessionenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsessionenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_ENUM_STRUCT, NDR_POINTER_REF, "SESSION_ENUM_STRUCT", -1, 0); @@ -2177,21 +2177,21 @@ srvsvc_dissect_netrsessionenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsessiondel_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsessiondel_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Computer", hf_srvsvc_computer, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "User", hf_srvsvc_user, 0); @@ -2199,8 +2199,8 @@ srvsvc_dissect_netrsessiondel_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsessiondel_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsessiondel_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -2216,11 +2216,11 @@ srvsvc_dissect_netrsessiondel_reply(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_0; */ static int -srvsvc_dissect_SHARE_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Share", hf_srvsvc_share, 0); @@ -2228,8 +2228,8 @@ srvsvc_dissect_SHARE_INFO_0(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_SHARE_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2245,8 +2245,8 @@ srvsvc_dissect_SHARE_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_0_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2271,7 +2271,7 @@ srvsvc_dissect_SHARE_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto { proto_item *item = NULL; proto_tree *tree = NULL; - + dcerpc_info *di; di=pinfo->private_data; @@ -2294,8 +2294,8 @@ srvsvc_dissect_SHARE_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto return offset; } static int -srvsvc_dissect_SHARE_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2311,8 +2311,8 @@ srvsvc_dissect_SHARE_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2342,7 +2342,7 @@ srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto { proto_item *item = NULL; proto_tree *tree = NULL; - + dcerpc_info *di; di=pinfo->private_data; @@ -2367,16 +2367,16 @@ srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_max_uses, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_cur_uses, NULL); - - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Path", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Passwd", hf_srvsvc_share_passwd, 0); @@ -2384,8 +2384,8 @@ srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto return offset; } static int -srvsvc_dissect_SHARE_INFO_2_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_2_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2401,8 +2401,8 @@ srvsvc_dissect_SHARE_INFO_2_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_2_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2428,7 +2428,7 @@ srvsvc_dissect_SHARE_INFO_501(tvbuff_t *tvb, int offset, packet_info *pinfo, pro { proto_item *item = NULL; proto_tree *tree = NULL; - + dcerpc_info *di; di=pinfo->private_data; @@ -2454,8 +2454,8 @@ srvsvc_dissect_SHARE_INFO_501(tvbuff_t *tvb, int offset, packet_info *pinfo, pro return offset; } static int -srvsvc_dissect_SHARE_INFO_501_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_501_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2471,8 +2471,8 @@ srvsvc_dissect_SHARE_INFO_501_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_501_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_501_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_501_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2505,7 +2505,7 @@ srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, pro { proto_item *item = NULL; proto_tree *tree = NULL; - + dcerpc_info *di; di=pinfo->private_data; @@ -2530,23 +2530,23 @@ srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, pro offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_max_uses, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_cur_uses, NULL); - - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Path", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Passwd", hf_srvsvc_share_passwd, 0); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECURITY_DESCRIPTOR_data, NDR_POINTER_UNIQUE, "LSA SECURITY DESCRIPTOR data:", -1, 0); @@ -2554,8 +2554,8 @@ srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, pro return offset; } static int -srvsvc_dissect_SHARE_INFO_502_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_502_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2571,8 +2571,8 @@ srvsvc_dissect_SHARE_INFO_502_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_502_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2600,8 +2600,8 @@ srvsvc_dissect_SHARE_INFO_1004(tvbuff_t *tvb, int offset, packet_info *pinfo, pr return offset; } static int -srvsvc_dissect_SHARE_INFO_1004_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1004_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2617,8 +2617,8 @@ srvsvc_dissect_SHARE_INFO_1004_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1004_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1004_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1004_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2641,12 +2641,12 @@ srvsvc_dissect_SHARE_INFO_1005(tvbuff_t *tvb, int offset, packet_info *pinfo, pr { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_dfs_root_flags, NULL); - + return offset; } static int -srvsvc_dissect_SHARE_INFO_1005_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1005_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2662,8 +2662,8 @@ srvsvc_dissect_SHARE_INFO_1005_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1005_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1005_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1005_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2687,12 +2687,12 @@ srvsvc_dissect_SHARE_INFO_1006(tvbuff_t *tvb, int offset, packet_info *pinfo, pr { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_max_uses, NULL); - + return offset; } static int -srvsvc_dissect_SHARE_INFO_1006_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1006_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2708,8 +2708,8 @@ srvsvc_dissect_SHARE_INFO_1006_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1006_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1006_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1006_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2735,7 +2735,7 @@ srvsvc_dissect_SHARE_INFO_1007(tvbuff_t *tvb, int offset, packet_info *pinfo, pr offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_share_flags, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Alternate Name", hf_srvsvc_share_alternate_name, 0); @@ -2743,8 +2743,8 @@ srvsvc_dissect_SHARE_INFO_1007(tvbuff_t *tvb, int offset, packet_info *pinfo, pr return offset; } static int -srvsvc_dissect_SHARE_INFO_1007_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1007_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2760,8 +2760,8 @@ srvsvc_dissect_SHARE_INFO_1007_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1007_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1007_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1007_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2789,8 +2789,8 @@ srvsvc_dissect_SHARE_INFO_1501(tvbuff_t *tvb, int offset, packet_info *pinfo, pr return offset; } static int -srvsvc_dissect_SHARE_INFO_1501_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1501_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -2806,8 +2806,8 @@ srvsvc_dissect_SHARE_INFO_1501_array(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_1501_CONTAINER; */ static int -srvsvc_dissect_SHARE_INFO_1501_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_1501_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2836,8 +2836,8 @@ srvsvc_dissect_SHARE_INFO_1501_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SHARE_INFO_UNION; */ static int -srvsvc_dissect_SHARE_INFO_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_INFO_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -2922,11 +2922,11 @@ srvsvc_dissect_SHARE_INFO_UNION(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -2934,7 +2934,7 @@ srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_UNION, NDR_POINTER_REF, "SHARE_INFO_UNION:", -1, 0); @@ -2946,8 +2946,8 @@ srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrshareadd_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareadd_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2976,8 +2976,8 @@ srvsvc_dissect_netrshareadd_reply(tvbuff_t *tvb, int offset, * IDL } SHARE_ENUM_UNION; */ static int -srvsvc_dissect_SHARE_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -3059,8 +3059,8 @@ srvsvc_dissect_SHARE_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } SHARE_ENUM_STRUCT; */ static int -srvsvc_dissect_SHARE_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SHARE_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -3081,8 +3081,8 @@ srvsvc_dissect_SHARE_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrshareenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3106,8 +3106,8 @@ srvsvc_dissect_netrshareenum_rqst(tvbuff_t *tvb, int offset, } static int -srvsvc_dissect_netrshareenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3137,8 +3137,8 @@ srvsvc_dissect_netrshareenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3158,8 +3158,8 @@ srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, } static int -srvsvc_dissect_netrsharegetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharegetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3183,8 +3183,8 @@ srvsvc_dissect_netrsharegetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharesetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharesetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3212,8 +3212,8 @@ srvsvc_dissect_netrsharesetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsharesetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharesetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3234,8 +3234,8 @@ srvsvc_dissect_netrsharesetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharedel_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedel_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3250,12 +3250,12 @@ srvsvc_dissect_netrsharedel_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + return offset; } static int -srvsvc_dissect_netrsharedel_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedel_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3272,8 +3272,8 @@ srvsvc_dissect_netrsharedel_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharedelsticky_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelsticky_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3288,12 +3288,12 @@ srvsvc_dissect_netrsharedelsticky_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + return offset; } static int -srvsvc_dissect_netrsharedelsticky_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelsticky_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -3310,8 +3310,8 @@ srvsvc_dissect_netrsharedelsticky_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharecheck_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharecheck_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3319,16 +3319,16 @@ srvsvc_dissect_netrsharecheck_rqst(tvbuff_t *tvb, int offset, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Char Device", hf_srvsvc_chrdev, 0); - + return offset; } static int -srvsvc_dissect_netrsharecheck_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharecheck_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -3347,14 +3347,14 @@ srvsvc_dissect_netrsharecheck_reply(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_100; */ static int -srvsvc_dissect_SERVER_INFO_100(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_100(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -3373,28 +3373,28 @@ srvsvc_dissect_SERVER_INFO_100(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_101; */ static int -srvsvc_dissect_SERVER_INFO_101(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_101(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ver_major, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ver_minor, NULL); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_server_type, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Comment", hf_srvsvc_comment, 0); @@ -3420,51 +3420,51 @@ srvsvc_dissect_SERVER_INFO_101(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_102; */ static int -srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ver_major, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ver_minor, NULL); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_server_type, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Comment", hf_srvsvc_comment, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_disc, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_hidden, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_announce, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_anndelta, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_licences, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "User Path", hf_srvsvc_user_path, 0); @@ -3483,7 +3483,7 @@ srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, * IDL long lanmask; * IDL [string] [unique] wchar_t *guestaccount; * IDL long chdevs; - * IDL long chdevqs; + * IDL long chdevqs; * IDL long chdevjobs; * IDL long connections; * IDL long shares; @@ -3507,102 +3507,102 @@ srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_402; */ static int -srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ulist_mtime, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_glist_mtime, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alist_mtime, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Alerts", hf_srvsvc_alerts, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_security, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numadmin, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lanmask, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Guest", hf_srvsvc_guest, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevqs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevjobs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_shares, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_openfiles, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessreqs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_activelocks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sizreqbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numbigbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numfiletasks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alertsched, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_erroralert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_logonalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_accessalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_diskalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_netioalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxauditsz, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server Heuristics", hf_srvsvc_srvheuristics, 0); @@ -3621,7 +3621,7 @@ srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, * IDL long lanmask; * IDL [string] [unique] wchar_t *guestaccount; * IDL long chdevs; - * IDL long chdevqs; + * IDL long chdevqs; * IDL long chdevjobs; * IDL long connections; * IDL long shares; @@ -3648,113 +3648,113 @@ srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_403; */ static int -srvsvc_dissect_SERVER_INFO_403(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_403(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ulist_mtime, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_glist_mtime, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alist_mtime, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Alerts", hf_srvsvc_alerts, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_security, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numadmin, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lanmask, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Guest", hf_srvsvc_guest, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevqs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_chdevjobs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_shares, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_openfiles, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessreqs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_activelocks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sizreqbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numbigbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numfiletasks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alertsched, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_erroralert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_logonalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_accessalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_diskalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_netioalert, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxauditsz, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server Heuristics", hf_srvsvc_srvheuristics, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_auditedevents, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_auditprofile, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Autopath", hf_srvsvc_autopath, 0); @@ -3785,62 +3785,62 @@ srvsvc_dissect_SERVER_INFO_403(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_502; */ static int -srvsvc_dissect_SERVER_INFO_502(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_502(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sizreqbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_rawworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_irpstacksize, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxrawbuflen, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxnonpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesoftcompat, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableforcedlogoff, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_timesource, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_acceptdownlevelapis, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lmannounce, NULL); return offset; @@ -3893,136 +3893,136 @@ srvsvc_dissect_SERVER_INFO_502(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_503; */ static int -srvsvc_dissect_SERVER_INFO_503(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_503(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sizreqbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_rawworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_irpstacksize, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxrawbuflen, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxnonpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesoftcompat, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableforcedlogoff, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_timesource, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_acceptdownlevelapis, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lmannounce, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Domain", hf_srvsvc_domain, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopyreadlen, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopywritelen, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepcomplsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepcomplsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_threadcountadd, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numblockthreads, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavtimeout, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minrcvqueue, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_xactmemsize, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_threadpriority, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxmpxct, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakwait, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakresponsewait, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplocks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplockforceclose, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablefcbopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableraw, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesharednetdrives, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeconnections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxfreeconnections, NULL); return offset; @@ -4090,183 +4090,183 @@ srvsvc_dissect_SERVER_INFO_503(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_599; */ static int -srvsvc_dissect_SERVER_INFO_599(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_599(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sizreqbufs, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_rawworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_irpstacksize, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxrawbuflen, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxnonpagedmemoryusage, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesoftcompat, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableforcedlogoff, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_timesource, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_acceptdownlevelapis, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lmannounce, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Domain", hf_srvsvc_domain, 0); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopyreadlen, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopywritelen, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepcomplsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepcomplsearch, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_threadcountadd, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_numblockthreads, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavtimeout, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minrcvqueue, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeworkitems, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_xactmemsize, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_threadpriority, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxmpxct, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakwait, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakresponsewait, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplocks, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplockforceclose, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablefcbopens, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableraw, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesharednetdrives, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeconnections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxfreeconnections, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsesstable, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initconntable, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initfiletable, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsearchtable, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alertsched, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_errortreshold, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_networkerrortreshold, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_diskspacetreshold, NULL); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_maxlinkdelay, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_minlinkthroughput, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_linkinfovalidtime, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_scavqosinfoupdatetime, NULL); - + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitemidletime, NULL); - + return offset; } @@ -4276,8 +4276,8 @@ srvsvc_dissect_SERVER_INFO_599(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1005; */ static int -srvsvc_dissect_SERVER_INFO_1005(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1005(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -4294,11 +4294,11 @@ srvsvc_dissect_SERVER_INFO_1005(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1010; */ static int -srvsvc_dissect_SERVER_INFO_1010(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1010(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_disc, NULL); return offset; @@ -4310,11 +4310,11 @@ srvsvc_dissect_SERVER_INFO_1010(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1016; */ static int -srvsvc_dissect_SERVER_INFO_1016(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1016(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_hidden, NULL); return offset; @@ -4326,11 +4326,11 @@ srvsvc_dissect_SERVER_INFO_1016(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1017; */ static int -srvsvc_dissect_SERVER_INFO_1017(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1017(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_announce, NULL); return offset; @@ -4342,11 +4342,11 @@ srvsvc_dissect_SERVER_INFO_1017(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1018; */ static int -srvsvc_dissect_SERVER_INFO_1018(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1018(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_anndelta, NULL); return offset; @@ -4358,11 +4358,11 @@ srvsvc_dissect_SERVER_INFO_1018(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1107; */ static int -srvsvc_dissect_SERVER_INFO_1107(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1107(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); return offset; @@ -4374,11 +4374,11 @@ srvsvc_dissect_SERVER_INFO_1107(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1501; */ static int -srvsvc_dissect_SERVER_INFO_1501(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1501(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); return offset; @@ -4390,11 +4390,11 @@ srvsvc_dissect_SERVER_INFO_1501(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1502; */ static int -srvsvc_dissect_SERVER_INFO_1502(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1502(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); return offset; @@ -4406,11 +4406,11 @@ srvsvc_dissect_SERVER_INFO_1502(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1503; */ static int -srvsvc_dissect_SERVER_INFO_1503(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1503(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); return offset; @@ -4422,11 +4422,11 @@ srvsvc_dissect_SERVER_INFO_1503(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1506; */ static int -srvsvc_dissect_SERVER_INFO_1506(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1506(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitems, NULL); return offset; @@ -4438,11 +4438,11 @@ srvsvc_dissect_SERVER_INFO_1506(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1509; */ static int -srvsvc_dissect_SERVER_INFO_1509(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1509(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxrawbuflen, NULL); return offset; @@ -4454,8 +4454,8 @@ srvsvc_dissect_SERVER_INFO_1509(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1510; */ static int -srvsvc_dissect_SERVER_INFO_1510(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1510(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -4470,11 +4470,11 @@ srvsvc_dissect_SERVER_INFO_1510(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1511; */ static int -srvsvc_dissect_SERVER_INFO_1511(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1511(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); return offset; @@ -4486,11 +4486,11 @@ srvsvc_dissect_SERVER_INFO_1511(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1512; */ static int -srvsvc_dissect_SERVER_INFO_1512(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1512(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxnonpagedmemoryusage, NULL); return offset; @@ -4502,11 +4502,11 @@ srvsvc_dissect_SERVER_INFO_1512(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1513; */ static int -srvsvc_dissect_SERVER_INFO_1513(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1513(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxpagedmemoryusage, NULL); return offset; @@ -4518,11 +4518,11 @@ srvsvc_dissect_SERVER_INFO_1513(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1514; */ static int -srvsvc_dissect_SERVER_INFO_1514(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1514(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesoftcompat, NULL); return offset; @@ -4534,11 +4534,11 @@ srvsvc_dissect_SERVER_INFO_1514(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1515; */ static int -srvsvc_dissect_SERVER_INFO_1515(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1515(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableforcedlogoff, NULL); return offset; @@ -4550,11 +4550,11 @@ srvsvc_dissect_SERVER_INFO_1515(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1516; */ static int -srvsvc_dissect_SERVER_INFO_1516(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1516(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_timesource, NULL); return offset; @@ -4566,11 +4566,11 @@ srvsvc_dissect_SERVER_INFO_1516(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1518; */ static int -srvsvc_dissect_SERVER_INFO_1518(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1518(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lmannounce, NULL); return offset; @@ -4582,11 +4582,11 @@ srvsvc_dissect_SERVER_INFO_1518(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1520; */ static int -srvsvc_dissect_SERVER_INFO_1520(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1520(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopyreadlen, NULL); return offset; @@ -4598,11 +4598,11 @@ srvsvc_dissect_SERVER_INFO_1520(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1521; */ static int -srvsvc_dissect_SERVER_INFO_1521(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1521(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopywritelen, NULL); return offset; @@ -4614,11 +4614,11 @@ srvsvc_dissect_SERVER_INFO_1521(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1522; */ static int -srvsvc_dissect_SERVER_INFO_1522(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1522(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepsearch, NULL); return offset; @@ -4630,11 +4630,11 @@ srvsvc_dissect_SERVER_INFO_1522(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1523; */ static int -srvsvc_dissect_SERVER_INFO_1523(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1523(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepsearch, NULL); return offset; @@ -4646,11 +4646,11 @@ srvsvc_dissect_SERVER_INFO_1523(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1524; */ static int -srvsvc_dissect_SERVER_INFO_1524(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1524(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepcomplsearch, NULL); return offset; @@ -4662,11 +4662,11 @@ srvsvc_dissect_SERVER_INFO_1524(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1525; */ static int -srvsvc_dissect_SERVER_INFO_1525(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1525(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepcomplsearch, NULL); return offset; @@ -4678,11 +4678,11 @@ srvsvc_dissect_SERVER_INFO_1525(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1528; */ static int -srvsvc_dissect_SERVER_INFO_1528(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1528(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavtimeout, NULL); return offset; @@ -4694,11 +4694,11 @@ srvsvc_dissect_SERVER_INFO_1528(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1529; */ static int -srvsvc_dissect_SERVER_INFO_1529(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1529(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minrcvqueue, NULL); return offset; @@ -4710,11 +4710,11 @@ srvsvc_dissect_SERVER_INFO_1529(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1530; */ static int -srvsvc_dissect_SERVER_INFO_1530(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1530(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeworkitems, NULL); return offset; @@ -4726,11 +4726,11 @@ srvsvc_dissect_SERVER_INFO_1530(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1533; */ static int -srvsvc_dissect_SERVER_INFO_1533(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1533(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxmpxct, NULL); return offset; @@ -4742,11 +4742,11 @@ srvsvc_dissect_SERVER_INFO_1533(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1534; */ static int -srvsvc_dissect_SERVER_INFO_1534(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1534(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakwait, NULL); return offset; @@ -4758,11 +4758,11 @@ srvsvc_dissect_SERVER_INFO_1534(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1535; */ static int -srvsvc_dissect_SERVER_INFO_1535(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1535(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakresponsewait, NULL); return offset; @@ -4774,11 +4774,11 @@ srvsvc_dissect_SERVER_INFO_1535(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1536; */ static int -srvsvc_dissect_SERVER_INFO_1536(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1536(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplocks, NULL); return offset; @@ -4790,11 +4790,11 @@ srvsvc_dissect_SERVER_INFO_1536(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1537; */ static int -srvsvc_dissect_SERVER_INFO_1537(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1537(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplockforceclose, NULL); return offset; @@ -4806,11 +4806,11 @@ srvsvc_dissect_SERVER_INFO_1537(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1538; */ static int -srvsvc_dissect_SERVER_INFO_1538(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1538(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablefcbopens, NULL); return offset; @@ -4822,11 +4822,11 @@ srvsvc_dissect_SERVER_INFO_1538(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1539; */ static int -srvsvc_dissect_SERVER_INFO_1539(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1539(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableraw, NULL); return offset; @@ -4838,11 +4838,11 @@ srvsvc_dissect_SERVER_INFO_1539(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1540; */ static int -srvsvc_dissect_SERVER_INFO_1540(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1540(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesharednetdrives, NULL); return offset; @@ -4854,11 +4854,11 @@ srvsvc_dissect_SERVER_INFO_1540(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1541; */ static int -srvsvc_dissect_SERVER_INFO_1541(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1541(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeconnections, NULL); return offset; @@ -4870,11 +4870,11 @@ srvsvc_dissect_SERVER_INFO_1541(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1542; */ static int -srvsvc_dissect_SERVER_INFO_1542(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1542(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxfreeconnections, NULL); return offset; @@ -4886,11 +4886,11 @@ srvsvc_dissect_SERVER_INFO_1542(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1543; */ static int -srvsvc_dissect_SERVER_INFO_1543(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1543(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsesstable, NULL); return offset; @@ -4902,11 +4902,11 @@ srvsvc_dissect_SERVER_INFO_1543(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1544; */ static int -srvsvc_dissect_SERVER_INFO_1544(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1544(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initconntable, NULL); return offset; @@ -4918,11 +4918,11 @@ srvsvc_dissect_SERVER_INFO_1544(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1545; */ static int -srvsvc_dissect_SERVER_INFO_1545(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1545(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initfiletable, NULL); return offset; @@ -4934,11 +4934,11 @@ srvsvc_dissect_SERVER_INFO_1545(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1546; */ static int -srvsvc_dissect_SERVER_INFO_1546(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1546(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsearchtable, NULL); return offset; @@ -4950,11 +4950,11 @@ srvsvc_dissect_SERVER_INFO_1546(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1547; */ static int -srvsvc_dissect_SERVER_INFO_1547(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1547(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alertsched, NULL); return offset; @@ -4966,11 +4966,11 @@ srvsvc_dissect_SERVER_INFO_1547(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1548; */ static int -srvsvc_dissect_SERVER_INFO_1548(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1548(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_errortreshold, NULL); return offset; @@ -4982,11 +4982,11 @@ srvsvc_dissect_SERVER_INFO_1548(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1549; */ static int -srvsvc_dissect_SERVER_INFO_1549(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1549(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_networkerrortreshold, NULL); return offset; @@ -4998,11 +4998,11 @@ srvsvc_dissect_SERVER_INFO_1549(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1550; */ static int -srvsvc_dissect_SERVER_INFO_1550(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1550(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_diskspacetreshold, NULL); return offset; @@ -5014,11 +5014,11 @@ srvsvc_dissect_SERVER_INFO_1550(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1552; */ static int -srvsvc_dissect_SERVER_INFO_1552(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1552(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxlinkdelay, NULL); return offset; @@ -5030,11 +5030,11 @@ srvsvc_dissect_SERVER_INFO_1552(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1553; */ static int -srvsvc_dissect_SERVER_INFO_1553(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1553(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minlinkthroughput, NULL); return offset; @@ -5046,11 +5046,11 @@ srvsvc_dissect_SERVER_INFO_1553(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1554; */ static int -srvsvc_dissect_SERVER_INFO_1554(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1554(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_linkinfovalidtime, NULL); return offset; @@ -5062,11 +5062,11 @@ srvsvc_dissect_SERVER_INFO_1554(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1555; */ static int -srvsvc_dissect_SERVER_INFO_1555(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1555(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavqosinfoupdatetime, NULL); return offset; @@ -5078,11 +5078,11 @@ srvsvc_dissect_SERVER_INFO_1555(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_1556; */ static int -srvsvc_dissect_SERVER_INFO_1556(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_1556(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitemidletime, NULL); return offset; @@ -5152,8 +5152,8 @@ srvsvc_dissect_SERVER_INFO_1556(tvbuff_t *tvb, int offset, * IDL } SERVER_INFO_UNION; */ static int -srvsvc_dissect_SERVER_INFO_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_INFO_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -5589,11 +5589,11 @@ srvsvc_dissect_SERVER_INFO_UNION(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5604,11 +5604,11 @@ srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrservergetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservergetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_INFO_UNION, NDR_POINTER_REF, "Server Info", -1, 0); @@ -5628,11 +5628,11 @@ srvsvc_dissect_netrservergetinfo_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5640,7 +5640,7 @@ srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_INFO_UNION, NDR_POINTER_REF, "Server Info", -1, 0); @@ -5652,8 +5652,8 @@ srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrserversetinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserversetinfo_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -5673,8 +5673,8 @@ srvsvc_dissect_netrserversetinfo_reply(tvbuff_t *tvb, int offset, * IDL } DISK_INFO_0; */ static int -srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len; @@ -5705,8 +5705,8 @@ srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_DISK_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_DISK_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, @@ -5722,8 +5722,8 @@ srvsvc_dissect_DISK_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } DISK_ENUM_CONTAINER; */ static int -srvsvc_dissect_DISK_ENUM_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_DISK_ENUM_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -5748,11 +5748,11 @@ srvsvc_dissect_DISK_ENUM_CONTAINER(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5760,7 +5760,7 @@ srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_DISK_ENUM_CONTAINER, NDR_POINTER_REF, "Disks", -1, 0); @@ -5775,11 +5775,11 @@ srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrserverdiskenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserverdiskenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_DISK_ENUM_CONTAINER, NDR_POINTER_REF, "Disks", -1, 0); @@ -5817,8 +5817,8 @@ srvsvc_dissect_netrserverdiskenum_reply(tvbuff_t *tvb, int offset, */ static int -srvsvc_dissect_SERVER_STAT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_STAT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -5879,16 +5879,16 @@ srvsvc_dissect_SERVER_STAT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrserverstatisticsget_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserverstatisticsget_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Service", hf_srvsvc_service, 0); @@ -5902,11 +5902,11 @@ srvsvc_dissect_netrserverstatisticsget_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrserverstatisticsget_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserverstatisticsget_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_STAT, NDR_POINTER_REF, "Stat", -1, 0); @@ -5923,8 +5923,8 @@ srvsvc_dissect_netrserverstatisticsget_reply(tvbuff_t *tvb, int offset, * IDL } TRANSPORT_ADDRESS; */ static int -srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { dcerpc_info *di; @@ -5939,7 +5939,7 @@ srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_address_len, &len); - proto_tree_add_item(tree, hf_srvsvc_transport_address, tvb, offset, + proto_tree_add_item(tree, hf_srvsvc_transport_address, tvb, offset, len, FALSE); offset += len; @@ -5956,19 +5956,19 @@ srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, * IDL } TRANSPORT_INFO_0; */ static int -srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_numberofvcs, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Name", hf_srvsvc_transport_name, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_ADDRESS, NDR_POINTER_UNIQUE, "Transport Address", -1, 0); @@ -5976,7 +5976,7 @@ srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_address_len, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Network Address", hf_srvsvc_transport_networkaddress, 0); @@ -5984,8 +5984,8 @@ srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -6001,8 +6001,8 @@ srvsvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, * IDL } SERVER_XPORT_INFO_0_CONTAINER; */ static int -srvsvc_dissect_SERVER_XPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_XPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -6025,19 +6025,19 @@ srvsvc_dissect_SERVER_XPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, * IDL } TRANSPORT_INFO_1; */ static int -srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_numberofvcs, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Name", hf_srvsvc_transport_name, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_ADDRESS, NDR_POINTER_UNIQUE, "Transport Address", -1, 0); @@ -6045,12 +6045,12 @@ srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_address_len, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Network Address", hf_srvsvc_transport_networkaddress, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Domain", hf_srvsvc_domain, 0); @@ -6058,8 +6058,8 @@ srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_TRANSPORT_INFO_1_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TRANSPORT_INFO_1_array(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, @@ -6075,8 +6075,8 @@ srvsvc_dissect_TRANSPORT_INFO_1_array(tvbuff_t *tvb, int offset, * IDL } SERVER_XPORT_INFO_1_CONTAINER; */ static int -srvsvc_dissect_SERVER_XPORT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_XPORT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -6097,8 +6097,8 @@ srvsvc_dissect_SERVER_XPORT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, * IDL } SERVER_XPORT_ENUM_UNION; */ static int -srvsvc_dissect_SERVER_XPORT_ENUM_UNION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_XPORT_ENUM_UNION(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 level; @@ -6132,8 +6132,8 @@ srvsvc_dissect_SERVER_XPORT_ENUM_UNION(tvbuff_t *tvb, int offset, * IDL } SERVER_XPORT_ENUM_STRUCT; */ static int -srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -6154,11 +6154,11 @@ srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6166,7 +6166,7 @@ srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_INFO_0, NDR_POINTER_REF, "Transports", -1, 0); @@ -6174,8 +6174,8 @@ srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrservertransportadd_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportadd_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6194,16 +6194,16 @@ srvsvc_dissect_netrservertransportadd_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrservertransportenum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportenum_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT, NDR_POINTER_REF, "Transports", -1, 0); @@ -6218,11 +6218,11 @@ srvsvc_dissect_netrservertransportenum_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrservertransportenum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportenum_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT, NDR_POINTER_REF, "Transports", -1, 0); @@ -6249,11 +6249,11 @@ srvsvc_dissect_netrservertransportenum_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6261,7 +6261,7 @@ srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_INFO_0, NDR_POINTER_REF, "Transports", -1, 0); @@ -6269,8 +6269,8 @@ srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrservertransportdel_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportdel_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6296,8 +6296,8 @@ srvsvc_dissect_netrservertransportdel_reply(tvbuff_t *tvb, int offset, * IDL } TIMEOFDAY; */ static int -srvsvc_dissect_TIMEOFDAY(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_TIMEOFDAY(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { /* @@ -6347,11 +6347,11 @@ srvsvc_dissect_TIMEOFDAY(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrremotetod_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrremotetod_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6359,11 +6359,11 @@ srvsvc_dissect_netrremotetod_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrremotetod_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrremotetod_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TIMEOFDAY, NDR_POINTER_UNIQUE, "Time of day", -1, 0); @@ -6383,16 +6383,16 @@ srvsvc_dissect_netrremotetod_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsetserverservicebits_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsetserverservicebits_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Transport:", hf_srvsvc_transport, 0); @@ -6406,8 +6406,8 @@ srvsvc_dissect_netrsetserverservicebits_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsetserverservicebits_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsetserverservicebits_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6425,16 +6425,16 @@ srvsvc_dissect_netrsetserverservicebits_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrpathtype_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathtype_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path:", hf_srvsvc_path, 0); @@ -6445,8 +6445,8 @@ srvsvc_dissect_netrpathtype_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrpathtype_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathtype_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -6469,16 +6469,16 @@ srvsvc_dissect_netrpathtype_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path:", hf_srvsvc_path, 0); @@ -6486,7 +6486,7 @@ srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_outbuflen, NULL); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Prefix:", hf_srvsvc_prefix, 0); @@ -6500,8 +6500,8 @@ srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len; @@ -6552,21 +6552,21 @@ srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrpathcompare_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathcompare_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path 1:", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path 2:", hf_srvsvc_path, 0); @@ -6580,8 +6580,8 @@ srvsvc_dissect_netrpathcompare_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrpathcompare_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrpathcompare_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6600,16 +6600,16 @@ srvsvc_dissect_netrpathcompare_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrnamevalidate_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamevalidate_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path:", hf_srvsvc_path, 0); @@ -6623,8 +6623,8 @@ srvsvc_dissect_netrnamevalidate_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrnamevalidate_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamevalidate_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6644,16 +6644,16 @@ srvsvc_dissect_netrnamevalidate_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrnamecanonicalize_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamecanonicalize_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path:", hf_srvsvc_path, 0); @@ -6670,8 +6670,8 @@ srvsvc_dissect_netrnamecanonicalize_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { guint32 len; @@ -6718,21 +6718,21 @@ srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrnamecompare_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamecompare_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path 1:", hf_srvsvc_path, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path 2:", hf_srvsvc_path, 0); @@ -6746,8 +6746,8 @@ srvsvc_dissect_netrnamecompare_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrnamecompare_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrnamecompare_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6767,11 +6767,11 @@ srvsvc_dissect_netrnamecompare_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrshareenumsticky_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareenumsticky_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6791,8 +6791,8 @@ srvsvc_dissect_netrshareenumsticky_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrshareenumsticky_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrshareenumsticky_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -6823,28 +6823,28 @@ srvsvc_dissect_netrshareenumsticky_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharedelstart_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelstart_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Share", hf_srvsvc_share, 0); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_reserved, NULL); - + return offset; } static int -srvsvc_dissect_netrsharedelstart_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelstart_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -6862,8 +6862,8 @@ srvsvc_dissect_netrsharedelstart_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsharedelcommit_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelcommit_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -6872,8 +6872,8 @@ srvsvc_dissect_netrsharedelcommit_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsharedelcommit_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsharedelcommit_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -6897,21 +6897,21 @@ srvsvc_dissect_netrsharedelcommit_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrgetfilesecurity_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrgetfilesecurity_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Share", hf_srvsvc_share, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path", hf_srvsvc_path, 0); @@ -6923,8 +6923,8 @@ srvsvc_dissect_netrgetfilesecurity_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrgetfilesecurity_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrgetfilesecurity_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -6948,21 +6948,21 @@ srvsvc_dissect_netrgetfilesecurity_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrsetfilesecurity_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsetfilesecurity_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Share", hf_srvsvc_share, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_REF, "Path", hf_srvsvc_path, 0); @@ -6978,8 +6978,8 @@ srvsvc_dissect_netrsetfilesecurity_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrsetfilesecurity_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrsetfilesecurity_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -6997,11 +6997,11 @@ srvsvc_dissect_netrsetfilesecurity_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -7009,7 +7009,7 @@ srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT, NDR_POINTER_REF, "Transports", -1, 0); @@ -7017,8 +7017,8 @@ srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrservertransportaddex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrservertransportaddex_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -7039,21 +7039,21 @@ srvsvc_dissect_netrservertransportaddex_reply(tvbuff_t *tvb, int offset, * IDL ); */ static int -srvsvc_dissect_netrserversetservicebits2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserversetservicebits2_rqst(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Emulated Server", hf_srvsvc_emulated_server, 0); - offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_UNICODE_STRING, NDR_POINTER_UNIQUE, "Transport:", hf_srvsvc_transport, 0); @@ -7070,8 +7070,8 @@ srvsvc_dissect_netrserversetservicebits2_rqst(tvbuff_t *tvb, int offset, return offset; } static int -srvsvc_dissect_netrserversetservicebits2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, +srvsvc_dissect_netrserversetservicebits2_reply(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, @@ -7151,71 +7151,71 @@ static dcerpc_sub_dissector dcerpc_srvsvc_dissectors[] = { srvsvc_dissect_netrsharecheck_rqst, srvsvc_dissect_netrsharecheck_reply}, {SRV_NETRSERVERGETINFO, "NetrServerGetInfo", - srvsvc_dissect_netrservergetinfo_rqst, + srvsvc_dissect_netrservergetinfo_rqst, srvsvc_dissect_netrservergetinfo_reply}, {SRV_NETRSERVERSETINFO, "NetrServerSetInfo", - srvsvc_dissect_netrserversetinfo_rqst, - srvsvc_dissect_netrserversetinfo_reply}, + srvsvc_dissect_netrserversetinfo_rqst, + srvsvc_dissect_netrserversetinfo_reply}, {SRV_NETRSERVERDISKENUM, "NetrServerDiskEnum", - srvsvc_dissect_netrserverdiskenum_rqst, - srvsvc_dissect_netrserverdiskenum_reply}, + srvsvc_dissect_netrserverdiskenum_rqst, + srvsvc_dissect_netrserverdiskenum_reply}, {SRV_NETRSERVERSTATISTICSGET, "NetrServerStatisticsGet", - srvsvc_dissect_netrserverstatisticsget_rqst, - srvsvc_dissect_netrserverstatisticsget_reply}, + srvsvc_dissect_netrserverstatisticsget_rqst, + srvsvc_dissect_netrserverstatisticsget_reply}, {SRV_NETRSERVERTRANSPORTADD, "NetrServerTransportAdd", - srvsvc_dissect_netrservertransportadd_rqst, - srvsvc_dissect_netrservertransportadd_reply}, + srvsvc_dissect_netrservertransportadd_rqst, + srvsvc_dissect_netrservertransportadd_reply}, {SRV_NETRSERVERTRANSPORTENUM, "NetrServerTransportEnum", - srvsvc_dissect_netrservertransportenum_rqst, - srvsvc_dissect_netrservertransportenum_reply}, + srvsvc_dissect_netrservertransportenum_rqst, + srvsvc_dissect_netrservertransportenum_reply}, {SRV_NETRSERVERTRANSPORTDEL, "NetrServerTransportDel", - srvsvc_dissect_netrservertransportdel_rqst, - srvsvc_dissect_netrservertransportdel_reply}, + srvsvc_dissect_netrservertransportdel_rqst, + srvsvc_dissect_netrservertransportdel_reply}, {SRV_NETRREMOTETOD, "NetrRemoteTOD", - srvsvc_dissect_netrremotetod_rqst, - srvsvc_dissect_netrremotetod_reply}, + srvsvc_dissect_netrremotetod_rqst, + srvsvc_dissect_netrremotetod_reply}, {SRV_NETRSERVERSETSERVICEBITS, "NetrServerSetServiceBits", - srvsvc_dissect_netrsetserverservicebits_rqst, - srvsvc_dissect_netrsetserverservicebits_reply}, + srvsvc_dissect_netrsetserverservicebits_rqst, + srvsvc_dissect_netrsetserverservicebits_reply}, {SRV_NETRPRPATHTYPE, "NetrPathType", - srvsvc_dissect_netrpathtype_rqst, - srvsvc_dissect_netrpathtype_reply}, + srvsvc_dissect_netrpathtype_rqst, + srvsvc_dissect_netrpathtype_reply}, {SRV_NETRPRPATHCANONICALIZE, "NetrpPathCanonicalize", - srvsvc_dissect_netrpathcanonicalize_rqst, - srvsvc_dissect_netrpathcanonicalize_reply}, + srvsvc_dissect_netrpathcanonicalize_rqst, + srvsvc_dissect_netrpathcanonicalize_reply}, {SRV_NETRPRPATHCOMPARE, "NetrpPathCompare", - srvsvc_dissect_netrpathcompare_rqst, - srvsvc_dissect_netrpathcompare_reply}, + srvsvc_dissect_netrpathcompare_rqst, + srvsvc_dissect_netrpathcompare_reply}, {SRV_NETRPRNAMEVALIDATE, "NetrpNameValidate", - srvsvc_dissect_netrnamevalidate_rqst, - srvsvc_dissect_netrnamevalidate_reply}, + srvsvc_dissect_netrnamevalidate_rqst, + srvsvc_dissect_netrnamevalidate_reply}, {SRV_NETRPRNAMECANONICALIZE, "NetrpNameCanonicalize", - srvsvc_dissect_netrnamecanonicalize_rqst, - srvsvc_dissect_netrnamecanonicalize_reply}, + srvsvc_dissect_netrnamecanonicalize_rqst, + srvsvc_dissect_netrnamecanonicalize_reply}, {SRV_NETRPRNAMECOMPARE, "NetrpNameCompare", - srvsvc_dissect_netrnamecompare_rqst, - srvsvc_dissect_netrnamecompare_reply}, + srvsvc_dissect_netrnamecompare_rqst, + srvsvc_dissect_netrnamecompare_reply}, {SRV_NETRSHAREENUMSTICKY, "NetrShareEnumSticky", - srvsvc_dissect_netrshareenumsticky_rqst, - srvsvc_dissect_netrshareenumsticky_reply}, + srvsvc_dissect_netrshareenumsticky_rqst, + srvsvc_dissect_netrshareenumsticky_reply}, {SRV_NETRSHAREDELSTART, "NetrShareDelStart", - srvsvc_dissect_netrsharedelstart_rqst, - srvsvc_dissect_netrsharedelstart_reply}, + srvsvc_dissect_netrsharedelstart_rqst, + srvsvc_dissect_netrsharedelstart_reply}, {SRV_NETRSHAREDELCOMMIT, "NetrShareDelCommit", - srvsvc_dissect_netrsharedelcommit_rqst, - srvsvc_dissect_netrsharedelcommit_reply}, + srvsvc_dissect_netrsharedelcommit_rqst, + srvsvc_dissect_netrsharedelcommit_reply}, {SRV_NETRPGETFILESECURITY, "NetrpGetFileSecurity", - srvsvc_dissect_netrgetfilesecurity_rqst, - srvsvc_dissect_netrgetfilesecurity_reply}, + srvsvc_dissect_netrgetfilesecurity_rqst, + srvsvc_dissect_netrgetfilesecurity_reply}, {SRV_NETRPSETFILESECURITY, "NetrpSetFileSecurity", - srvsvc_dissect_netrsetfilesecurity_rqst, - srvsvc_dissect_netrsetfilesecurity_reply}, + srvsvc_dissect_netrsetfilesecurity_rqst, + srvsvc_dissect_netrsetfilesecurity_reply}, {SRV_NETRSERVERTRANSPORTADDEX, "NetrServerTransportAddEx", - srvsvc_dissect_netrservertransportaddex_rqst, - srvsvc_dissect_netrservertransportaddex_reply}, + srvsvc_dissect_netrservertransportaddex_rqst, + srvsvc_dissect_netrservertransportaddex_reply}, {SRV_NETRSERVERSETSERVICEBITS2, "NetrServerSetServiceBits2", - srvsvc_dissect_netrserversetservicebits2_rqst, - srvsvc_dissect_netrserversetservicebits2_reply}, + srvsvc_dissect_netrserversetservicebits2_rqst, + srvsvc_dissect_netrserversetservicebits2_reply}, {0, NULL, NULL, NULL} }; @@ -7275,7 +7275,7 @@ static const value_string srvsvc_opnum_vals[] = { {0, NULL } }; -void +void proto_register_dcerpc_srvsvc(void) { static hf_register_info hf[] = { @@ -7343,10 +7343,10 @@ proto_register_dcerpc_srvsvc(void) { "Time", "srvsvc.chrdev_time", FT_UINT32, BASE_DEC, NULL, 0x0, "Char Device Time?", HFILL}}, { &hf_srvsvc_info_level, - { "Info Level", "svrsvc.info_level", FT_UINT32, + { "Info Level", "svrsvc.info_level", FT_UINT32, BASE_DEC, NULL, 0x0, "Info Level", HFILL}}, { &hf_srvsvc_rc, - { "Return code", "srvsvc.rc", FT_UINT32, + { "Return code", "srvsvc.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "Return Code", HFILL}}, { &hf_srvsvc_platform_id, @@ -7367,7 +7367,7 @@ proto_register_dcerpc_srvsvc(void) { &hf_srvsvc_client_type, { "Client Type", "srvsvc.client.type", FT_STRING, BASE_NONE, NULL, 0x0, "Client Type", HFILL}}, - { &hf_srvsvc_comment, + { &hf_srvsvc_comment, { "Comment", "srvsvc.comment", FT_STRING, BASE_NONE, NULL, 0x0, "Comment", HFILL}}, { &hf_srvsvc_users, @@ -7394,11 +7394,11 @@ proto_register_dcerpc_srvsvc(void) { &hf_srvsvc_user_path, { "User Path", "srvsvc.user_path", FT_STRING, BASE_NONE, NULL, 0x0, "User Path", HFILL}}, - { &hf_srvsvc_share, + { &hf_srvsvc_share, { "Share", "srvsvc.share", FT_STRING, BASE_NONE, NULL, 0x0, "Share", HFILL}}, { &hf_srvsvc_share_type, - { "Share Type", "srvsvc.share_type", FT_UINT32, + { "Share Type", "srvsvc.share_type", FT_UINT32, BASE_HEX, VALS(share_type_vals), 0x0, "Share Type", HFILL}}, { &hf_srvsvc_file_id, { "File ID", "srvsvc.file_id", FT_UINT32, @@ -7556,7 +7556,7 @@ proto_register_dcerpc_srvsvc(void) { &hf_srvsvc_parm_error, { "Parameter Error", "srvsvc.parm_error", FT_UINT32, BASE_DEC, NULL, 0x0, "Parameter Error", HFILL}}, - { &hf_srvsvc_enum_handle, + { &hf_srvsvc_enum_handle, { "Enumeration handle", "srvsvc.enum_hnd", FT_BYTES, BASE_HEX, NULL, 0x0, "Enumeration Handle", HFILL}}, { &hf_srvsvc_irpstacksize, @@ -7854,7 +7854,7 @@ proto_reg_handoff_dcerpc_srvsvc(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_srvsvc, ett_dcerpc_srvsvc, - &uuid_dcerpc_srvsvc, ver_dcerpc_srvsvc, + dcerpc_init_uuid(proto_dcerpc_srvsvc, ett_dcerpc_srvsvc, + &uuid_dcerpc_srvsvc, ver_dcerpc_srvsvc, dcerpc_srvsvc_dissectors, hf_srvsvc_opnum); } diff --git a/packet-dcerpc-srvsvc.h b/packet-dcerpc-srvsvc.h index 15f3f7b628..78c214a9cb 100644 --- a/packet-dcerpc-srvsvc.h +++ b/packet-dcerpc-srvsvc.h @@ -7,22 +7,22 @@ * Rewrote entire file with a complete and correct list of all * function names. Ronnie Sahlberg * - * $Id: packet-dcerpc-srvsvc.h,v 1.5 2002/06/16 01:52:26 sahlberg Exp $ + * $Id: packet-dcerpc-srvsvc.h,v 1.6 2002/08/28 21:00:11 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc-tapi.c b/packet-dcerpc-tapi.c index 07f332e9ad..da778f0daa 100644 --- a/packet-dcerpc-tapi.c +++ b/packet-dcerpc-tapi.c @@ -2,27 +2,27 @@ * Routines for DCERPC TAPI packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-tapi.c,v 1.2 2002/06/24 00:03:18 tpot Exp $ + * $Id: packet-dcerpc-tapi.c,v 1.3 2002/08/28 21:00:11 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* The IDL file for this interface can be extracted by grepping for idl +/* The IDL file for this interface can be extracted by grepping for idl * in capitals. */ @@ -131,7 +131,7 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset, offset += di->array_actual_count; return offset; -} +} static int dissect_tapi_UNKNOWN_01_rqst(tvbuff_t *tvb, int offset, @@ -199,24 +199,24 @@ static dcerpc_sub_dissector dcerpc_tapi_dissectors[] = { {0, NULL, NULL, NULL } }; -void +void proto_register_dcerpc_tapi(void) { static hf_register_info hf[] = { - { &hf_tapi_rc, { - "Return code", "tapi.rc", FT_UINT32, BASE_HEX, + { &hf_tapi_rc, { + "Return code", "tapi.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "TAPI return code", HFILL }}, { &hf_tapi_hnd, { "Context Handle", "tapi.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "Context handle", HFILL }}, - { &hf_tapi_unknown_long, { - "Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX, + { &hf_tapi_unknown_long, { + "Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }}, - { &hf_tapi_unknown_string, { - "Unknown string", "tapi.unknown.string", FT_STRING, BASE_HEX, + { &hf_tapi_unknown_string, { + "Unknown string", "tapi.unknown.string", FT_STRING, BASE_HEX, NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}, - { &hf_tapi_unknown_bytes, { - "Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_HEX, + { &hf_tapi_unknown_bytes, { + "Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_HEX, NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }} }; @@ -227,7 +227,7 @@ static hf_register_info hf[] = { proto_dcerpc_tapi = proto_register_protocol( "Microsoft Telephony API Service", "TAPI", "tapi"); - proto_register_field_array(proto_dcerpc_tapi, hf, + proto_register_field_array(proto_dcerpc_tapi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -238,7 +238,7 @@ proto_reg_handoff_dcerpc_tapi(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_tapi, ett_dcerpc_tapi, - &uuid_dcerpc_tapi, ver_dcerpc_tapi, + dcerpc_init_uuid(proto_dcerpc_tapi, ett_dcerpc_tapi, + &uuid_dcerpc_tapi, ver_dcerpc_tapi, dcerpc_tapi_dissectors, -1); } diff --git a/packet-dcerpc-tapi.h b/packet-dcerpc-tapi.h index 5338fe26fb..924c9e9ce4 100644 --- a/packet-dcerpc-tapi.h +++ b/packet-dcerpc-tapi.h @@ -2,22 +2,22 @@ * Routines for DCERPC TAPI packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-tapi.h,v 1.1 2002/06/02 12:33:15 sahlberg Exp $ + * $Id: packet-dcerpc-tapi.h,v 1.2 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,4 +30,4 @@ #define TAPI_UNKNOWN_01 0x01 #define TAPI_UNKNOWN_02 0x02 -#endif +#endif diff --git a/packet-dcerpc-wkssvc.c b/packet-dcerpc-wkssvc.c index 05db551364..20df1b75b1 100644 --- a/packet-dcerpc-wkssvc.c +++ b/packet-dcerpc-wkssvc.c @@ -2,22 +2,22 @@ * Routines for SMB \\PIPE\\wkssvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-wkssvc.c,v 1.4 2002/06/24 00:03:18 tpot Exp $ + * $Id: packet-dcerpc-wkssvc.c,v 1.5 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -48,7 +48,7 @@ static dcerpc_sub_dissector dcerpc_wkssvc_dissectors[] = { {0, NULL, NULL, NULL } }; -void +void proto_register_dcerpc_wkssvc(void) { static gint *ett[] = { @@ -66,7 +66,7 @@ proto_reg_handoff_dcerpc_wkssvc(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_dcerpc_wkssvc, ett_dcerpc_wkssvc, - &uuid_dcerpc_wkssvc, ver_dcerpc_wkssvc, + dcerpc_init_uuid(proto_dcerpc_wkssvc, ett_dcerpc_wkssvc, + &uuid_dcerpc_wkssvc, ver_dcerpc_wkssvc, dcerpc_wkssvc_dissectors, -1); } diff --git a/packet-dcerpc-wkssvc.h b/packet-dcerpc-wkssvc.h index b483824002..b97c590112 100644 --- a/packet-dcerpc-wkssvc.h +++ b/packet-dcerpc-wkssvc.h @@ -2,22 +2,22 @@ * Routines for SMB \PIPE\wkssvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-wkssvc.h,v 1.3 2001/12/16 20:08:22 guy Exp $ + * $Id: packet-dcerpc-wkssvc.h,v 1.4 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dcerpc.c b/packet-dcerpc.c index 18dee9ab66..22a9d5e084 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -2,22 +2,22 @@ * Routines for DCERPC packet disassembly * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc.c,v 1.73 2002/08/22 20:04:54 tpot Exp $ + * $Id: packet-dcerpc.c,v 1.74 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -410,7 +410,7 @@ fragment_items dcerpc_frag_items = { static gboolean dcerpc_cn_desegment = TRUE; /* reassemble DCE/RPC fragments */ -/* reassembly of dcerpc fragments will not work for the case where ONE frame +/* reassembly of dcerpc fragments will not work for the case where ONE frame might contain multiple dcerpc fragments for different PDUs. this case would be so unusual/weird so if you got captures like that: too bad @@ -582,7 +582,7 @@ dcerpc_matched_hash (gconstpointer k) int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint8 *pdata) { guint8 data; @@ -598,7 +598,7 @@ dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint16 *pdata) { guint16 data; @@ -606,7 +606,7 @@ dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, data = ((drep[0] & 0x10) ? tvb_get_letohs (tvb, offset) : tvb_get_ntohs (tvb, offset)); - + if (tree) { proto_tree_add_item (tree, hfindex, tvb, offset, 2, (drep[0] & 0x10)); } @@ -617,7 +617,7 @@ dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata) { guint32 data; @@ -625,7 +625,7 @@ dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, data = ((drep[0] & 0x10) ? tvb_get_letohl (tvb, offset) : tvb_get_ntohl (tvb, offset)); - + if (tree) { proto_tree_add_item (tree, hfindex, tvb, offset, 4, (drep[0] & 0x10)); } @@ -636,7 +636,7 @@ dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, unsigned char *pdata) { if(pdata){ @@ -697,9 +697,9 @@ dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, char *drep, e_uuid_t *uuid) /* NDR arrays */ /* function to dissect a unidimensional conformant array */ -int +int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct) { guint32 i; @@ -729,9 +729,9 @@ dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, return offset; } /* function to dissect a unidimensional conformant and varying array */ -int +int dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct) { guint32 i; @@ -800,7 +800,7 @@ init_ndr_pointer_list(packet_info *pinfo) while(ndr_pointer_list){ ndr_pointer_data_t *npd; - + npd=g_slist_nth_data(ndr_pointer_list, 0); ndr_pointer_list=g_slist_remove(ndr_pointer_list, npd); if(npd){ @@ -849,11 +849,11 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d /* This is to check for any bugs in the dissectors. * * Basically, the NDR representation will store all - * arrays in two blocks, one block with the dimension + * arrays in two blocks, one block with the dimension * discreption, like size, number of elements and such, * and another block that contains the actual data stored * in the array. - * If the array is embedded directly inside another, + * If the array is embedded directly inside another, * encapsulating aggregate type, like a union or struct, * then these two blocks will be stored at different places * in the bytestream, with other data between the blocks. @@ -865,8 +865,8 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d * in which mode the dissector MUST NOT consume any data from * the tvbuff (i.e. may not dissect anything) except the * initial control block for arrays. - * The second time the dissector is called, with - * conformant_run==0, all other data for the type will be + * The second time the dissector is called, with + * conformant_run==0, all other data for the type will be * dissected. * * All dissect_ndr_<type> dissectors are already prepared @@ -886,7 +886,7 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d * if(di->conformant_run){ * return offset; * } - * + * * to make sure it makes the right thing. * This assert will signal when someone has forgotten to * make the dissector aware of this requirement. @@ -902,10 +902,10 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d return offset; } - + static void -add_pointer_to_list(packet_info *pinfo, proto_tree *tree, +add_pointer_to_list(packet_info *pinfo, proto_tree *tree, dcerpc_dissect_fnct_t *fnct, guint32 id, int hf_index, int levels) { ndr_pointer_data_t *npd; @@ -926,7 +926,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, } } else { /* if we havent seen the request bail out since we cant - know whether this is the first non-NULL instance + know whether this is the first non-NULL instance or not */ if(value->req_frame==0){ /* XXX THROW EXCEPTION */ @@ -946,7 +946,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, npd->fnct=fnct; npd->hf_index=hf_index; npd->levels=levels; - ndr_pointer_list = g_slist_insert(ndr_pointer_list, npd, + ndr_pointer_list = g_slist_insert(ndr_pointer_list, npd, ndr_pointer_list_pos); ndr_pointer_list_pos++; } @@ -957,7 +957,7 @@ find_pointer_index(guint32 id) { ndr_pointer_data_t *npd; int i,len; - + len=g_slist_length(ndr_pointer_list); for(i=0;i<len;i++){ npd=g_slist_nth_data(ndr_pointer_list, i); @@ -967,35 +967,35 @@ find_pointer_index(guint32 id) } } } - + return -1; } /* This function dissects an NDR pointer and stores the callback for later - * deferred dissection. + * deferred dissection. * * fnct is the callback function for when we have reached this object in - * the bytestream. - * + * the bytestream. + * * type is what type of pointer. * * this is text is what text we should put in any created tree node. * * hf_index is what hf value we want to pass to the callback function when * it is called, the callback can later pich this one up from di->hf_index. - * + * * levels is a generic int we want to pass to teh callback function. the * callback can later pick it up from di->levels * * See packet-dcerpc-samr.c for examples */ -int +int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index, int levels) { dcerpc_info *di; - + di=pinfo->private_data; if(di->conformant_run){ /* this call was only for dissecting the header for any @@ -1012,7 +1012,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tr; /* we must find out a nice way to do the length here */ - item=proto_tree_add_text(tree, tvb, offset, 0, + item=proto_tree_add_text(tree, tvb, offset, 0, "%s", text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); @@ -1030,7 +1030,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* get the referent id */ offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id); - + /* we got a NULL pointer */ if(id==0){ proto_tree_add_text(tree, tvb, offset-4, 4, @@ -1049,7 +1049,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* new pointer */ - item=proto_tree_add_text(tree, tvb, offset-4, 4, + item=proto_tree_add_text(tree, tvb, offset-4, 4, "%s", text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id); @@ -1065,7 +1065,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* get the referent id */ offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id); - + /* we got a NULL pointer */ if(id==0){ proto_tree_add_text(tree, tvb, offset-4, 4, @@ -1074,7 +1074,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* new pointer */ - item=proto_tree_add_text(tree, tvb, offset-4, 4, + item=proto_tree_add_text(tree, tvb, offset-4, 4, "%s", text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id); @@ -1091,9 +1091,9 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* get the referent id */ offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id); - + /* new pointer */ - item=proto_tree_add_text(tree, tvb, offset-4, 4, + item=proto_tree_add_text(tree, tvb, offset-4, 4, "%s",text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id); @@ -1110,7 +1110,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* get the referent id */ offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id); - + /* we got a NULL pointer */ if(id==0){ proto_tree_add_text(tree, tvb, offset-4, 4, @@ -1119,7 +1119,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* new pointer */ - item=proto_tree_add_text(tree, tvb, offset-4, 4, + item=proto_tree_add_text(tree, tvb, offset-4, 4, "%s",text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id); @@ -1137,7 +1137,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* get the referent id */ offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id); - + /* we got a NULL pointer */ if(id==0){ proto_tree_add_text(tree, tvb, offset-4, 4, @@ -1156,7 +1156,7 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, } /* new pointer */ - item=proto_tree_add_text(tree, tvb, offset-4, 4, + item=proto_tree_add_text(tree, tvb, offset-4, 4, "%s", text); tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data); proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id); @@ -1200,7 +1200,7 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, key.uuid = info->call_data->uuid; key.ver = info->call_data->ver; - + if ((sub_proto = g_hash_table_lookup (dcerpc_uuids, &key)) == NULL || !proto_is_protocol_enabled(sub_proto->proto)) { /* @@ -1237,13 +1237,13 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, if (tree) { proto_item *sub_item; - sub_item = proto_tree_add_item (tree, sub_proto->proto, tvb, offset, + sub_item = proto_tree_add_item (tree, sub_proto->proto, tvb, offset, -1, FALSE); if (sub_item) { sub_tree = proto_item_add_subtree (sub_item, sub_proto->ett); } - + /* * Put the operation number into the tree along with * the operation's name. @@ -1261,7 +1261,7 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, name, info->call_data->opnum); } - /* + /* * If the authentication level is DCE_C_AUTHN_LEVEL_PKT_PRIVACY, * the stub data is encrypted, and we can't dissect it. */ @@ -1326,7 +1326,7 @@ dissect_dcerpc_cn_auth (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr && (hdr->auth_len + 8 <= hdr->frag_len)) { offset = hdr->frag_len - (hdr->auth_len + 8); - + offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_auth_type, &auth_type); offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, @@ -1352,7 +1352,7 @@ dissect_dcerpc_cn_auth (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr ntlmssp_tvb = tvb_new_subset(tvb, offset, hdr->auth_len, hdr->auth_len); - call_dissector(ntlmssp_handle, ntlmssp_tvb, pinfo, + call_dissector(ntlmssp_handle, ntlmssp_tvb, pinfo, dcerpc_tree); break; @@ -1379,7 +1379,7 @@ dissect_dcerpc_cn_auth (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr /* figure out where the auth padding starts */ offset = hdr->frag_len - (hdr->auth_len + 8 + auth_pad_len); if (offset > 0 && auth_pad_len) { - proto_tree_add_text (dcerpc_tree, tvb, offset, + proto_tree_add_text (dcerpc_tree, tvb, offset, auth_pad_len, "Auth padding"); return hdr->auth_len + 8 + auth_pad_len; } else { @@ -1398,7 +1398,7 @@ dissect_dcerpc_cn_auth (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr static guint16 get_smb_fid (void *private_data) { dcerpc_private_info *priv = (dcerpc_private_info *)private_data; - + if (!priv) return 0; /* Nothing to see here */ @@ -1606,11 +1606,11 @@ dissect_dcerpc_cn_bind_ack (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerp offset += 3; for (i = 0; i < num_results; i++) { - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_ack_result, &result); if (result != 0) { - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_ack_reason, &reason); } else { @@ -1637,7 +1637,7 @@ dissect_dcerpc_cn_bind_ack (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerp offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_ack_trans_ver, &trans_ver); } - + /* * XXX - do we need to do anything with the authentication level * we get back from this? @@ -1671,7 +1671,7 @@ dissect_dcerpc_cn_bind_nak (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerp int offset = 16; - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_reject_reason, &reason); @@ -1686,10 +1686,10 @@ dissect_dcerpc_cn_bind_nak (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerp &num_protocols); for (i = 0; i < num_protocols; i++) { - offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_protocol_ver_major, NULL); - offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_protocol_ver_minor, NULL); } @@ -1777,7 +1777,7 @@ dissect_dcerpc_cn_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, tot_len = fragment_get_tot_len(pinfo, frame, dcerpc_co_reassemble_table); - fd_head = fragment_add(tvb, offset, pinfo, + fd_head = fragment_add(tvb, offset, pinfo, frame, dcerpc_co_reassemble_table, tot_len-alloc_hint, @@ -1928,7 +1928,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr call_value->private_data = NULL; g_hash_table_insert (dcerpc_calls, call_key, call_value); - g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); + g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); } } @@ -1945,7 +1945,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr di.call_data = value; if(value->rep_frame!=0){ - proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, + proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); } @@ -2040,7 +2040,7 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr proto_tree_add_uint (dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); if(value->req_frame!=0){ - proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, + proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); } @@ -2145,7 +2145,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_uint (dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); if(value->req_frame!=0){ - proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, + proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); } @@ -2230,7 +2230,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, packet_info *pinfo, tot_len = fragment_get_tot_len(pinfo, value->rep_frame, dcerpc_co_reassemble_table); - fd_head = fragment_add(tvb, offset, pinfo, + fd_head = fragment_add(tvb, offset, pinfo, value->rep_frame, dcerpc_co_reassemble_table, tot_len-alloc_hint, @@ -2569,7 +2569,7 @@ dissect_dcerpc_dg_cancel_ack (tvbuff_t *tvb, int offset, packet_info *pinfo, { guint32 version; - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_cancel_vers, &version); @@ -2577,10 +2577,10 @@ dissect_dcerpc_dg_cancel_ack (tvbuff_t *tvb, int offset, packet_info *pinfo, case 0: /* The only version we know about */ - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_cancel_id, NULL); - offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_server_accepting_cancels, NULL); break; @@ -2594,7 +2594,7 @@ dissect_dcerpc_dg_cancel (tvbuff_t *tvb, int offset, packet_info *pinfo, { guint32 version; - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_cancel_vers, &version); @@ -2602,11 +2602,11 @@ dissect_dcerpc_dg_cancel (tvbuff_t *tvb, int offset, packet_info *pinfo, case 0: /* The only version we know about */ - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_cancel_id, NULL); /* XXX - are NDR booleans 32 bits? */ - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_server_accepting_cancels, NULL); break; @@ -2623,7 +2623,7 @@ dissect_dcerpc_dg_fack (tvbuff_t *tvb, int offset, packet_info *pinfo, guint16 selack_len; guint i; - offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint8 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_vers, &version); /* padding */ @@ -2633,27 +2633,27 @@ dissect_dcerpc_dg_fack (tvbuff_t *tvb, int offset, packet_info *pinfo, case 0: /* The only version documented in the DCE RPC 1.1 spec */ case 1: /* This appears to be the same */ - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_window_size, NULL); - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_max_tsdu, NULL); - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_max_frag_size, NULL); - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_serial_num, &serial_num); if (check_col (pinfo->cinfo, COL_INFO)) { col_append_fstr (pinfo->cinfo, COL_INFO, " serial_num: %u", serial_num); } - offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_selack_len, &selack_len); for (i = 0; i < selack_len; i++) { - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_fack_selack, NULL); } @@ -2669,7 +2669,7 @@ dissect_dcerpc_dg_reject_fault (tvbuff_t *tvb, int offset, packet_info *pinfo, { guint32 status; - offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, + offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_dg_status, &status); @@ -2718,8 +2718,8 @@ dissect_dcerpc_dg_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, * XXX - authentication level? */ pinfo->fragmented = (hdr->flags1 & PFCL1_FRAG); - dcerpc_try_handoff (pinfo, tree, dcerpc_tree, - tvb_new_subset (tvb, offset, length, + dcerpc_try_handoff (pinfo, tree, dcerpc_tree, + tvb_new_subset (tvb, offset, length, reported_length), 0, hdr->drep, di, 0); } else { @@ -2804,7 +2804,7 @@ dissect_dcerpc_dg_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, call_value->private_data = NULL; g_hash_table_insert (dcerpc_calls, call_key, call_value); - g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); + g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); } value=g_hash_table_lookup(dcerpc_matched, (void *)pinfo->fd->num); @@ -2864,7 +2864,7 @@ dissect_dcerpc_dg_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, } di.conv = conv; - di.call_id = 0; + di.call_id = 0; di.smb_fid = -1; di.request = FALSE; di.call_data = value; @@ -3115,7 +3115,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_dcerpc_dg_auth (tvb, offset, dcerpc_tree, &hdr, NULL); } - /* + /* * keeping track of the conversation shouldn't really be necessary * for connectionless packets, because everything we need to know * to dissect is in the header for each packet. Unfortunately, @@ -3250,10 +3250,10 @@ proto_register_dcerpc (void) { &hf_dcerpc_request_in, { "Request in", "dcerpc.request_in", FT_UINT32, BASE_DEC, NULL, 0, "This packet is a response to the packet in this frame", HFILL }}, - { &hf_dcerpc_response_in, + { &hf_dcerpc_response_in, { "Response in", "dcerpc.response_in", FT_UINT32, BASE_DEC, NULL, 0, "The response to this packet is in this packet", HFILL }}, - { &hf_dcerpc_referent_id, + { &hf_dcerpc_referent_id, { "Referent ID", "dcerpc.referent_id", FT_UINT32, BASE_HEX, NULL, 0, "Referent ID for this NDR encoded pointer", HFILL }}, { &hf_dcerpc_ver, @@ -3465,11 +3465,11 @@ proto_register_dcerpc (void) { "Operation", "dcerpc.op", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_dcerpc_fragments, - { "DCE/RPC Fragments", "dcerpc.fragments", FT_NONE, BASE_NONE, + { "DCE/RPC Fragments", "dcerpc.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "DCE/RPC Fragments", HFILL }}, { &hf_dcerpc_fragment, - { "DCE/RPC Fragment", "dcerpc.fragment", FT_NONE, BASE_NONE, + { "DCE/RPC Fragment", "dcerpc.fragment", FT_NONE, BASE_NONE, NULL, 0x0, "DCE/RPC Fragment", HFILL }}, { &hf_dcerpc_fragment_overlap, diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 63984e903b..1fd58d4369 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -1,22 +1,22 @@ /* packet-dcerpc.h * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc.h,v 1.18 2002/06/24 00:03:18 tpot Exp $ + * $Id: packet-dcerpc.h,v 1.19 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -104,16 +104,16 @@ guint16 dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, char *drep); guint32 dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, char *drep); void dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, char *drep, e_uuid_t *uuid); int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint8 *pdata); int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint16 *pdata); int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata); int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, unsigned char *pdata); @@ -121,22 +121,22 @@ int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, * NDR routines for subdissectors. */ int dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint8 *pdata); int dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint16 *pdata); int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, guint32 *pdata); int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, unsigned char *pdata); int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, e_uuid_t *pdata); int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, int hfindex, e_ctx_hnd *pdata); @@ -145,19 +145,19 @@ typedef int (dcerpc_dissect_fnct_t)(tvbuff_t *tvb, int offset, packet_info *pinf #define NDR_POINTER_REF 1 #define NDR_POINTER_UNIQUE 2 #define NDR_POINTER_PTR 3 - + int dissect_ndr_pointer (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index, int levels); /* dissect a NDR unidimensional conformant array */ int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct); /* dissect a NDR unidimensional conformant and varying array */ int dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct); @@ -207,11 +207,11 @@ typedef struct _dcerpc_info { gboolean conformant_run; gint32 conformant_eaten; /* how many bytes did the conformant run eat?*/ guint32 array_max_count; /* max_count for conformant arrays */ - guint32 array_max_count_offset; + guint32 array_max_count_offset; guint32 array_offset; guint32 array_offset_offset; - guint32 array_actual_count; - guint32 array_actual_count_offset; + guint32 array_actual_count; + guint32 array_actual_count_offset; int hf_index; int levels; /* number of levels upwards in the tree to append text*/ dcerpc_call_value *call_data; diff --git a/packet-ddtp.c b/packet-ddtp.c index ad565d360b..3c29002c2b 100644 --- a/packet-ddtp.c +++ b/packet-ddtp.c @@ -3,22 +3,22 @@ * see http://ddt.sourceforge.net/ * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-ddtp.c,v 1.21 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-ddtp.c,v 1.22 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ddtp.h b/packet-ddtp.h index 98c30f805d..a298060951 100644 --- a/packet-ddtp.h +++ b/packet-ddtp.h @@ -3,23 +3,23 @@ * see http://ddt.sourceforge.net/ * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-ddtp.h,v 1.3 2000/08/11 13:34:14 deniel Exp $ + * $Id: packet-ddtp.h,v 1.4 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 2000 * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c index b482a1f353..5b3d2b5cec 100644 --- a/packet-dec-bpdu.c +++ b/packet-dec-bpdu.c @@ -1,24 +1,24 @@ /* packet-dec-bpdu.c * Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly * - * $Id: packet-dec-bpdu.c,v 1.14 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-dec-bpdu.c,v 1.15 2002/08/28 21:00:12 jmayer Exp $ * * Copyright 2001 Paul Ionescu <paul@acorp.ro> - * + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -126,13 +126,13 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, val_to_str(bpdu_type, bpdu_type_vals, "Unknown BPDU type (%u)")); } - + set_actual_length(tvb, DEC_BPDU_SIZE); if (tree) { @@ -197,7 +197,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static const true_false_string yesno = { +static const true_false_string yesno = { "Yes", "No" }; diff --git a/packet-dhcpv6.c b/packet-dhcpv6.c index effb37cb7a..a932f255b6 100644 --- a/packet-dhcpv6.c +++ b/packet-dhcpv6.c @@ -4,7 +4,7 @@ * IItom Tsutomu MIENO <iitom@utouto.com> * SHIRASAKI Yasuhiro <yasuhiro@gnome.gr.jp> * - * $Id: packet-dhcpv6.c,v 1.6 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-dhcpv6.c,v 1.7 2002/08/28 21:00:12 jmayer Exp $ * * The information used comes from: * draft-ietf-dhc-dhcpv6-26.txt @@ -17,17 +17,17 @@ * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -103,7 +103,7 @@ static guint ett_dhcpv6_option = -1; static const value_string msgtype_vals[] = { { SOLICIT, "Solicit" }, { ADVERTISE, "Advertise" }, - { REQUEST, "Request" }, + { REQUEST, "Request" }, { CONFIRM, "Confirm" }, { RENEW, "Renew" }, { REBIND, "Rebind" }, @@ -216,8 +216,8 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, } duidtype = tvb_get_ntohs(tvb, off); proto_tree_add_text(subtree, tvb, off, 2, - "DUID type: %s (%u)", - val_to_str(duidtype, + "DUID type: %s (%u)", + val_to_str(duidtype, duidtype_vals, "Unknown"), duidtype); switch (duidtype) { @@ -326,7 +326,7 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, guint16 requested_opt_code; requested_opt_code = tvb_get_ntohs(tvb, off + i); proto_tree_add_text(subtree, tvb, off + i, - 2, "Requested Option code: %s (%d)", + 2, "Requested Option code: %s (%d)", val_to_str(requested_opt_code, opttype_vals, "Unknown"), @@ -399,9 +399,9 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, guint16 status_code; char *status_message = 0; status_code = tvb_get_ntohs(tvb, off); - proto_tree_add_text(subtree, tvb, off, 2, + proto_tree_add_text(subtree, tvb, off, 2, "Status Code: %s (%d)", - val_to_str(status_code, statuscode_vals, + val_to_str(status_code, statuscode_vals, "Unknown"), status_code); @@ -409,7 +409,7 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, status_message = g_malloc(optlen - 2 + 1); if (status_message != 0){ memset(status_message, 0, optlen - 2 + 1); - status_message = tvb_memcpy(tvb, status_message, off + 2, + status_message = tvb_memcpy(tvb, status_message, off + 2, optlen - 2); proto_tree_add_text(subtree, tvb, off + 2, optlen - 2, "Status Message: %s", @@ -504,11 +504,11 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, guint32 lease_duration; guint8 prefix_length; struct e_in6_addr in6; - + lease_duration = tvb_get_ntohl(tvb, off); prefix_length = tvb_get_guint8(tvb, off + 4); if ( lease_duration == DHCPV6_LEASEDURATION_INFINITY) { - proto_tree_add_text(subtree, tvb, off, 4, + proto_tree_add_text(subtree, tvb, off, 4, "Lease duration: infinity"); } else { proto_tree_add_text(subtree, tvb, off, 4, @@ -615,7 +615,7 @@ proto_register_dhcpv6(void) &ett_dhcpv6, &ett_dhcpv6_option, }; - + proto_dhcpv6 = proto_register_protocol("DHCPv6", "DHCPv6", "dhcpv6"); proto_register_field_array(proto_dhcpv6, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-diameter-defs.h b/packet-diameter-defs.h index ac91f7f302..26ce899ad1 100644 --- a/packet-diameter-defs.h +++ b/packet-diameter-defs.h @@ -5,7 +5,7 @@ * AVPs. If libxml is in the LD_LIBRARY_PATH, and dictionary.xml exists, * then it will not be used. * - * $Id: packet-diameter-defs.h,v 1.7 2002/03/05 00:21:02 guy Exp $ + * $Id: packet-diameter-defs.h,v 1.8 2002/08/28 21:00:12 jmayer Exp $ * Generated: Fri Feb 23 13:04:15 2001 */ @@ -163,7 +163,7 @@ static value_string diameter_tunnel_type_vals[]= { }; static value_string diameter_tunnel_medium_type_vals[]= { - {1,"IPv4"}, + {1,"IPv4"}, {2,"IPv6"}, {3,"NSAP"}, {4,"HDLC"}, @@ -351,7 +351,7 @@ static struct old_avp_info old_diameter_avps[] = { { 280, "Proxy-Host", DIAMETER_IDENTITY, (value_string *)NULL}, { 284, "Proxy-Info", DIAMETER_GROUPED, (value_string *)NULL}, { 292, "Redirect-Host", DIAMETER_IDENTITY, (value_string *)NULL}, - { 261, "Redirect-Host-Usage", DIAMETER_ENUMERATED, diameter_redirect_host_usage_vals}, + { 261, "Redirect-Host-Usage", DIAMETER_ENUMERATED, diameter_redirect_host_usage_vals}, { 262, "Redirect-Max-Cache-Time", DIAMETER_UNSIGNED32, (value_string *)NULL}, { 268, "Result-Code", DIAMETER_UNSIGNED32, (value_string *)NULL}, { 282, "Route-Record", DIAMETER_IDENTITY, (value_string *)NULL}, diff --git a/packet-diameter.c b/packet-diameter.c index 2b1707d8ad..4da97c703e 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.49 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-diameter.c,v 1.50 2002/08/28 21:00:12 jmayer Exp $ * * Copyright (c) 2001 by David Frascone <dave@frascone.com> * @@ -70,7 +70,7 @@ typedef enum { DIAMETER_MIP_REG_REQ, /* OctetString */ DIAMETER_VENDOR_ID, /* Integer32 */ DIAMETER_APPLICATION_ID - + } diameterDataType; @@ -281,10 +281,10 @@ xmlParseFilePush( char *filename, int checkValid) { int res, size = 1024; char chars[1024]; xmlParserCtxtPtr ctxt; - + /* I wonder what kind of a performance hit this is? */ *XmlStub.xmlDoValidityCheckingDefaultValue = checkValid; - + f = fopen(filename, "r"); if (f == NULL) { g_warning("Diameter: Unable to open %s", filename); @@ -303,7 +303,7 @@ xmlParseFilePush( char *filename, int checkValid) { valid=ctxt->valid; XmlStub.xmlFreeParserCtxt(ctxt); } - fclose(f); + fclose(f); /* Check valid */ if (!valid) { @@ -329,7 +329,7 @@ addStaticAVP(int code, gchar *name, diameterDataType type, value_string *values) if (values) { for (i=0; values[i].strptr != NULL; i++) { ValueName *ve = NULL; - + ve = g_malloc(sizeof(ValueName)); ve->name = strdup(values[i].strptr); ve->value = values[i].value; @@ -353,7 +353,7 @@ addStaticAVP(int code, gchar *name, diameterDataType type, value_string *values) avpListHead = entry; return (0); - + } /* addStaticAVP */ /* @@ -395,12 +395,12 @@ xmlParseAVP(xmlNodePtr cur) ValueName *ve = NULL; valueName = XmlStub.xmlGetProp(cur, "name"); valueCode = XmlStub.xmlGetProp(cur, "code"); - + if (!valueName || !valueCode) { g_warning( "Error, bad value on avp %s", name); return (-1); } - + ve = g_malloc(sizeof(ValueName)); ve->name = strdup(valueName); ve->value = atol(valueCode); @@ -437,13 +437,13 @@ xmlParseAVP(xmlNodePtr cur) } /* WORK - Handle flags -- for validation later */ - + /* And, create the entry */ entry = (avpInfo *)g_malloc(sizeof(avpInfo)); entry->name = g_strdup(name); entry->code = atol(code); - if (vendorName) + if (vendorName) entry->vendorName = g_strdup(vendorName); else entry->vendorName = NULL; @@ -539,10 +539,10 @@ dictionaryAddApplication(char *name, int id) g_warning( "Unable to allocate memory"); return (-1); } - + entry->name = g_strdup(name); entry->id = id; - + /* Add it to the list */ entry->next = ApplicationIdHead; ApplicationIdHead = entry; @@ -603,18 +603,18 @@ xmlDictionaryParseSegment(xmlNodePtr cur, int base) if (!base) { char *name; char *id; - + /* Add our application */ id = XmlStub.xmlGetProp(cur, "id"); name = XmlStub.xmlGetProp(cur, "name"); - + if (!name || !id) { /* ERROR!!! */ g_warning("Diameter: Invalid application!: name=\"%s\", id=\"%s\"", name?name:"NULL", id?id:"NULL"); return -1; } - + /* Add the application */ if (dictionaryAddApplication(name, atol(id)) != 0) { /* ERROR! */ @@ -622,7 +622,7 @@ xmlDictionaryParseSegment(xmlNodePtr cur, int base) } } - + /* * Get segment values */ @@ -654,7 +654,7 @@ xmlDictionaryParseSegment(xmlNodePtr cur, int base) } /* xmlDictionaryParseSegment */ /* - * The main xml parse routine. This will walk through an XML + * The main xml parse routine. This will walk through an XML * dictionary that has been parsed by libxml. */ static int @@ -704,7 +704,7 @@ loadXMLDictionary() gbl_diameterDictionary); return -1; } - + /* * Check the document is of the right kind */ @@ -721,7 +721,7 @@ loadXMLDictionary() XmlStub.xmlFreeDoc(doc); return -1; } - + /* * Ok, the dictionary has been parsed by libxml, and is valid. * All we have to do now is read in our information. @@ -770,8 +770,8 @@ initializeDictionaryDefaults() } /* initializeDictionaryDefaults */ -/* - * This routine will attempt to load the XML dictionary, and on +/* + * This routine will attempt to load the XML dictionary, and on * failure, will call initializeDictionaryDefaults to load in * our static dictionary. */ @@ -779,7 +779,7 @@ static void initializeDictionary() { /* - * Using ugly ordering here. If loadLibXML succeeds, then + * Using ugly ordering here. If loadLibXML succeeds, then * loadXMLDictionary will be called. This is one of the few times when * I think this is prettier than the nested if alternative. */ @@ -847,8 +847,8 @@ diameter_command_to_str(guint32 commandCode, guint32 vendorId) } } } - - g_warning("Diameter: Unable to find name for command code 0x%08x, Vendor \"%u\"!", + + g_warning("Diameter: Unable to find name for command code 0x%08x, Vendor \"%u\"!", commandCode, vendorId); snprintf(buffer, sizeof(buffer), "Cmd-0x%08x", commandCode); @@ -877,13 +877,13 @@ static diameterDataType diameter_avp_get_type(guint32 avpCode, guint32 vendorId){ avpInfo *probe; gchar *vendorName=NULL; - + if (vendorId) vendorName = diameter_vendor_to_str(vendorId, FALSE); - + for (probe=avpListHead; probe; probe=probe->next) { if (avpCode == probe->code) { - + if (vendorId) { /* g_warning("AvpType: Comparing \"%s\" to \"%s\"", */ /* vendorName?vendorName:"(null)", */ @@ -900,7 +900,7 @@ diameter_avp_get_type(guint32 avpCode, guint32 vendorId){ } } } - + /* If we don't find it, assume it's data */ g_warning("Diameter: Unable to find type for avpCode %u, Vendor %u!", avpCode, vendorId); @@ -937,7 +937,7 @@ diameter_avp_get_name(guint32 avpCode, guint32 vendorId) } } - g_warning("Diameter: Unable to find name for AVP 0x%08x, Vendor %u!", + g_warning("Diameter: Unable to find name for AVP 0x%08x, Vendor %u!", avpCode, vendorId); /* If we don't find it, build a name string */ @@ -1034,16 +1034,16 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info initializeDictionary(); initialized=TRUE; } - + /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Diameter"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + /* Copy our header */ tvb_memcpy(tvb, (guint8*) &dh, offset, sizeof(dh)); - + /* Fix byte ordering in our static structure */ dh.versionLength = g_ntohl(dh.versionLength); dh.flagsCmdCode = g_ntohl(dh.flagsCmdCode); @@ -1052,7 +1052,7 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info dh.endToEndId = g_ntohl(dh.endToEndId); if (dh.vendorId) { - strcpy(vendorName, + strcpy(vendorName, diameter_vendor_to_str(dh.vendorId, TRUE)); } else { strcpy(vendorName, "None"); @@ -1066,7 +1066,7 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info commandCode = DIAM_GET_COMMAND(dh); /* Set up our flags */ - if (check_col(pinfo->cinfo, COL_INFO) || tree) { + if (check_col(pinfo->cinfo, COL_INFO) || tree) { flagstr[0]=0; for (i = 0; i < 8; i++) { bpos = 1 << i; @@ -1081,10 +1081,10 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info strcpy(flagstr,"<None>"); } } - + /* Set up our commandString */ strcpy(commandString, diameter_command_to_str(commandCode, dh.vendorId)); - if (flags & DIAM_FLAGS_R) + if (flags & DIAM_FLAGS_R) strcat(commandString, "-Request"); else strcat(commandString, "-Answer"); @@ -1119,7 +1119,7 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info (flags & DIAM_FLAGS_P)?1:0, (flags & DIAM_FLAGS_E)?1:0); } - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ @@ -1190,12 +1190,12 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info /* Update the lengths */ avplength= pktLength - sizeof(e_diameterhdr); - + avp_tvb = tvb_new_subset(tvb, offset, avplength, avplength); avptf = proto_tree_add_text(diameter_tree, tvb, offset, avplength, "Attribute Value Pairs"); - + avp_tree = proto_item_add_subtree(avptf, ett_diameter_avp); if (avp_tree != NULL) { @@ -1220,7 +1220,7 @@ dissect_diameter_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 plen; guint32 available_bytes; /* guint32 noffset; */ - + /* Loop through the packet, dissecting multiple diameter messages */ do { available_bytes = tvb_length_remaining(tvb, offset); @@ -1245,7 +1245,7 @@ dissect_diameter_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } } - + /* Otherwise, dissect our packet */ offset = dissect_diameter_common(tvb, offset, pinfo, tree); @@ -1283,7 +1283,7 @@ safe_dissect_mip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, mip_tvb = tvb_new_subset(tvb, offset, MIN(length, tvb_length(tvb)-offset), length); - + /* The contained packet is a MIP registration request; dissect it with the MIP dissector. */ col_set_writable(pinfo->cinfo, FALSE); @@ -1341,7 +1341,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree guint8 flags; proto_item *tf; proto_tree *flags_tree; - + gint32 packetLength; size_t avpDataLength; int avpType; @@ -1370,19 +1370,19 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree /* Don't even bother trying to parse a short packet. */ return; } - + /* Copy our header */ tvb_memcpy(tvb, (guint8*) &avph, offset, MIN((long)sizeof(avph),packetLength)); - + /* Fix the byte ordering */ avph.avp_code = g_ntohl(avph.avp_code); avph.avp_flagsLength = g_ntohl(avph.avp_flagsLength); - + flags = (avph.avp_flagsLength & 0xff000000) >> 24; avpLength = avph.avp_flagsLength & 0x00ffffff; - + /* Set up our flags string */ - if (check_col(pinfo->cinfo, COL_INFO) || avp_tree) { + if (check_col(pinfo->cinfo, COL_INFO) || avp_tree) { flagstr[0]=0; for (i = 0; i < 8; i++) { bpos = 1 << i; @@ -1405,20 +1405,20 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree hdrLength = sizeof(e_avphdr); } else { /* No vendor */ - hdrLength = sizeof(e_avphdr) - + hdrLength = sizeof(e_avphdr) - sizeof(guint32); vendorId = 0; } if (vendorId) { - strcpy(vendorName, + strcpy(vendorName, diameter_vendor_to_str(vendorId, TRUE)); } else { vendorName[0]='\0'; } /* Check for bad length */ - if (avpLength < MIN_AVP_SIZE || + if (avpLength < MIN_AVP_SIZE || ((long)avpLength > packetLength)) { g_warning("Diameter: AVP payload size invalid: avp_length: %ld bytes, " "min: %ld bytes, packetLen: %d", @@ -1435,17 +1435,17 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree /* For now, don't set bad packet, since I'm accidentally setting a wrong bit */ /* BadPacket = TRUE; */ } - + /* * Compute amount of byte-alignment fix (Diameter AVPs are sent on 4 byte * boundries) */ fixAmt = 4 - (avpLength % 4); if (fixAmt == 4) fixAmt = 0; - + /* shrink our packetLength */ packetLength = packetLength - (avpLength + fixAmt); - + /* Check for out of bounds */ if (packetLength < 0) { g_warning("Diameter: Bad AVP: Bad new length (%d bytes) ", @@ -1455,7 +1455,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree /* Make avp Name & type */ strcpy(avpTypeString, val_to_str(diameter_avp_get_type(avph.avp_code,vendorId), - TypeValues, + TypeValues, "Unknown-Type: 0x%08x")); strcpy(avpNameString, diameter_avp_get_name(avph.avp_code, vendorId)); @@ -1472,7 +1472,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree proto_tree_add_uint_format(avpi_tree, hf_diameter_avp_code, tvb, offset, 4, avph.avp_code, "AVP Code: %s", avpNameString); offset += 4; - + tf = proto_tree_add_uint_format(avpi_tree, hf_diameter_avp_flags, tvb, offset , 1, flags, "Flags: 0x%02x (%s)", flags, flagstr); @@ -1521,7 +1521,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree grouptf = proto_tree_add_text(avpi_tree, tvb, offset, tvb_length(tvb), buffer); - + group_tree = proto_item_add_subtree(grouptf, ett_diameter_avp); @@ -1634,7 +1634,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree data.nsecs = 0; ltp = localtime(&data.secs); - strftime(buffer, 64, + strftime(buffer, 64, "%a, %d %b %Y %H:%M:%S %z", ltp); proto_tree_add_time_format(avpi_tree, hf_diameter_avp_data_time, @@ -1651,7 +1651,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree case DIAMETER_ENUMERATED: if (avpDataLength == 4) { guint32 data; - + data = tvb_get_ntohl(tvb, offset); valstr = diameter_avp_get_value(avph.avp_code, vendorId, data); proto_tree_add_uint_format(avpi_tree, hf_diameter_avp_data_uint32, @@ -1668,7 +1668,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree case DIAMETER_VENDOR_ID: if (avpDataLength == 4) { guint32 data; - + data = tvb_get_ntohl(tvb, offset); valstr = diameter_vendor_to_str(data, TRUE); proto_tree_add_uint_format(avpi_tree, hf_diameter_avp_data_uint32, @@ -1685,7 +1685,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree case DIAMETER_APPLICATION_ID: if (avpDataLength == 4) { guint32 data; - + data = tvb_get_ntohl(tvb, offset); valstr = diameter_app_to_str(data); proto_tree_add_uint_format(avpi_tree, hf_diameter_avp_data_uint32, @@ -1710,7 +1710,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree tvb_get_ptr(tvb, offset, avpDataLength), "Hex Data Highlighted Below"); break; - + } /* switch type */ } /* avpi_tree != null */ offset += (avpLength - hdrLength); @@ -1763,7 +1763,7 @@ proto_register_diameter(void) { &hf_diameter_length, { "Length","diameter.length", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL }}, - + { &hf_diameter_flags, { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, @@ -1802,9 +1802,9 @@ proto_register_diameter(void) { "Hop-by-Hop Identifier", "diameter.hopbyhopid", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_diameter_endtoendid, - { "End-to-End Identifier", "diameter.endtoendid", FT_UINT32, + { "End-to-End Identifier", "diameter.endtoendid", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, - + { &hf_diameter_avp_code, { "AVP Code","diameter.avp.code", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, diff --git a/packet-dlsw.c b/packet-dlsw.c index 4a3e3677f9..b4c5e700ef 100644 --- a/packet-dlsw.c +++ b/packet-dlsw.c @@ -2,22 +2,22 @@ * Routines for DLSw packet dissection (Data Link Switching) * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-dlsw.c,v 1.6 2002/08/02 23:35:48 jmayer Exp $ + * $Id: packet-dlsw.c,v 1.7 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,7 +42,7 @@ static gint ett_dlsw_header = -1; static gint ett_dlsw_data = -1; static gint ett_dlsw_vector = -1; -#define CANUREACH 0x03 +#define CANUREACH 0x03 #define ICANREACH 0x04 #define REACH_ACK 0x05 #define DGRMFRAME 0x06 @@ -163,7 +163,7 @@ static const value_string dlsw_pri_vals[] = { static const value_string dlsw_gds_vals[] = { { DLSW_GDSID_SEND , "Request Capabilities GDS" }, { DLSW_GDSID_ACK , "Response Capabilities GDS" }, - { DLSW_GDSID_REF , "Refuse Capabilities GDS" }, + { DLSW_GDSID_REF , "Refuse Capabilities GDS" }, { 0 , NULL } }; @@ -186,7 +186,7 @@ static const value_string dlsw_refuse_vals[] = { }; #define UDP_PORT_DLSW 2067 -#define TCP_PORT_DLSW 2065 +#define TCP_PORT_DLSW 2065 #define DLSW_INFO_HEADER 16 #define DLSW_CMD_HEADER 72 @@ -208,16 +208,16 @@ dissect_dlsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "DLSw %s",val_to_str(version , dlsw_version_vals, "Unknown Version")); - if (tree) + if (tree) { ti = proto_tree_add_item(tree, proto_dlsw, tvb, 0, -1, FALSE); dlsw_tree = proto_item_add_subtree(ti, ett_dlsw); - + hlen=tvb_get_guint8(tvb,1); ti2 = proto_tree_add_text (dlsw_tree, tvb, 0, hlen,"DLSw header, %s", val_to_str(version , dlsw_version_vals, "Unknown Version")); - + dlsw_header_tree = proto_item_add_subtree(ti2, ett_dlsw_header); proto_tree_add_text (dlsw_header_tree,tvb,0 ,1,"Version = %s", val_to_str(version , dlsw_version_vals, "Unknown Version, dissection may be innacurate")); @@ -228,17 +228,17 @@ dissect_dlsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text (dlsw_header_tree,tvb,8 ,4,"Remote DLC PID = %u",tvb_get_ntohl(tvb,8)) ; proto_tree_add_text (dlsw_header_tree,tvb,12,2,"Reserved") ; } ; - + mtype=tvb_get_guint8(tvb,14); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",val_to_str(mtype , dlsw_type_vals, "Unknown message Type")); if (tree) - { + { proto_tree_add_text (dlsw_header_tree,tvb,14,1,"Message Type = %s (%d)", val_to_str(mtype , dlsw_type_vals, "Unknown Type"),mtype); proto_tree_add_text (dlsw_header_tree, tvb, 15,1,"Flow ctrl byte = %d",tvb_get_guint8(tvb,15)); - if (hlen != DLSW_INFO_HEADER) + if (hlen != DLSW_INFO_HEADER) { proto_tree_add_text (dlsw_header_tree,tvb, 16,1,"Protocol ID = %d",tvb_get_guint8(tvb,16)) ; proto_tree_add_text (dlsw_header_tree,tvb, 17,1,"Header Number = %d",tvb_get_guint8(tvb,17)) ; @@ -253,7 +253,7 @@ dissect_dlsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text (dlsw_header_tree,tvb, 24 ,14,"Not used for CapEx") ; proto_tree_add_text (dlsw_header_tree,tvb, 38,1,"Frame direction = %s", - tvb_get_guint8(tvb,38)==1?"Capabilities request":"Capabilities response") ; + tvb_get_guint8(tvb,38)==1?"Capabilities request":"Capabilities response") ; proto_tree_add_text (dlsw_header_tree,tvb, 39,33,"Not used for CapEx") ; } else @@ -282,7 +282,7 @@ dissect_dlsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti2 = proto_tree_add_text (dlsw_tree, tvb, hlen, mlen,"DLSw data"); dlsw_data_tree = proto_item_add_subtree(ti2, ett_dlsw_data); - switch (mtype) + switch (mtype) { case CAP_EXCHANGE: dissect_dlsw_capex(tvb_new_subset(tvb, hlen, mlen, -1), dlsw_data_tree,ti2); @@ -347,7 +347,7 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2) case 0x82: proto_tree_add_text (dlsw_vector_tree,tvb,offset+2,vlen-2, "DLSw Version = %d.%d",tvb_get_guint8(tvb,offset+2),tvb_get_guint8(tvb,offset+3)); - break; + break; case 0x83: proto_tree_add_text (dlsw_vector_tree,tvb,offset+2,vlen-2, "Initial Pacing Window = %d",tvb_get_ntohs(tvb,offset+2)); @@ -406,7 +406,7 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2) default: proto_tree_add_text (tree,tvb,4,mlen - 4,"Unknown data"); } - + } void @@ -422,7 +422,7 @@ proto_register_dlsw(void) /* proto_register_field_array(proto_dlsw, hf, array_length(hf)); */ proto_register_subtree_array(ett, array_length(ett)); } - + void proto_reg_handoff_dlsw(void) { diff --git a/packet-dns.c b/packet-dns.c index 183732fe03..3b7c113daa 100644 --- a/packet-dns.c +++ b/packet-dns.c @@ -1,22 +1,22 @@ /* packet-dns.c * Routines for DNS packet disassembly * - * $Id: packet-dns.c,v 1.91 2002/08/19 16:02:45 itojun Exp $ + * $Id: packet-dns.c,v 1.92 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -261,9 +261,9 @@ static const value_string tsigerror_vals[] = { which one should look at http://www.windows.com/windows2000/en/server/help/sag_DNS_imp_UsingWinsLookup.htm - + and - + http://www.microsoft.com/windows2000/library/resources/reskit/samplechapters/cncf/cncf_imp_wwaw.asp which discuss them to some extent. */ @@ -314,12 +314,12 @@ dns_type_name (guint type) NULL, "OPT" /* RFC 2671 */ }; - + if (type < sizeof(type_names)/sizeof(type_names[0])) return type_names[type] ? type_names[type] : "unknown"; - + /* special cases */ - switch (type) + switch (type) { /* non standard */ case 100: @@ -365,7 +365,7 @@ dns_long_type_name (guint type) char *type_names[] = { "unused", "Host address", - "Authoritative name server", + "Authoritative name server", "Mail destination", "Mail forwarder", "Canonical name for an alias", @@ -407,12 +407,12 @@ dns_long_type_name (guint type) "EDNS0 option" /* RFC 2671 */ }; static char unkbuf[7+1+2+1+4+1+1+10+1+1]; /* "Unknown RR type (%d)" */ - + if (type < sizeof(type_names)/sizeof(type_names[0])) return type_names[type] ? type_names[type] : "unknown"; - + /* special cases */ - switch (type) + switch (type) { /* non standard */ case 100: @@ -446,7 +446,7 @@ dns_long_type_name (guint type) case 255: return "Request for all records"; } - + sprintf(unkbuf, "Unknown RR type (%d)", type); return unkbuf; } @@ -456,7 +456,7 @@ char * dns_class_name(int class) { char *class_name; - + switch (class) { case C_IN: class_name = "inet"; @@ -543,7 +543,7 @@ get_dns_name(tvbuff_t *tvb, int offset, int dns_data_offset, bit_count = tvb_get_guint8(tvb, offset); offset++; label_len = (bit_count - 1) / 8 + 1; - + if (maxname > 0) { print_len = snprintf(np, maxname + 1, "\\[x"); if (print_len != -1) { @@ -631,7 +631,7 @@ get_dns_name(tvbuff_t *tvb, int offset, int dns_data_offset, break; /* now continue processing from there */ } } - + *np = '\0'; /* If "len" is negative, we haven't seen a pointer, and thus haven't set the length, so set it. */ @@ -659,7 +659,7 @@ get_dns_name_type_class(tvbuff_t *tvb, int offset, int dns_data_offset, name_len = get_dns_name(tvb, offset, dns_data_offset, name, sizeof(name)); offset += name_len; - + type = tvb_get_ntohs(tvb, offset); offset += 2; @@ -750,7 +750,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset, if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s %s", type_name, name); if (dns_tree != NULL) { - tq = proto_tree_add_text(dns_tree, tvb, offset, len, "%s: type %s, class %s", + tq = proto_tree_add_text(dns_tree, tvb, offset, len, "%s: type %s, class %s", name, type_name, class_name); q_tree = proto_item_add_subtree(tq, ett_dns_qd); @@ -763,7 +763,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset, proto_tree_add_text(q_tree, tvb, offset, 2, "Class: %s", class_name); offset += 2; } - + return data_offset - data_start; } @@ -825,7 +825,7 @@ add_opt_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, #define DNS_ALGO_ECC 4 /* Elliptic curve crypto */ #define DNS_ALGO_INDIRECT 252 /* Indirect key */ #define DNS_ALGO_PRIVATEDNS 253 /* Private, domain name */ -#define DNS_ALGO_PRIVATEOID 254 /* Private, OID */ +#define DNS_ALGO_PRIVATEOID 254 /* Private, OID */ static const value_string algo_vals[] = { { DNS_ALGO_RSAMD5, "RSA/MD5" }, @@ -935,7 +935,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, { char ns_name[MAXDNAME]; int ns_name_len; - + ns_name_len = get_dns_name(tvb, cur_offset, dns_data_offset, ns_name, sizeof(ns_name)); if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s", ns_name); @@ -951,7 +951,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, { char cname[MAXDNAME]; int cname_len; - + cname_len = get_dns_name(tvb, cur_offset, dns_data_offset, cname, sizeof(cname)); if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s", cname); @@ -983,7 +983,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, proto_tree_add_text(rr_tree, tvb, cur_offset, mname_len, "Primary name server: %s", mname); cur_offset += mname_len; - + rname_len = get_dns_name(tvb, cur_offset, dns_data_offset, rname, sizeof(rname)); proto_tree_add_text(rr_tree, tvb, cur_offset, rname_len, "Responsible authority's mailbox: %s", rname); @@ -1020,7 +1020,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, { char pname[MAXDNAME]; int pname_len; - + pname_len = get_dns_name(tvb, cur_offset, dns_data_offset, pname, sizeof(pname)); if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s", pname); @@ -1044,7 +1044,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, int i; char bitnames[128+1]; char portnumstring[10+1]; - + wks_addr = tvb_get_ptr(tvb, cur_offset, 4); if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s", ip_to_str(wks_addr)); @@ -1136,7 +1136,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, guint16 preference = 0; char mx_name[MAXDNAME]; int mx_name_len; - + preference = tvb_get_ntohs(tvb, cur_offset); mx_name_len = get_dns_name(tvb, cur_offset + 2, dns_data_offset, mx_name, sizeof(mx_name)); if (cinfo != NULL) @@ -1344,36 +1344,36 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, } if (pre_len > 0) { - pname_len = get_dns_name(tvb, cur_offset, dns_data_offset, + pname_len = get_dns_name(tvb, cur_offset, dns_data_offset, pname, sizeof(pname)); } else { - strcpy(pname, ""); + strcpy(pname, ""); pname_len = 0; } if (cinfo != NULL) { - col_append_fstr(cinfo, COL_INFO, " %d %s %s", - pre_len, - ip6_to_str((struct e_in6_addr *)&suffix), + col_append_fstr(cinfo, COL_INFO, " %d %s %s", + pre_len, + ip6_to_str((struct e_in6_addr *)&suffix), pname); } if (dns_tree != NULL) { - proto_tree_add_text(rr_tree, tvb, a6_offset, 1, + proto_tree_add_text(rr_tree, tvb, a6_offset, 1, "Prefix len: %u", pre_len); a6_offset++; if (suf_len) { proto_tree_add_text(rr_tree, tvb, a6_offset, suf_octet_count, - "Address suffix: %s", + "Address suffix: %s", ip6_to_str((struct e_in6_addr *)&suffix)); a6_offset += suf_octet_count; } if (pre_len > 0) { - proto_tree_add_text(rr_tree, tvb, a6_offset, pname_len, + proto_tree_add_text(rr_tree, tvb, a6_offset, pname_len, "Prefix name: %s", pname); } proto_item_append_text(trr, ", addr %d %s %s", - pre_len, - ip6_to_str((struct e_in6_addr *)&suffix), + pre_len, + ip6_to_str((struct e_in6_addr *)&suffix), pname); } } @@ -1383,14 +1383,14 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, { char dname[MAXDNAME]; int dname_len; - - dname_len = get_dns_name(tvb, cur_offset, dns_data_offset, + + dname_len = get_dns_name(tvb, cur_offset, dns_data_offset, dname, sizeof(dname)); if (cinfo != NULL) col_append_fstr(cinfo, COL_INFO, " %s", dname); if (dns_tree != NULL) { proto_item_append_text(trr, ", dname %s", dname); - proto_tree_add_text(rr_tree, tvb, cur_offset, + proto_tree_add_text(rr_tree, tvb, cur_offset, dname_len, "Target name: %s", dname); } } @@ -1435,7 +1435,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, break; } break; - + case T_NXT: { int rr_len = data_len; @@ -1483,7 +1483,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, guint16 preference = 0; char kx_name[MAXDNAME]; int kx_name_len; - + preference = tvb_get_ntohs(tvb, cur_offset); kx_name_len = get_dns_name(tvb, cur_offset + 2, dns_data_offset, kx_name, sizeof(kx_name)); if (cinfo != NULL) @@ -1773,7 +1773,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, guint16 port = 0; char target[MAXDNAME]; int target_len; - + priority = tvb_get_ntohs(tvb, cur_offset); weight = tvb_get_ntohs(tvb, cur_offset+2); port = tvb_get_ntohs(tvb, cur_offset+4); @@ -1801,9 +1801,9 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data"); break; } - + data_offset += data_len; - + return data_offset - data_start; } @@ -1814,7 +1814,7 @@ dissect_query_records(tvbuff_t *tvb, int cur_off, int dns_data_offset, int start_off, add_off; proto_tree *qatree = NULL; proto_item *ti = NULL; - + start_off = cur_off; if (dns_tree) { char *s = (isupdate ? "Zone" : "Queries"); @@ -1838,7 +1838,7 @@ dissect_answer_records(tvbuff_t *tvb, int cur_off, int dns_data_offset, int start_off, add_off; proto_tree *qatree = NULL; proto_item *ti = NULL; - + start_off = cur_off; if (dns_tree) { ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, name); @@ -1908,7 +1908,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { ti = proto_tree_add_protocol_format(tree, proto_dns, tvb, 0, -1, "Domain Name System (%s)", (flags & F_RESPONSE) ? "response" : "query"); - + dns_tree = proto_item_add_subtree(ti, ett_dns); if (is_tcp) { @@ -1916,7 +1916,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(dns_tree, hf_dns_length, tvb, offset - 2, 2, FALSE); } - proto_tree_add_uint(dns_tree, hf_dns_transaction_id, tvb, + proto_tree_add_uint(dns_tree, hf_dns_transaction_id, tvb, offset + DNS_ID, 2, id); strcpy(buf, val_to_str(opcode, opcode_vals, "Unknown operation")); @@ -1926,8 +1926,8 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, strcat(buf, val_to_str(flags & F_RCODE, rcode_vals, "Unknown error")); } - tf = proto_tree_add_uint_format(dns_tree, hf_dns_flags, tvb, - offset + DNS_FLAGS, 2, + tf = proto_tree_add_uint_format(dns_tree, hf_dns_flags, tvb, + offset + DNS_FLAGS, 2, flags, "Flags: 0x%04x (%s)", flags, buf); @@ -1958,22 +1958,22 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } quest = tvb_get_ntohs(tvb, offset + DNS_QUEST); if (tree) { - proto_tree_add_uint(dns_tree, hf_dns_count_questions, tvb, + proto_tree_add_uint(dns_tree, hf_dns_count_questions, tvb, offset + DNS_QUEST, 2, quest); } ans = tvb_get_ntohs(tvb, offset + DNS_ANS); if (tree) { - proto_tree_add_uint(dns_tree, hf_dns_count_answers, tvb, + proto_tree_add_uint(dns_tree, hf_dns_count_answers, tvb, offset + DNS_ANS, 2, ans); } auth = tvb_get_ntohs(tvb, offset + DNS_AUTH); if (tree) { - proto_tree_add_uint(dns_tree, hf_dns_count_auth_rr, tvb, + proto_tree_add_uint(dns_tree, hf_dns_count_auth_rr, tvb, offset + DNS_AUTH, 2, auth); } add = tvb_get_ntohs(tvb, offset + DNS_ADD); if (tree) { - proto_tree_add_uint(dns_tree, hf_dns_count_add_rr, tvb, + proto_tree_add_uint(dns_tree, hf_dns_count_add_rr, tvb, offset + DNS_ADD, 2, add); } @@ -1986,7 +1986,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, (!(flags & F_RESPONSE) ? cinfo : NULL), dns_tree, isupdate); } - + if (ans > 0) { /* If this is a request, don't add information about the answers to the summary, just add information about the queries. */ @@ -1995,7 +1995,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dns_tree, (isupdate ? "Prerequisites" : "Answers")); } - + /* Don't add information about the authoritative name servers, or the additional records, to the summary. */ if (auth > 0) { @@ -2095,23 +2095,23 @@ proto_register_dns(void) FT_UINT16, BASE_DEC, VALS(rcode_vals), F_RCODE, "Reply code", HFILL }}, { &hf_dns_transaction_id, - { "Transaction ID", "dns.id", + { "Transaction ID", "dns.id", FT_UINT16, BASE_HEX, NULL, 0x0, "Identification of transaction", HFILL }}, { &hf_dns_count_questions, - { "Questions", "dns.count.queries", + { "Questions", "dns.count.queries", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of queries in packet", HFILL }}, { &hf_dns_count_answers, - { "Answer RRs", "dns.count.answers", + { "Answer RRs", "dns.count.answers", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of answers in packet", HFILL }}, { &hf_dns_count_auth_rr, - { "Authority RRs", "dns.count.auth_rr", + { "Authority RRs", "dns.count.auth_rr", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of authoritative records in packet", HFILL }}, { &hf_dns_count_add_rr, - { "Additional RRs", "dns.count.add_rr", + { "Additional RRs", "dns.count.add_rr", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of additional records in packet", HFILL }} }; diff --git a/packet-dns.h b/packet-dns.h index e62555a72c..86831e2150 100644 --- a/packet-dns.h +++ b/packet-dns.h @@ -2,22 +2,22 @@ * Definitions for packet disassembly structures and routines used both by * DNS and NBNS. * - * $Id: packet-dns.h,v 1.12 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-dns.h,v 1.13 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-dsi.c b/packet-dsi.c index 2f2be1e304..587e852e3d 100644 --- a/packet-dsi.c +++ b/packet-dsi.c @@ -2,7 +2,7 @@ * Routines for dsi packet dissection * Copyright 2001, Randy McEoin <rmceoin@pe.com> * - * $Id: packet-dsi.c,v 1.23 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-dsi.c,v 1.24 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -186,7 +186,7 @@ static const value_string func_vals[] = { {DSIFUNC_ATTN, "Attention" }, {0, NULL } }; -static gint +static gint dissect_dsi_open_session(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) { proto_tree *tree; @@ -208,17 +208,17 @@ dissect_dsi_open_session(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) else { proto_tree_add_item(tree, hf_dsi_open_option, tvb, offset, len, FALSE); } - offset += len; + offset += len; return offset; } -static gint +static gint dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) { proto_tree *tree; proto_item *ti; guint16 flag; - + if (!tvb_reported_length_remaining(tvb,offset)) return offset; @@ -233,7 +233,7 @@ dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) proto_tree_add_item(tree, hf_dsi_attn_flag_msg, tvb, offset, 2, FALSE); proto_tree_add_item(tree, hf_dsi_attn_flag_reconnect, tvb, offset, 2, FALSE); /* FIXME */ - if ((flag & 0xf000) != 0x3000) + if ((flag & 0xf000) != 0x3000) proto_tree_add_item(tree, hf_dsi_attn_flag_time, tvb, offset, 2, FALSE); else proto_tree_add_item(tree, hf_dsi_attn_flag_bitmap, tvb, offset, 2, FALSE); @@ -241,10 +241,10 @@ dissect_dsi_attention(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset) return offset; } -/* ----------------------------- +/* ----------------------------- from netatalk/etc/afpd/status.c */ -static gint +static gint dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) { proto_tree *sub_tree; @@ -258,10 +258,10 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) guint8 nbe; guint8 len; guint8 i; - + if (!tree) return offset; - + ti = proto_tree_add_text(tree, tvb, offset, -1, "Get Status"); tree = proto_item_add_subtree(ti, ett_dsi_status); @@ -317,7 +317,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) dir_ofs += offset; } } - + ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); if (ofs) proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, FALSE); @@ -334,7 +334,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ofs += len; } } - + ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); if (ofs) { nbe = tvb_get_guint8(tvb, ofs); @@ -363,7 +363,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) guint16 net; guint8 node; guint16 port; - + ofs = adr_ofs; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "Address list: %d", nbe); @@ -371,7 +371,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) adr_tree = proto_item_add_subtree(ti, ett_dsi_addr); for (i = 0; i < nbe; i++) { guint8 type; - + len = tvb_get_guint8(tvb, ofs); type = tvb_get_guint8(tvb, ofs +1); switch (type) { @@ -386,9 +386,9 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) break; case 3: /* DDP, atalk_addr_to_str want host order not network */ net = tvb_get_ntohs(tvb, ofs+2); - node = tvb_get_guint8(tvb, ofs +4); + node = tvb_get_guint8(tvb, ofs +4); port = tvb_get_guint8(tvb, ofs +5); - ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u", + ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "ddp %u.%u:%u", net, node, port); break; case 4: /* DNS */ @@ -399,23 +399,23 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "dns %s", tmp); g_free(tmp); break; - } + } /* else fall to default malformed record */ default: ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknow type : %d", type); break; - } + } len -= 2; sub_tree = proto_item_add_subtree(ti,ett_dsi_addr_line); proto_tree_add_item(sub_tree, hf_dsi_server_addr_len, tvb, ofs, 1, FALSE); ofs++; - proto_tree_add_item(sub_tree, hf_dsi_server_addr_type, tvb, ofs, 1, FALSE); + proto_tree_add_item(sub_tree, hf_dsi_server_addr_type, tvb, ofs, 1, FALSE); ofs++; proto_tree_add_item(sub_tree, hf_dsi_server_addr_value,tvb, ofs, len, FALSE); ofs += len; } } - + if (dir_ofs) { ofs = dir_ofs; nbe = tvb_get_guint8(tvb, ofs); @@ -443,7 +443,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 dsi_length; guint32 dsi_reserved; struct aspinfo aspinfo; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSI"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -494,7 +494,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(dsi_tree, hf_dsi_reserved, tvb, 12, 4, dsi_reserved); } - else + else dsi_tree = tree; switch (dsi_command) { case DSIFUNC_OPEN: @@ -511,7 +511,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree && (dsi_flags == DSIFL_REPLY)) { dissect_dsi_reply_get_status(tvb, dsi_tree, DSI_BLOCKSIZ); } - break; + break; case DSIFUNC_CMD: case DSIFUNC_WRITE: { @@ -530,7 +530,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; default: - if (tree) { + if (tree) { call_dissector(data_handle, tvb_new_subset(tvb, DSI_BLOCKSIZ, -1, -1), pinfo, dsi_tree); diff --git a/packet-dvmrp.c b/packet-dvmrp.c index 1cd3c351d4..7158d4f7d4 100644 --- a/packet-dvmrp.c +++ b/packet-dvmrp.c @@ -1,22 +1,22 @@ /* packet-dvmrp.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for IGMP/DVMRP packet disassembly * - * $Id: packet-dvmrp.c,v 1.12 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-dvmrp.c,v 1.13 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -43,7 +43,7 @@ RFC1075 Version 1 draft-ietf-idmr-dvmrp-v3-10.txt Version 3 - V1 and V3 can be distinguished by looking at bytes 6 and 7 in the + V1 and V3 can be distinguished by looking at bytes 6 and 7 in the IGMP/DVMRP header. If header[6]==0xff and header[7]==0x03 we have version 3. @@ -118,7 +118,7 @@ static const value_string code_v1[] = { {DVMRP_V1_RESPONSE, "Response" }, {DVMRP_V1_REQUEST, "Request" }, {DVMRP_V1_NON_MEMBERSHIP_REPORT, "Non-membership report" }, - {DVMRP_V1_NON_MEMBERSHIP_CANCELLATION, "Non-membership cancellation" }, + {DVMRP_V1_NON_MEMBERSHIP_CANCELLATION, "Non-membership cancellation" }, {0, NULL} }; @@ -150,7 +150,7 @@ static const value_string code_v3[] = { #define DVMRP_V3_CAP_MTRACE 0x08 #define DVMRP_V3_CAP_SNMP 0x10 #define DVMRP_V3_CAP_NETMASK 0x20 - + #define V1_COMMAND_NULL 0 #define V1_COMMAND_AFI 2 @@ -230,7 +230,7 @@ dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset) proto_item *item; int old_offset = offset; - item = proto_tree_add_item(parent_tree, hf_route, + item = proto_tree_add_item(parent_tree, hf_route, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_route); @@ -282,12 +282,12 @@ dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset) ip = (ip<<8)|s2; ip = (ip<<8)|s1; ip = (ip<<8)|s0; - proto_tree_add_ipv4_format(tree, hf_saddr, tvb, + proto_tree_add_ipv4_format(tree, hf_saddr, tvb, old_offset, offset-old_offset, ip, "%s %d.%d.%d.%d (netmask %d.%d.%d.%d)", m0?"Source Network":"Default Route", s0,s1,s2,s3,m0,m1,m2,m3); - + metric = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tree, hf_metric, tvb, offset, 1, metric&0x7f); @@ -320,7 +320,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, - "V%d %s",3 ,val_to_str(code, code_v3, + "V%d %s",3 ,val_to_str(code, code_v3, "Unknown Type:0x%02x")); } @@ -337,7 +337,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int proto_tree *tree; proto_item *item; - item = proto_tree_add_item(parent_tree, hf_capabilities, + item = proto_tree_add_item(parent_tree, hf_capabilities, tvb, offset, 1, FALSE); tree = proto_item_add_subtree(item, ett_capabilities); @@ -362,11 +362,11 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int switch (code) { case DVMRP_V3_PROBE: /* generation id */ - proto_tree_add_item(parent_tree, hf_genid, tvb, + proto_tree_add_item(parent_tree, hf_genid, tvb, offset, 4, FALSE); offset += 4; while (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(parent_tree, hf_neighbor, + proto_tree_add_item(parent_tree, hf_neighbor, tvb, offset, 4, FALSE); offset += 4; } @@ -376,15 +376,15 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int break; case DVMRP_V3_PRUNE: /* source address */ - proto_tree_add_item(parent_tree, hf_saddr, + proto_tree_add_item(parent_tree, hf_saddr, tvb, offset, 4, FALSE); offset += 4; /* group address */ - proto_tree_add_item(parent_tree, hf_maddr, + proto_tree_add_item(parent_tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; /* prune lifetime */ - proto_tree_add_item(parent_tree, hf_life, + proto_tree_add_item(parent_tree, hf_life, tvb, offset, 4, FALSE); offset += 4; /* source netmask */ @@ -396,32 +396,32 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int break; case DVMRP_V3_GRAFT: /* source address */ - proto_tree_add_item(parent_tree, hf_saddr, + proto_tree_add_item(parent_tree, hf_saddr, tvb, offset, 4, FALSE); offset += 4; /* group address */ - proto_tree_add_item(parent_tree, hf_maddr, + proto_tree_add_item(parent_tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { - proto_tree_add_item(parent_tree, hf_netmask, + proto_tree_add_item(parent_tree, hf_netmask, tvb, offset, 4, FALSE); offset += 4; } break; case DVMRP_V3_GRAFT_ACK: /* source address */ - proto_tree_add_item(parent_tree, hf_saddr, + proto_tree_add_item(parent_tree, hf_saddr, tvb, offset, 4, FALSE); offset += 4; /* group address */ - proto_tree_add_item(parent_tree, hf_maddr, + proto_tree_add_item(parent_tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { - proto_tree_add_item(parent_tree, hf_netmask, + proto_tree_add_item(parent_tree, hf_netmask, tvb, offset, 4, FALSE); offset += 4; } @@ -440,7 +440,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int return offset; } - + static int dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) @@ -461,7 +461,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, - "V%d %s",1 ,val_to_str(code, code_v1, + "V%d %s",1 ,val_to_str(code, code_v1, "Unknown Type:0x%02x")); } @@ -476,7 +476,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int guint8 cmd,count; int old_offset = offset; - item = proto_tree_add_item(parent_tree, hf_commands, + item = proto_tree_add_item(parent_tree, hf_commands, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_commands); @@ -503,18 +503,18 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int val_to_str(af, afi, "Unknown Family:0x%02x") ); } - break; + break; case V1_COMMAND_SUBNETMASK: count = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tree, hf_count, tvb, offset, 1, count); offset += 1; if (count) { /* must be 0 or 1 */ - proto_tree_add_item(tree, hf_netmask, + proto_tree_add_item(tree, hf_netmask, tvb, offset, 4, FALSE); if (item) { proto_item_set_text(item, "%s: %d.%d.%d.%d", - val_to_str(cmd, command, "Unknown Command:0x%02x"), + val_to_str(cmd, command, "Unknown Command:0x%02x"), tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset+1), tvb_get_guint8(tvb, offset+2), @@ -527,17 +527,17 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int val_to_str(cmd, command, "Unknown Command:0x%02x")); } } - break; + break; case V1_COMMAND_METRIC: proto_tree_add_item(tree, hf_metric, tvb, offset, 1, FALSE); if (item) { proto_item_set_text(item, "%s: %d", - val_to_str(cmd, command, "Unknown Command:0x%02x"), + val_to_str(cmd, command, "Unknown Command:0x%02x"), tvb_get_guint8(tvb, offset)); } offset += 1; - break; + break; case V1_COMMAND_FLAGS0: count = tvb_get_guint8(tvb, offset); proto_tree_add_boolean(tree, hf_dest_unr, tvb, offset, 1, count); @@ -556,7 +556,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int val_to_str(cmd, command, "Unknown Command:0x%02x"), tvb_get_guint8(tvb, offset)); } offset += 1; - break; + break; case V1_COMMAND_DA: case V1_COMMAND_RDA: /* same as DA */ count = tvb_get_guint8(tvb, offset); @@ -564,7 +564,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset, 1, count); offset += 1; while (count--) { - proto_tree_add_item(tree, hf_daddr, + proto_tree_add_item(tree, hf_daddr, tvb, offset, 4, FALSE); offset += 4; } @@ -572,14 +572,14 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int proto_item_set_text(item, "%s", val_to_str(cmd, command, "Unknown Command:0x%02x")); } - break; + break; case V1_COMMAND_NMR: count = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tree, hf_count, tvb, offset, 1, count); offset += 1; while (count--) { - proto_tree_add_item(tree, hf_maddr, + proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; proto_tree_add_item(tree, hf_hold, tvb, @@ -590,14 +590,14 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int proto_item_set_text(item, "%s", val_to_str(cmd, command, "Unknown Command:0x%02x")); } - break; + break; case V1_COMMAND_NMR_CANCEL: count = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tree, hf_count, tvb, offset, 1, count); offset += 1; while (count--) { - proto_tree_add_item(tree, hf_maddr, + proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; } @@ -605,7 +605,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int proto_item_set_text(item, "%s", val_to_str(cmd, command, "Unknown Command:0x%02x")); } - break; + break; } proto_item_set_len(item, offset-old_offset); @@ -648,7 +648,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of return offset; } - + offset = dissect_dvmrp_v1(tvb, pinfo, tree, offset); proto_item_set_len(item, offset); return offset; diff --git a/packet-dvmrp.h b/packet-dvmrp.h index f4ea79cfd8..d524dc3c5d 100644 --- a/packet-dvmrp.h +++ b/packet-dvmrp.h @@ -1,22 +1,22 @@ /* packet-dvmrp.h 2001 Ronnie Sahlberg <See AUTHORS for email> * Declarations of routines for IGMP/DVMRP packet disassembly * - * $Id: packet-dvmrp.h,v 1.2 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-dvmrp.h,v 1.3 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-eap.c b/packet-eap.c index 21944279f0..c25d363cd1 100644 --- a/packet-eap.c +++ b/packet-eap.c @@ -2,22 +2,22 @@ * Routines for EAP Extensible Authentication Protocol dissection * RFC 2284 * - * $Id: packet-eap.c,v 1.27 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-eap.c,v 1.28 2002/08/28 21:00:12 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,7 +49,7 @@ static dissector_handle_t ssl_handle; #define EAP_SUCCESS 3 #define EAP_FAILURE 4 -static const value_string eap_code_vals[] = { +static const value_string eap_code_vals[] = { { EAP_REQUEST, "Request" }, { EAP_RESPONSE, "Response" }, { EAP_SUCCESS, "Success" }, @@ -59,7 +59,7 @@ static const value_string eap_code_vals[] = { /* References: - 1) http://www.iana.org/assignments/ppp-numbers + 1) http://www.iana.org/assignments/ppp-numbers PPP EAP REQUEST/RESPONSE TYPES 2) http://www.ietf.org/internet-drafts/draft-ietf-pppext-rfc2284bis-02.txt 3) RFC2284 @@ -71,7 +71,7 @@ References: #define EAP_TYPE_TLS 13 #define EAP_TYPE_LEAP 17 -static const value_string eap_type_vals[] = { +static const value_string eap_type_vals[] = { {EAP_TYPE_ID, "Identity [RFC2284]" }, {EAP_TYPE_NOTIFY,"Notification [RFC2284]" }, {EAP_TYPE_NAK, "Nak (Response only) [RFC2284]" }, @@ -88,14 +88,14 @@ static const value_string eap_type_vals[] = { { 14, "Defender Token (AXENT) [Rosselli]" }, { 15, "Windows 2000 EAP [Asnes]" }, { 16, "Arcot Systems EAP [Jerdonek]" }, - {EAP_TYPE_LEAP,"EAP-Cisco Wireless (LEAP) [Norman]" }, - { 18, "Nokia IP smart card authentication [Haverinen]" }, + {EAP_TYPE_LEAP,"EAP-Cisco Wireless (LEAP) [Norman]" }, + { 18, "Nokia IP smart card authentication [Haverinen]" }, { 19, "SRP-SHA1 Part 1 [Carlson]" }, { 20, "SRP-SHA1 Part 2 [Carlson]" }, { 21, "EAP-TTLS [Funk]" }, { 22, "Remote Access Service [Fields]" }, - { 23, "UMTS Authentication and Key Agreement [Haverinen]" }, - { 24, "EAP-3Com Wireless [Young]" }, + { 23, "UMTS Authentication and Key Agreement [Haverinen]" }, + { 24, "EAP-3Com Wireless [Young]" }, { 25, "PEAP [Palekar]" }, { 26, "MS-EAP-Authentication [Palekar]" }, { 27, "Mutual Authentication w/Key Exchange (MAKE)[Berrendonner]" }, @@ -155,7 +155,7 @@ typedef struct { } frame_state_t; /********************************************************************* - EAP-TLS + EAP-TLS RFC2716 **********************************************************************/ @@ -211,7 +211,7 @@ fragment_items eaptls_frag_items = { **********************************************************************/ static gboolean -test_flag(unsigned char flag, unsigned char mask) +test_flag(unsigned char flag, unsigned char mask) { return ( ( flag & mask ) != 0 ); } @@ -391,7 +391,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, **********************************************************************/ case EAP_TYPE_ID: if (tree) { - proto_tree_add_text(eap_tree, tvb, offset, size, + proto_tree_add_text(eap_tree, tvb, offset, size, "Identity (%d byte%s): %s", size, plurality(size, "", "s"), tvb_format_text(tvb, offset, size)); @@ -404,7 +404,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, **********************************************************************/ case EAP_TYPE_NOTIFY: if (tree) { - proto_tree_add_text(eap_tree, tvb, offset, size, + proto_tree_add_text(eap_tree, tvb, offset, size, "Notification (%d byte%s): %s", size, plurality(size, "", "s"), tvb_format_text(tvb, offset, size)); @@ -456,39 +456,39 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (size>0) { tvbuff_t *next_tvb; - gint tvb_len; + gint tvb_len; gboolean save_fragmented; tvb_len = tvb_length_remaining(tvb, offset); if (size < tvb_len) tvb_len = size; - - /* - EAP/TLS is weird protocol (it comes from - Microsoft after all). + + /* + EAP/TLS is weird protocol (it comes from + Microsoft after all). If we have series of fragmented packets, then there's no way of knowing that from the packet itself, if it is the last packet - in series, that is that the packet part of + in series, that is that the packet part of bigger fragmented set of data. The only way to know is, by knowing that we are already in defragmentation "mode" and we are expecing packet - carrying fragment of data. (either + carrying fragment of data. (either because we have not received expected amount of data, or because the packet before had "F"ragment flag set.) - The situation is alleviated by fact that it - is simple ack/nack protcol so there's no - place for out-of-order packets like it is - possible with IP. + The situation is alleviated by fact that it + is simple ack/nack protcol so there's no + place for out-of-order packets like it is + possible with IP. Anyway, point of this lengthy essay is that we have to keep state information in the - conversation, so that we can put ourselves in + conversation, so that we can put ourselves in defragmenting mode and wait for the last packet, and have to attach state to frames as well, so that we can handle defragmentation after the @@ -587,9 +587,9 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, eap_tls_seq = 0; } - /* - We test here to see whether EAP-TLS packet - carry fragmented of TLS data. + /* + We test here to see whether EAP-TLS packet + carry fragmented of TLS data. If this is the case, we do reasembly below, otherwise we just call dissector. @@ -603,10 +603,10 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; - fd_head = fragment_add_seq(tvb, offset, pinfo, + fd_head = fragment_add_seq(tvb, offset, pinfo, eap_reass_cookie, eaptls_fragment_table, - eap_tls_seq, + eap_tls_seq, size, more_fragments); @@ -633,7 +633,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } pinfo->fragmented = save_fragmented; - + } else { /* this data is NOT fragmented */ next_tvb = tvb_new_subset(tvb, offset, tvb_len, size); call_dissector(ssl_handle, next_tvb, pinfo, eap_tree); @@ -652,7 +652,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Version (byte) */ if (tree) { field = tvb_get_guint8(tvb, offset); - proto_tree_add_text(eap_tree, tvb, offset, 1, + proto_tree_add_text(eap_tree, tvb, offset, 1, "Version: %i",field); } size--; @@ -661,7 +661,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Unused (byte) */ if (tree) { field = tvb_get_guint8(tvb, offset); - proto_tree_add_text(eap_tree, tvb, offset, 1, + proto_tree_add_text(eap_tree, tvb, offset, 1, "Reserved: %i",field); } size--; @@ -670,7 +670,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Count (byte) */ count = tvb_get_guint8(tvb, offset); if (tree) { - proto_tree_add_text(eap_tree, tvb, offset, 1, + proto_tree_add_text(eap_tree, tvb, offset, 1, "Count: %i",count); } size--; @@ -687,7 +687,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * state in the conversation. */ leap_state = conversation_state->leap_state; - + /* Advance the state machine. */ if (leap_state==0) leap_state = 1; else if (leap_state==1) leap_state = 2; else @@ -712,26 +712,26 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Get the remembered state. */ leap_state = packet_state->info; - if (tree) { + if (tree) { if (leap_state==1) { - proto_tree_add_text(eap_tree, tvb, offset, count, + proto_tree_add_text(eap_tree, tvb, offset, count, "Peer Challenge [8] Random Value:\"%s\"", tvb_bytes_to_str(tvb, offset, count)); } else if (leap_state==2) { - proto_tree_add_text(eap_tree, tvb, offset, count, + proto_tree_add_text(eap_tree, tvb, offset, count, "Peer Response [24] NtChallengeResponse(%s)", tvb_bytes_to_str(tvb, offset, count)); } else if (leap_state==3) { - proto_tree_add_text(eap_tree, tvb, offset, count, + proto_tree_add_text(eap_tree, tvb, offset, count, "AP Challenge [8] Random Value:\"%s\"", tvb_bytes_to_str(tvb, offset, count)); } else if (leap_state==4) { - proto_tree_add_text(eap_tree, tvb, offset, count, + proto_tree_add_text(eap_tree, tvb, offset, count, "AP Response [24] ChallengeResponse(%s)", tvb_bytes_to_str(tvb, offset, count)); } else { - proto_tree_add_text(eap_tree, tvb, offset, count, + proto_tree_add_text(eap_tree, tvb, offset, count, "Data (%d byte%s): \"%s\"", count, plurality(count, "", "s"), tvb_bytes_to_str(tvb, offset, count)); @@ -746,7 +746,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Name (Length-(8+Count)) */ namesize = eap_len - (8+count); if (tree) { - proto_tree_add_text(eap_tree, tvb, offset, namesize, + proto_tree_add_text(eap_tree, tvb, offset, namesize, "Name (%d byte%s): %s", namesize, plurality(count, "", "s"), tvb_format_text(tvb, offset, namesize)); @@ -760,7 +760,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, **********************************************************************/ default: if (tree) { - proto_tree_add_text(eap_tree, tvb, offset, size, + proto_tree_add_text(eap_tree, tvb, offset, size, "Type-Data (%d byte%s) Value: %s", size, plurality(size, "", "s"), tvb_bytes_to_str(tvb, offset, size)); @@ -793,8 +793,8 @@ void proto_register_eap(void) { static hf_register_info hf[] = { - { &hf_eap_code, { - "Code", "eap.code", FT_UINT8, BASE_DEC, + { &hf_eap_code, { + "Code", "eap.code", FT_UINT8, BASE_DEC, VALS(eap_code_vals), 0x0, "", HFILL }}, { &hf_eap_identifier, { "Id", "eap.id", FT_UINT8, BASE_DEC, @@ -802,18 +802,18 @@ proto_register_eap(void) { &hf_eap_len, { "Length", "eap.len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, - { &hf_eap_type, { - "Type", "eap.type", FT_UINT8, BASE_DEC, + { &hf_eap_type, { + "Type", "eap.type", FT_UINT8, BASE_DEC, VALS(eap_type_vals), 0x0, "", HFILL }}, - { &hf_eap_type_nak, { - "Desired Auth Type", "eap.type", FT_UINT8, BASE_DEC, + { &hf_eap_type_nak, { + "Desired Auth Type", "eap.type", FT_UINT8, BASE_DEC, VALS(eap_type_vals), 0x0, "", HFILL }}, { &hf_eaptls_fragment, - { "EAP-TLS Fragment", "eaptls.fragment", + { "EAP-TLS Fragment", "eaptls.fragment", FT_NONE, BASE_NONE, NULL, 0x0, "EAP-TLS Fragment", HFILL }}, { &hf_eaptls_fragments, - { "EAP-TLS Fragments", "eaptls.fragments", + { "EAP-TLS Fragments", "eaptls.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "EAP-TLS Fragments", HFILL }}, { &hf_eaptls_fragment_overlap, @@ -843,7 +843,7 @@ proto_register_eap(void) &ett_eaptls_fragments, }; - proto_eap = proto_register_protocol("Extensible Authentication Protocol", + proto_eap = proto_register_protocol("Extensible Authentication Protocol", "EAP", "eap"); proto_register_field_array(proto_eap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-eapol.c b/packet-eapol.c index 7c045d0d2a..b1a24869ca 100644 --- a/packet-eapol.c +++ b/packet-eapol.c @@ -3,22 +3,22 @@ * (From IEEE Draft P802.1X/D11; is there a later draft, or a * final standard? If so, check it.) * - * $Id: packet-eapol.c,v 1.11 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-eapol.c,v 1.12 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -62,7 +62,7 @@ static dissector_handle_t data_handle; #define EAPOL_KEY 3 #define EAPOL_ENCAP_ASF_ALERT 4 -static const value_string eapol_type_vals[] = { +static const value_string eapol_type_vals[] = { { EAP_PACKET, "EAP Packet" }, { EAPOL_START, "Start" }, { EAPOL_LOGOFF, "Logoff" }, @@ -175,11 +175,11 @@ void proto_register_eapol(void) { static hf_register_info hf[] = { - { &hf_eapol_version, { - "Version", "eapol.version", FT_UINT8, BASE_DEC, + { &hf_eapol_version, { + "Version", "eapol.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - { &hf_eapol_type, { - "Type", "eapol.type", FT_UINT8, BASE_DEC, + { &hf_eapol_type, { + "Type", "eapol.type", FT_UINT8, BASE_DEC, VALS(eapol_type_vals), 0x0, "", HFILL }}, { &hf_eapol_len, { "Length", "eapol.len", FT_UINT16, BASE_DEC, diff --git a/packet-eigrp.c b/packet-eigrp.c index fb75e82a71..df829704d0 100644 --- a/packet-eigrp.c +++ b/packet-eigrp.c @@ -2,22 +2,22 @@ * Routines for EIGRP dissection * Copyright 2000, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-eigrp.c,v 1.24 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-eigrp.c,v 1.25 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -80,7 +80,7 @@ static const value_string eigrp_opcode_vals[] = { { EIGRP_SAP, "IPX/SAP Update" }, { EIGRP_HI, "Hello" }, { EIGRP_ACK, "Acknowledge" }, - { 0, NULL } + { 0, NULL } }; static const value_string eigrp_tlv_vals[] = { @@ -135,11 +135,11 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *eigrp_tree,*tlv_tree; proto_item *ti; - + guint opcode,opcode_tmp; guint16 tlv,size, offset = EIGRP_HEADER_LENGTH; guint32 ack; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "EIGRP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -148,7 +148,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { opcode_tmp=opcode=tvb_get_guint8(tvb,1); ack = tvb_get_ntohl(tvb,12); if (opcode==EIGRP_HELLO) { if (ack == 0) opcode_tmp=EIGRP_HI; else opcode_tmp=EIGRP_ACK; } - + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode_tmp , eigrp_opcode_vals, "Unknown (0x%04x)")); @@ -160,16 +160,16 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti = proto_tree_add_protocol_format(tree, proto_eigrp, tvb, 0, -1, "Cisco EIGRP"); - + eigrp_tree = proto_item_add_subtree(ti, ett_eigrp); - + proto_tree_add_text (eigrp_tree, tvb, 0,1,"Version = %u",tvb_get_guint8(tvb,0)) ; proto_tree_add_uint_format (eigrp_tree, hf_eigrp_opcode, tvb, 1,1,opcode,"Opcode = %u (%s)",opcode,val_to_str(opcode_tmp,eigrp_opcode_vals, "Unknown")) ; proto_tree_add_text (eigrp_tree, tvb, 2,2,"Checksum = 0x%04x",tvb_get_ntohs(tvb,2)) ; proto_tree_add_text (eigrp_tree, tvb, 4,4,"Flags = 0x%08x",tvb_get_ntohl(tvb,4)) ; proto_tree_add_text (eigrp_tree, tvb, 8,4,"Sequence = %u",tvb_get_ntohl(tvb,8)) ; proto_tree_add_text (eigrp_tree, tvb, 12,4,"Acknowledge = %u",tvb_get_ntohl(tvb,12)) ; - proto_tree_add_uint (eigrp_tree, hf_eigrp_as, tvb, 16,4,tvb_get_ntohl(tvb,16)) ; + proto_tree_add_uint (eigrp_tree, hf_eigrp_as, tvb, 16,4,tvb_get_ntohl(tvb,16)) ; if (opcode==EIGRP_SAP) { @@ -181,7 +181,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tlv = tvb_get_ntohs(tvb,offset); size = tvb_get_ntohs(tvb,offset+2); - if ( size == 0 ) + if ( size == 0 ) { proto_tree_add_text(eigrp_tree,tvb,offset,-1,"Unknown data (maybe authentication)"); return; @@ -194,7 +194,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_uint_format (tlv_tree,hf_eigrp_tlv, tvb,offset,2,tlv,"Type = 0x%04x (%s)",tlv,val_to_str(tlv,eigrp_tlv_vals, "Unknown")) ; proto_tree_add_text (tlv_tree,tvb,offset+2,2,"Size = %u bytes",size) ; - + switch (tlv){ case TLV_PAR: dissect_eigrp_par(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree); @@ -211,34 +211,34 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case TLV_IP_INT: dissect_eigrp_ip_int(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_IP_EXT: dissect_eigrp_ip_ext(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_IPX_INT: dissect_eigrp_ipx_int(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_IPX_EXT: dissect_eigrp_ipx_ext(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; - + break; + case TLV_AT_CBL: dissect_eigrp_at_cbl(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_AT_INT: dissect_eigrp_at_int(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_AT_EXT: dissect_eigrp_at_ext(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti); - break; + break; case TLV_AUTH: proto_tree_add_text(tlv_tree,tvb,offset+4,size-4,"Authentication data"); break; } offset+=size; - } + } } } @@ -270,7 +270,7 @@ static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree) /* nothing */ ; } -} +} static void dissect_eigrp_sv (tvbuff_t *tvb, proto_tree *tree, proto_item *ti) { @@ -298,8 +298,8 @@ static void dissect_eigrp_nms (tvbuff_t *tvb, proto_tree *tree, proto_item *ti) } - -static void dissect_eigrp_ip_int (tvbuff_t *tvb, proto_tree *tree, proto_item *ti) + +static void dissect_eigrp_ip_int (tvbuff_t *tvb, proto_tree *tree, proto_item *ti) { guint8 ip_addr[4],length,addr_len; tvb_memcpy(tvb,ip_addr,0,4); @@ -329,8 +329,8 @@ static void dissect_eigrp_ip_ext (tvbuff_t *tvb, proto_tree *tree, proto_item *t proto_tree_add_text (tree,tvb,4,4,"Originating router = %s",ip_to_str(ip_addr)); proto_tree_add_text (tree,tvb,8,4,"Originating A.S. = %u",tvb_get_ntohl(tvb,8)); proto_tree_add_text (tree,tvb,12,4,"Arbitrary tag = %u",tvb_get_ntohl(tvb,12)); - proto_tree_add_text (tree,tvb,16,4,"External protocol metric = %u",tvb_get_ntohl(tvb,16)); - proto_tree_add_text (tree,tvb,20,2,"Reserved"); + proto_tree_add_text (tree,tvb,16,4,"External protocol metric = %u",tvb_get_ntohl(tvb,16)); + proto_tree_add_text (tree,tvb,20,2,"Reserved"); proto_tree_add_text (tree,tvb,22,1,"External protocol ID = %u (%s)",tvb_get_guint8(tvb,22),val_to_str(tvb_get_guint8(tvb,22),eigrp_pid_vals, "Unknown")); proto_tree_add_text (tree,tvb,23,1,"Flags = 0x%0x",tvb_get_guint8(tvb,23)); @@ -363,7 +363,7 @@ static void dissect_eigrp_ipx_int (tvbuff_t *tvb, proto_tree *tree, proto_item * proto_tree_add_text (tree,tvb,22,1,"Reliability = %u",tvb_get_guint8(tvb,22)); proto_tree_add_text (tree,tvb,23,1,"Load = %u",tvb_get_guint8(tvb,23)); proto_tree_add_text (tree,tvb,24,2,"Reserved "); - proto_tree_add_text (tree,tvb,26,4,"Destination Address = %08x",tvb_get_ntohl(tvb,26)); + proto_tree_add_text (tree,tvb,26,4,"Destination Address = %08x",tvb_get_ntohl(tvb,26)); proto_item_append_text (ti," = %08x%s",tvb_get_ntohl(tvb,26),((tvb_get_ntohl(tvb,10)==0xffffffff)?" - Destination unreachable":"")); } @@ -377,9 +377,9 @@ static void dissect_eigrp_ipx_ext (tvbuff_t *tvb, proto_tree *tree, proto_item * proto_tree_add_text (tree,tvb,20,4,"Arbitrary tag = %u",tvb_get_ntohl(tvb,20)); proto_tree_add_text (tree,tvb,24,1,"External protocol = %u",tvb_get_guint8(tvb,24)); proto_tree_add_text (tree,tvb,25,1,"Reserved"); - proto_tree_add_text (tree,tvb,26,2,"External metric = %u ",tvb_get_ntohs(tvb,26)); - proto_tree_add_text (tree,tvb,28,2,"External delay = %u ",tvb_get_ntohs(tvb,28)); - + proto_tree_add_text (tree,tvb,26,2,"External metric = %u ",tvb_get_ntohs(tvb,26)); + proto_tree_add_text (tree,tvb,28,2,"External delay = %u ",tvb_get_ntohs(tvb,28)); + proto_tree_add_text (tree,tvb,30,4,"Delay = %u",tvb_get_ntohl(tvb,30)); proto_tree_add_text (tree,tvb,34,4,"Bandwidth = %u",tvb_get_ntohl(tvb,34)); proto_tree_add_text (tree,tvb,38,3,"MTU = %u",tvb_get_ntoh24(tvb,38)); @@ -387,7 +387,7 @@ static void dissect_eigrp_ipx_ext (tvbuff_t *tvb, proto_tree *tree, proto_item * proto_tree_add_text (tree,tvb,42,1,"Reliability = %u",tvb_get_guint8(tvb,42)); proto_tree_add_text (tree,tvb,43,1,"Load = %u",tvb_get_guint8(tvb,43)); proto_tree_add_text (tree,tvb,44,2,"Reserved "); - proto_tree_add_text (tree,tvb,46,4,"Destination Address = %08x",tvb_get_ntohl(tvb,46)); + proto_tree_add_text (tree,tvb,46,4,"Destination Address = %08x",tvb_get_ntohl(tvb,46)); proto_item_append_text (ti," = %08x%s",tvb_get_ntohl(tvb,46),((tvb_get_ntohl(tvb,30)==0xffffffff)?" - Destination unreachable":"")); } @@ -427,7 +427,7 @@ static void dissect_eigrp_at_ext (tvbuff_t *tvb, proto_tree *tree, proto_item *t proto_tree_add_text (tree,tvb,12,4,"Arbitrary tag = %u",tvb_get_ntohl(tvb,12)); proto_tree_add_text (tree,tvb,16,1,"External protocol ID = %u ",tvb_get_guint8(tvb,16)); proto_tree_add_text (tree,tvb,17,1,"Flags = 0x%0x",tvb_get_guint8(tvb,17)); - proto_tree_add_text (tree,tvb,18,2,"External protocol metric = %u",tvb_get_ntohs(tvb,18)); + proto_tree_add_text (tree,tvb,18,2,"External protocol metric = %u",tvb_get_ntohs(tvb,18)); proto_tree_add_text (tree,tvb,20,4,"Delay = %u",tvb_get_ntohl(tvb,20)); proto_tree_add_text (tree,tvb,24,4,"Bandwidth = %u",tvb_get_ntohl(tvb,24)); @@ -464,7 +464,7 @@ proto_register_eigrp(void) "Type/Length/Value", HFILL } }, }; - + static gint *ett[] = { &ett_eigrp, &ett_tlv, diff --git a/packet-esis.c b/packet-esis.c index f1d2c9133f..ce9a5596da 100644 --- a/packet-esis.c +++ b/packet-esis.c @@ -1,24 +1,24 @@ /* packet-esis.c - * Routines for ISO/OSI End System to Intermediate System + * Routines for ISO/OSI End System to Intermediate System * Routing Exchange Protocol ISO 9542. * - * $Id: packet-esis.c,v 1.26 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-esis.c,v 1.27 2002/08/28 21:00:13 jmayer Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -128,7 +128,7 @@ static void esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, * This is just a copy of isis.c and isis.h, so I keep the stuff also * and adapt the names to cover possible protocol errors! Ive really no * idea wether I need this or not. - * + * * Input * tvbuff_t * : tvbuff with packet data. * proto_tree * : tree of display data. May be NULL. @@ -154,9 +154,9 @@ esis_dissect_esh_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { int offset = 0; int no_sa = 0; int sal = 0; - + proto_item *ti; - + if (tree) { offset += ESIS_HDR_FIXED_LENGTH; @@ -166,7 +166,7 @@ esis_dissect_esh_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { ti = proto_tree_add_text( tree, tvb, offset, -1, "Number of Source Addresses (SA, Format: NSAP) : %u", no_sa ); offset++; - + esis_area_tree = proto_item_add_subtree( ti, ett_esis_area_addr ); while ( no_sa-- > 0 ) { sal = (int) tvb_get_guint8(tvb, offset); @@ -179,12 +179,12 @@ esis_dissect_esh_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { len -= ( sal + 1 ); } dissect_osi_options( len, tvb, offset, tree ); - } + } } /* esis_dissect_esh_pdu */ ; static void esis_dissect_ish_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { - + int offset = 0; int netl = 0; @@ -192,7 +192,7 @@ esis_dissect_ish_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { offset += ESIS_HDR_FIXED_LENGTH; netl = (int) tvb_get_guint8(tvb, offset); - proto_tree_add_text( tree, tvb, offset, netl + 1, + proto_tree_add_text( tree, tvb, offset, netl + 1, "### Network Entity Title Section ###"); proto_tree_add_text( tree, tvb, offset++, 1, "NETL: %2u Octets", netl); proto_tree_add_text( tree, tvb, offset, netl, @@ -215,7 +215,7 @@ esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { offset += ESIS_HDR_FIXED_LENGTH; tmpl = (int) tvb_get_guint8(tvb, offset); - proto_tree_add_text( tree, tvb, offset, tmpl + 1, + proto_tree_add_text( tree, tvb, offset, tmpl + 1, "### Destination Address Section ###" ); proto_tree_add_text( tree, tvb, offset++, 1, "DAL: %2u Octets", tmpl); proto_tree_add_text( tree, tvb, offset, tmpl, @@ -225,7 +225,7 @@ esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { len -= ( tmpl + 1 ); tmpl = (int) tvb_get_guint8(tvb, offset); - proto_tree_add_text( tree, tvb, offset, tmpl + 1, + proto_tree_add_text( tree, tvb, offset, tmpl + 1, "### Subnetwork Address Section ###"); proto_tree_add_text( tree, tvb, offset++, 1, "BSNPAL: %2u Octets", tmpl); proto_tree_add_text( tree, tvb, offset, tmpl, @@ -236,7 +236,7 @@ esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { tmpl = (int) tvb_get_guint8(tvb, offset); if ( 0 == tmpl ) { - proto_tree_add_text( tree, tvb, offset, 1, + proto_tree_add_text( tree, tvb, offset, 1, "### No Network Entity Title Section ###" ); offset++; len--; @@ -258,7 +258,7 @@ esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { /* * Name: dissect_esis() - * + * * Description: * Main entry area for esis de-mangling. This will build the * main esis tree data and call the sub-protocols as needed. @@ -274,7 +274,7 @@ esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { static void dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { char *pdu_type_string = NULL; - char *pdu_type_format_string = "PDU Type : %s (R:%s%s%s)"; + char *pdu_type_format_string = "PDU Type : %s (R:%s%s%s)"; esis_hdr_t ehdr; proto_item *ti; proto_tree *esis_tree = NULL; @@ -288,7 +288,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr); - + if (tree) { ti = proto_tree_add_item(tree, proto_esis, tvb, 0, -1, FALSE); esis_tree = proto_item_add_subtree(ti, ett_esis); @@ -303,16 +303,16 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_uint( esis_tree, hf_esis_nlpi, tvb, 0, 1, ehdr.esis_nlpi ); proto_tree_add_uint( esis_tree, hf_esis_length, tvb, 1, 1, ehdr.esis_length ); - proto_tree_add_uint( esis_tree, hf_esis_version, tvb, 2, 1, + proto_tree_add_uint( esis_tree, hf_esis_version, tvb, 2, 1, ehdr.esis_version ); - proto_tree_add_uint( esis_tree, hf_esis_reserved, tvb, 3, 1, + proto_tree_add_uint( esis_tree, hf_esis_reserved, tvb, 3, 1, ehdr.esis_reserved ); pdu_type_string = val_to_str(ehdr.esis_type&OSI_PDU_TYPE_MASK, esis_vals, "Unknown (0x%x)"); - proto_tree_add_uint_format( esis_tree, hf_esis_type, tvb, 4, 1, - ehdr.esis_type, + proto_tree_add_uint_format( esis_tree, hf_esis_type, tvb, 4, 1, + ehdr.esis_type, pdu_type_format_string, pdu_type_string, (ehdr.esis_type&BIT_8) ? "1" : "0", @@ -320,12 +320,12 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { (ehdr.esis_type&BIT_6) ? "1" : "0"); tmp_uint = pntohs( ehdr.esis_holdtime ); - proto_tree_add_uint_format(esis_tree, hf_esis_holdtime, tvb, 5, 2, + proto_tree_add_uint_format(esis_tree, hf_esis_holdtime, tvb, 5, 2, tmp_uint, "Holding Time : %u seconds", tmp_uint ); tmp_uint = pntohs( ehdr.esis_checksum ); - + switch (calc_checksum( tvb, 0, ehdr.esis_length, tmp_uint )) { case NO_CKSUM: @@ -349,7 +349,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { g_assert_not_reached(); } proto_tree_add_uint_format( esis_tree, hf_esis_checksum, tvb, 7, 2, - tmp_uint, "Checksum : 0x%x ( %s )", + tmp_uint, "Checksum : 0x%x ( %s )", tmp_uint, cksum_status ); } @@ -360,10 +360,10 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { * dispatch the sub-type. */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str( ehdr.esis_type&OSI_PDU_TYPE_MASK, esis_vals, "Unknown (0x%x)" ) ); - } + } variable_len = ehdr.esis_length - ESIS_HDR_FIXED_LENGTH; @@ -395,17 +395,17 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { * NOTE: this procedure to autolinked by the makefile process that * builds register.c * - * Input: + * Input: * void * * Output: * void */ -void +void proto_register_esis(void) { static hf_register_info hf[] = { { &hf_esis_nlpi, - { "Network Layer Protocol Identifier", "esis.nlpi", + { "Network Layer Protocol Identifier", "esis.nlpi", FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }}, { &hf_esis_length, { "PDU Length ", "esis.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, @@ -422,8 +422,8 @@ proto_register_esis(void) { { "Checksum ", "esis.chksum", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }} }; /* - * - * + * + * */ static gint *ett[] = { &ett_esis, diff --git a/packet-esis.h b/packet-esis.h index e60276be92..297e88777c 100644 --- a/packet-esis.h +++ b/packet-esis.h @@ -1,24 +1,24 @@ /* packet-esis.h * Defines and such for ESIS protocol decode. * - * $Id: packet-esis.h,v 1.3 2000/11/18 10:38:24 guy Exp $ + * $Id: packet-esis.h,v 1.4 2002/08/28 21:00:13 jmayer Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-eth.c b/packet-eth.c index 8548317bde..961b1db802 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,22 +1,22 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.76 2002/08/26 19:08:59 guy Exp $ + * $Id: packet-eth.c,v 1.77 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -81,7 +81,7 @@ capture_eth(const guchar *pd, int offset, int len, packet_counts *ld) ld->other++; return; } - + etype = pntohs(&pd[offset+12]); /* either ethernet802.3 or ethernet802.2 */ diff --git a/packet-eth.h b/packet-eth.h index d4632dd002..022332fdf2 100644 --- a/packet-eth.h +++ b/packet-eth.h @@ -1,21 +1,21 @@ /* packet-eth.h * - * $Id: packet-eth.h,v 1.7 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-eth.h,v 1.8 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ethertype.c b/packet-ethertype.c index 9c783f799e..7c9d2e9618 100644 --- a/packet-ethertype.c +++ b/packet-ethertype.c @@ -1,24 +1,24 @@ /* ethertype.c * Routines for calling the right protocol for the ethertype. * - * $Id: packet-ethertype.c,v 1.30 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-ethertype.c,v 1.31 2002/08/28 21:00:13 jmayer Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -56,8 +56,8 @@ const value_string etype_vals[] = { {ETHERTYPE_TRAIN, "Netmon Train" }, {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */ {ETHERTYPE_WCP, "Wellfleet Compression Protocol" }, - {ETHERTYPE_PPPOED, "PPPoE Discovery" }, - {ETHERTYPE_PPPOES, "PPPoE Session" }, + {ETHERTYPE_PPPOED, "PPPoE Discovery" }, + {ETHERTYPE_PPPOES, "PPPoE Session" }, {ETHERTYPE_VLAN, "802.1Q Virtual LAN" }, {ETHERTYPE_EAPOL, "802.1X Authentication" }, {ETHERTYPE_MPLS, "MPLS label switched packet" }, @@ -131,7 +131,7 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, tvbuff_t *next_tvb; guint length_before; volatile gboolean dissector_found; - + /* Add to proto_tree */ if (tree) { proto_tree_add_uint(fh_tree, etype_id, tvb, diff --git a/packet-fddi.c b/packet-fddi.c index e3ec6a5d9e..87b4e51786 100644 --- a/packet-fddi.c +++ b/packet-fddi.c @@ -3,22 +3,22 @@ * * Laurent Deniel <deniel@worldnet.fr> * - * $Id: packet-fddi.c,v 1.57 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-fddi.c,v 1.58 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -364,7 +364,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case FDDI_FC_LLC_ASYNC + 15 : call_dissector(llc_handle, next_tvb, pinfo, tree); return; - + default : call_dissector(data_handle,next_tvb, pinfo, tree); return; @@ -372,7 +372,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* fc */ } /* dissect_fddi */ - + static void dissect_fddi_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/packet-fddi.h b/packet-fddi.h index e886c43f15..db8125f43b 100644 --- a/packet-fddi.h +++ b/packet-fddi.h @@ -1,21 +1,21 @@ /* packet-fddi.h * - * $Id: packet-fddi.h,v 1.6 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-fddi.h,v 1.7 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-fr.c b/packet-fr.c index 06fb9bc64c..4c2f371f37 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,22 +3,22 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.29 2002/07/31 19:27:39 guy Exp $ + * $Id: packet-fr.c,v 1.30 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -147,7 +147,7 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char buf[32]; guint8 fr_ctrl; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); if (pinfo->pseudo_header->x25.flags & FROM_DCE) { @@ -169,7 +169,7 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fr_ctrl = tvb_get_guint8( tvb, 2); address = EXTRACT_DLCI(fr_header); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "DLCI %u", address); if (tree) { @@ -237,9 +237,9 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_item *ti = NULL; proto_tree *fr_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree) { @@ -361,48 +361,48 @@ static void dissect_fr_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tree, tvb, 0, 0, "Frame relay xid not yet implemented"); call_dissector(data_handle,tvb_new_subset(tvb,0,-1,-1),pinfo,tree); } - + /* Register the protocol with Ethereal */ void proto_register_fr(void) -{ +{ static hf_register_info hf[] = { - { &hf_fr_dlci, { - "DLCI", "fr.dlci", FT_UINT16, BASE_DEC, + { &hf_fr_dlci, { + "DLCI", "fr.dlci", FT_UINT16, BASE_DEC, NULL, FRELAY_DLCI, "Data-Link Connection Identifier", HFILL }}, - { &hf_fr_cr, { + { &hf_fr_cr, { "CR", "fr.cr", FT_BOOLEAN, 16, TFS(&cmd_string), FRELAY_CR, "Command/Response", HFILL }}, - { &hf_fr_dc, { + { &hf_fr_dc, { "DC", "fr.dc", FT_BOOLEAN, 16, TFS(&ctrl_string), FRELAY_CR, "Address/Control", HFILL }}, - { &hf_fr_fecn, { - "FECN", "fr.fecn", FT_BOOLEAN, 16, + { &hf_fr_fecn, { + "FECN", "fr.fecn", FT_BOOLEAN, 16, NULL, FRELAY_FECN, "Forward Explicit Congestion Notification", HFILL }}, - { &hf_fr_becn, { - "BECN", "fr.becn", FT_BOOLEAN, 16, + { &hf_fr_becn, { + "BECN", "fr.becn", FT_BOOLEAN, 16, NULL, FRELAY_BECN, "Backward Explicit Congestion Notification", HFILL }}, - { &hf_fr_de, { - "DE", "fr.de", FT_BOOLEAN, 16, + { &hf_fr_de, { + "DE", "fr.de", FT_BOOLEAN, 16, NULL, FRELAY_DE, "Discard Eligibility", HFILL }}, - { &hf_fr_ea, { + { &hf_fr_ea, { "EA", "fr.ea", FT_BOOLEAN, 16, TFS(&ea_string), FRELAY_EA, "Extended Address", HFILL }}, - { &hf_fr_nlpid, { - "NLPID", "fr.nlpid", FT_UINT8, BASE_HEX, + { &hf_fr_nlpid, { + "NLPID", "fr.nlpid", FT_UINT8, BASE_HEX, VALS(fr_nlpid_vals), 0x0, "FrameRelay Encapsulated Protocol NLPID", HFILL }}, { &hf_fr_oui, { - "Organization Code", "fr.snap.oui", FT_UINT24, BASE_HEX, + "Organization Code", "fr.snap.oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, "", HFILL }}, { &hf_fr_pid, { - "Protocol ID", "fr.snap.pid", FT_UINT16, BASE_HEX, + "Protocol ID", "fr.snap.pid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, - { &hf_fr_snaptype, { - "Type", "fr.snaptype", FT_UINT16, BASE_HEX, + { &hf_fr_snaptype, { + "Type", "fr.snaptype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, "FrameRelay SNAP Encapsulated Protocol", HFILL }}, - { &hf_fr_chdlctype, { - "Type", "fr.chdlctype", FT_UINT16, BASE_HEX, + { &hf_fr_chdlctype, { + "Type", "fr.chdlctype", FT_UINT16, BASE_HEX, VALS(chdlc_vals), 0x0, "FrameRelay Cisco HDLC Encapsulated Protocol", HFILL }}, }; diff --git a/packet-frame.c b/packet-frame.c index 79c96522d2..5f57732ece 100644 --- a/packet-frame.c +++ b/packet-frame.c @@ -2,22 +2,22 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.c,v 1.29 2002/08/26 19:09:00 guy Exp $ + * $Id: packet-frame.c,v 1.30 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -65,7 +65,7 @@ static const value_string p2p_dirs[] = { }; static dissector_table_t wtap_encap_dissector_table; - + static void dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -146,7 +146,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(fh_tree, hf_frame_packet_len, tvb, 0, 0, pkt_len, "Packet Length: %d byte%s", pkt_len, plurality(pkt_len, "", "s")); - + proto_tree_add_uint_format(fh_tree, hf_frame_capture_len, tvb, 0, 0, cap_len, "Capture Length: %d byte%s", cap_len, plurality(cap_len, "", "s")); @@ -262,7 +262,7 @@ proto_register_frame(void) static gint *ett[] = { &ett_frame, }; - module_t *frame_module; + module_t *frame_module; wtap_encap_dissector_table = register_dissector_table("wtap_encap", "Wiretap encapsulation type", FT_UINT32, BASE_DEC); diff --git a/packet-frame.h b/packet-frame.h index dc2c670c94..51d848af01 100644 --- a/packet-frame.h +++ b/packet-frame.h @@ -2,22 +2,22 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.h,v 1.4 2002/04/09 08:43:43 guy Exp $ + * $Id: packet-frame.h,v 1.5 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ftp.c b/packet-ftp.c index c49a6d6745..4b449ec4ce 100644 --- a/packet-ftp.c +++ b/packet-ftp.c @@ -2,25 +2,25 @@ * Routines for ftp packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP) - * - * $Id: packet-ftp.c,v 1.48 2002/08/02 23:35:49 jmayer Exp $ + * + * $Id: packet-ftp.c,v 1.49 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -141,7 +141,7 @@ handle_pasv_response(const guchar *line, int linelen, packet_info *pinfo) */ break; } - + /* * See if we have six numbers. */ @@ -196,7 +196,7 @@ handle_pasv_response(const guchar *line, int linelen, packet_info *pinfo) } g_free(args); -} +} static void dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -240,7 +240,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) is_request ? "Request" : "Response", format_text(line, linelen)); } - + if (tree) { ti = proto_tree_add_item(tree, proto_ftp, tvb, offset, -1, FALSE); diff --git a/packet-fw1.c b/packet-fw1.c index a20045b552..b1a0fa6f62 100644 --- a/packet-fw1.c +++ b/packet-fw1.c @@ -2,12 +2,12 @@ * Routines for Ethernet header disassembly of FW1 "monitor" files * Copyright 2002, Alfred Koebler <ak@icon-sult.de> * - * $Id: packet-fw1.c,v 1.4 2002/08/11 22:34:55 guy Exp $ + * $Id: packet-fw1.c,v 1.5 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Alfred Koebler <ak@icon-sult.de> * Copyright 2002 I.Consult - * + * * To use this dissector use the command line option * -o eth.interpret_as_fw1_monitor:TRUE * @@ -46,8 +46,8 @@ * For the four lines in the Top Pane you will see the according lines * in the Middle Pane: * El90x1 o - * O El90x1 - * i El90x1 + * O El90x1 + * i El90x1 * El90x1 I * * Example for a packet traversing through the Firewall, first through @@ -62,12 +62,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -105,7 +105,7 @@ static void dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; + proto_item *ti; proto_tree *volatile fh_tree = NULL; char direction[3]; char interface_name[20]; @@ -169,7 +169,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } ti = proto_tree_add_protocol_format(tree, proto_fw1, tvb, 0, ETH_HEADER_SIZE, header); - + /* create display subtree for the protocol */ fh_tree = proto_item_add_subtree(ti, ett_fw1); @@ -182,7 +182,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ethertype(etype, tvb, ETH_HEADER_SIZE, pinfo, tree, fh_tree, hf_fw1_type, hf_fw1_trailer); } - + void proto_register_fw1(void) { diff --git a/packet-giop.c b/packet-giop.c index 6709c9afdd..10afda33a0 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -4,27 +4,27 @@ * Initial Code by, * Laurent Deniel <deniel@worldnet.fr> * Craig Rodrigues <rodrigc@mediaone.net> - * + * * GIOP API extensions by, * Frank Singleton <frank.singleton@ericsson.com> * Trevor Shepherd <eustrsd@am1.ericsson.se> * - * $Id: packet-giop.c,v 1.62 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-giop.c,v 1.63 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,14 +35,14 @@ * TODO: -- FS * 1. heuristic giop dissector table [started] * 2. GUI options, see 20 - * 3. Remove unneccessary reply_status in heuristic dissector calls (now + * 3. Remove unneccessary reply_status in heuristic dissector calls (now * part of MessageHeader) [done] * 4. get_CDR_xxx should be passed an alignment offset value * rather than GIOP_HEADER_SIZE, as alignment can also change in a * octet stream when eg: encapsulation is used [done] * 5. GIOP users should eventually get there own tvbuff, and * not rely on the GIOP tvbuff, more robust - * 6. get_CDR_string,wchar,wstring etc should handle different + * 6. get_CDR_string,wchar,wstring etc should handle different * GIOP versions [started] * 7. Fix situation where req_id is not unique in a logfile [done, use FN/MFN, needs improving.] * @@ -77,8 +77,8 @@ * external data [read done, write incomplete] * 28. Call sub dissector only if tvb_offset_exists(). [Done, this is checked * inside try_explicit_giop_dissector() ] - * - * 29. Make add/delete routine for objkey hash as it may be useful when say reading + * + * 29. Make add/delete routine for objkey hash as it may be useful when say reading * stringified IOR's from a file to add them to our hash. ie: There are other ways * to populate our object key hash besides REPLY's to RESOLVE(request) [done] * @@ -88,11 +88,11 @@ * 33. Complete dissect_data_for_typecode. * 34. For complex TypeCodes need to check final offset against original offset + sequence length. * 35. Update REQUEST/REPLY 1_2 according to IDL (eg; ServiceContextList etc). - * 36. Adding decode_ServiceContextList, incomplete. + * 36. Adding decode_ServiceContextList, incomplete. * 37. Helper functions should not ALWAYS rely on header to find current endianess. It should * be passed from user, eg Use stream_is_big_endian. [started] * 38. Remove unwanted/unused function parameters, see decode_IOR [started] - * 40. Add sequence <IOP::TaggedComponent> components to IIOP IOR profile. Perhaps + * 40. Add sequence <IOP::TaggedComponent> components to IIOP IOR profile. Perhaps * decode_IOP_TaggedComponents as a helper function. [done - NOT helper] * * 41. Make important field searchable from Message header. ie: Remove add_text_ @@ -135,14 +135,14 @@ * (via complete_request_packet_hash * * - * Limitations. + * Limitations. * ============ * * 1. Request_ID's are unique only per connection. * * 2. You must be monitoring the network when the client does * a REQUEST(resolve), otherwise I have no knowledge of the - * association between object_key and REPOID. I could talk to + * association between object_key and REPOID. I could talk to * a Nameserver, but then I would start "generating" packets. * This is probably not a good thing for a protocol analyser. * Also, how could I decode logfiles offline. @@ -159,7 +159,7 @@ /* * Important Data Structures: * - * giop_module_hash + * giop_module_hash * ---------------- * * This is a hash table that maps IDL Module/Interface Names (Key) @@ -169,7 +169,7 @@ * call the subdissector that has registered responsibility for * that IDL module/interface. * - * + * * giop_sub_list * ------------- * @@ -178,7 +178,7 @@ * wishing to be called via heuristic mechanisms. They do this * via the register_giop_user() function. * - * + * * giop_objkey_hash * ---------------- * @@ -195,7 +195,7 @@ * to populate this hash also. * * - * Other Data structures + * Other Data structures * ======================= * * These structures have been added to minimise the possibility @@ -209,7 +209,7 @@ * build 2 structures. The intent is to be able to map a REPLY message * back to the most recent REQUEST message with the same Request_ID * (TODO and matching port and IP address ??) - * + * * Abbrevs: * -------- * @@ -220,7 +220,7 @@ * complete_request_packet_list * ---------------------------- * - * This is a list that contains ALL the FN's that are REQUEST's, along with + * This is a list that contains ALL the FN's that are REQUEST's, along with * operation,request_id and giop_sub_handle_t * * complete_reply_packet_hash @@ -230,10 +230,10 @@ * This allows me to handle the case, where if you click on any REPLY * message, I can lookup the matching request. This can improve * the match rate between REQUEST and REPLY when people click in - * any old fashion, but is NOT foolproof. + * any old fashion, but is NOT foolproof. * * The algorithm I use to populate this hash during initial pass, - * is as follows. + * is as follows. * * If packet is a REPLY, note the reqid, and then traverse backwards * through the complete_request_packet_list from its tail, looking @@ -255,7 +255,7 @@ * packets, and a user clickin on one ? Good question. * * I leverage the pinfo_fd->flags.visited on a per frame - * basis. + * basis. * * To quote from the ever helpful development list * @@ -298,7 +298,7 @@ /* * This affects how we handle context_data inside ServiceContext structs. * According to CORBA 2.4.2, Context data is encapsulated in octet sequences, - * but so far I haven't seen the that on the wire. But, maybe its me -- FS + * but so far I haven't seen the that on the wire. But, maybe its me -- FS * */ @@ -314,7 +314,7 @@ /* - * ------------------------------------------------------------------------------------------+ + * ------------------------------------------------------------------------------------------+ * Private Helper function Declarations * ------------------------------------------------------------------------------------------+ */ @@ -337,55 +337,55 @@ static void decode_SystemExceptionReplyBody (tvbuff_t *tvb, proto_tree *tree, gi gboolean stream_is_big_endian, guint32 boundary); -static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary); -static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header ); - -static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, + +static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary); -static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header); -static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary); -static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary); -static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean new_stream_is_big_endian, guint32 new_boundary, int hf_id ); -static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header, guint32 data_type ); @@ -393,7 +393,7 @@ static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *off /* - * ------------------------------------------------------------------------------------------+ + * ------------------------------------------------------------------------------------------+ * Data/Variables/Structs * ------------------------------------------------------------------------------------------+ */ @@ -410,7 +410,7 @@ static int hf_giop_type_id = -1; static int hf_giop_iiop_v_maj = -1; static int hf_giop_iiop_v_min = -1; static int hf_giop_endianess = -1; /* esp encapsulations */ -static int hf_giop_IOR_tag = -1; +static int hf_giop_IOR_tag = -1; static int hf_giop_IIOP_tag = -1; static int hf_giop_TCKind = -1; @@ -437,8 +437,8 @@ static int hf_giop_type_string = -1; static int hf_giop_type_ulong = -1; static int hf_giop_type_ushort = -1; -static int hf_giop_iiop_host = -1; -static int hf_giop_iiop_port = -1; +static int hf_giop_iiop_host = -1; +static int hf_giop_iiop_port = -1; static int hf_giop_iop_vscid = -1; static int hf_giop_iop_scid = -1; @@ -502,7 +502,7 @@ static const value_string giop_locate_status_types[] = { { 0x3, "Object Forward Perm"}, { 0x4, "Loc System Exception"}, { 0x5, "Loc Needs Addressing Mode"}, - { 0, NULL } + { 0, NULL } }; static const value_string tckind_vals[] = { @@ -539,7 +539,7 @@ static const value_string tckind_vals[] = { { 30, "tk_value_box"}, { 31, "tk_native"}, { 32, "tk_abstract_interface"}, - { 0, NULL } + { 0, NULL } }; @@ -569,7 +569,7 @@ static const int ReferenceAddr = 2; -static const value_string reply_status_types[] = { +static const value_string reply_status_types[] = { { NO_EXCEPTION, "No Exception" } , { USER_EXCEPTION, "User Exception" } , { SYSTEM_EXCEPTION, "System Exception" } , @@ -601,7 +601,7 @@ LocateReplyHeader_t; /* - * DATA - complete_request_list + * DATA - complete_request_list */ static GList *giop_complete_request_list; @@ -610,7 +610,7 @@ struct comp_req_list_entry { guint32 fn; /* frame number */ gchar * operation; /* echo echoString */ giop_sub_handle_t *subh; /* handle to sub dissector */ - guint32 reqid; /* request id */ + guint32 reqid; /* request id */ gchar * repoid; /* repository ID */ }; @@ -644,9 +644,9 @@ GMemChunk *giop_complete_reply_vals = NULL; /* val storage */ * * ie: module (or interface ?) name, and ptr to sub_dissector handle * - * With this knowledge, we can call a sub dissector directly, + * With this knowledge, we can call a sub dissector directly, * by : - * + * * objkey -> repoid -> sub_dissector via registered module/interface * */ @@ -682,7 +682,7 @@ static GSList *giop_sub_list = NULL; * * With this knowledge, we can call a sub dissector directly later * by : - * + * * objkey -> repoid -> sub_dissector via registered module/interface * * rather than heuristic calls that do not provide operation context. @@ -702,7 +702,7 @@ static const char giop_op_bind[] = "bind"; /* * Enums for interesting local operations, that we may need to monitor * with their subsequent replies - * + * */ enum giop_op_val { @@ -736,7 +736,7 @@ typedef enum ior_src ior_src_t; /* - * Enums for my lists and hash's + * Enums for my lists and hash's */ enum collection_data { @@ -759,7 +759,7 @@ struct giop_object_key { guint32 objkey_len; /* length */ }; -struct giop_object_val { +struct giop_object_val { guint8 *repo_id; /* ptr to Repository ID string */ ior_src_t src; /* where did Iget this IOR from */ }; @@ -771,7 +771,7 @@ GMemChunk *giop_objkey_vals = NULL; /* val storage */ /* - * ------------------------------------------------------------------------------------------+ + * ------------------------------------------------------------------------------------------+ * Private helper functions * ------------------------------------------------------------------------------------------+ */ @@ -789,11 +789,11 @@ static GList *insert_in_comp_req_list(GList *list, guint32 fn, guint32 reqid, gc entry = g_malloc(sizeof(comp_req_list_entry_t)); opn = g_strdup(op); /* duplicate operation for storage */ - + entry->fn = fn; entry->reqid = reqid; - entry->subh = sh; - entry->operation = opn; + entry->subh = sh; + entry->operation = opn; entry->repoid = NULL; /* dont have yet */ newlist_start = g_list_append (list, entry); /* append */ @@ -811,17 +811,17 @@ static comp_req_list_entry_t * find_fn_in_list(guint32 fn) { GList * element; /* entry in list */ comp_req_list_entry_t * entry_ptr = NULL; - + element = g_list_last(giop_complete_request_list); /* start from last */ - + while(element) { /* valid list entry */ entry_ptr = element->data; /* grab data pointer */ if (entry_ptr->fn == fn) { /* similar FN */ return entry_ptr; - } + } element = g_list_previous(element); /* try next previous */ } - + return NULL; /* no match so return NULL */ } @@ -841,7 +841,7 @@ static void add_sub_handle_repoid_to_comp_req_list(guint32 fn, giop_sub_handle_t entry = find_fn_in_list(fn); /* grab FN data entry */ if (entry) { - entry->subh = sh; + entry->subh = sh; entry->repoid = g_strdup(repoid); /* copy and store */ } @@ -856,7 +856,7 @@ static gint complete_reply_equal_fn(gconstpointer v, gconstpointer w) { struct complete_reply_hash_key *mk1 = (struct complete_reply_hash_key *)v; struct complete_reply_hash_key *mk2 = (struct complete_reply_hash_key *)w; - if (mk1->fn == mk2->fn) { + if (mk1->fn == mk2->fn) { return 1; } @@ -897,7 +897,7 @@ static void insert_in_complete_reply_hash(guint32 fn, guint32 mfn) { val = g_mem_chunk_alloc(giop_complete_reply_vals); val->mfn = mfn; /* and MFN */ - + g_hash_table_insert(giop_complete_reply_hash, new_key, val); } @@ -919,7 +919,7 @@ static guint32 get_mfn_from_fn(guint32 fn) { if (val) { mfn = val->mfn; /* grab it */ } - + return mfn; /* mfn or fn if not found */ } @@ -936,7 +936,7 @@ static guint32 get_mfn_from_fn_and_reqid(guint32 fn, guint32 reqid) { comp_req_list_entry_t * entry_ptr = NULL; /* Need Some pretty snappy code */ - + /* Loop back from current end of complete_request_list looking for */ /* a FN with the same reqid -- TODO enhance with port/address checks -- FS */ @@ -953,15 +953,15 @@ static guint32 get_mfn_from_fn_and_reqid(guint32 fn, guint32 reqid) { element = g_list_last(giop_complete_request_list); /* get last */ - + while(element) { /* valid list entry */ entry_ptr = element->data; /* grab data pointer */ if (entry_ptr->reqid == reqid) { /* similar reqid */ return entry_ptr->fn; /* return MFN */ - } + } element = g_list_previous(element); /* try next previous */ } - + return fn; /* no match so return FN */ } @@ -971,8 +971,8 @@ static guint32 get_mfn_from_fn_and_reqid(guint32 fn, guint32 reqid) { static gint giop_hash_module_equal(gconstpointer v, gconstpointer w) { struct giop_module_key *mk1 = (struct giop_module_key *)v; struct giop_module_key *mk2 = (struct giop_module_key *)w; - - if (!strcmp(mk1->module, mk2->module)) { + + if (!strcmp(mk1->module, mk2->module)) { return 1; } @@ -982,12 +982,12 @@ static gint giop_hash_module_equal(gconstpointer v, gconstpointer w) { /* Module Hash "HASH" Functions */ static guint32 giop_hash_module_hash(gconstpointer v) { - + int i,len; guint32 val = 0; /* init hash value */ struct giop_module_key *key = (struct giop_module_key *)v; - + /* * Hmm, try this simple hashing scheme for now. * ie: Simple summation, FIX later -- FS @@ -1007,7 +1007,7 @@ static guint32 giop_hash_module_hash(gconstpointer v) { /* - * ------------------------------------------------------------------------------------------+ + * ------------------------------------------------------------------------------------------+ * Public Utility functions * ------------------------------------------------------------------------------------------+ */ @@ -1032,23 +1032,23 @@ void register_giop_user_module(giop_sub_dissector_t *sub, gchar *name, gchar *mo struct giop_module_val *module_val = NULL; module_key.module = module; /* module name */ - + module_val = (struct giop_module_val *)g_hash_table_lookup(giop_module_hash, &module_key); if (module_val) { return; /* module name collision */ } - + /* So, passed module name should NOT exist in hash at this point.*/ -#if DEBUG +#if DEBUG printf("giop:register_module: Adding Module %s to module hash \n", module); printf("giop:register_module: Module sub dissector name is %s \n", name); #endif new_module_key = g_mem_chunk_alloc(giop_module_keys); new_module_key->module = module; /* save Module or interface name from IDL */ - + module_val = g_mem_chunk_alloc(giop_module_vals); module_val->subh = g_malloc(sizeof (giop_sub_handle_t)); /* init subh */ @@ -1056,7 +1056,7 @@ void register_giop_user_module(giop_sub_dissector_t *sub, gchar *name, gchar *mo module_val->subh->sub_name = name; /* save dissector name */ module_val->subh->sub_fn = sub; /* save subdissector*/ module_val->subh->sub_proto = sub_proto; /* save subdissector's proto_XXX value */ - + g_hash_table_insert(giop_module_hash, new_module_key, module_val); } @@ -1138,19 +1138,19 @@ static void insert_in_objkey_hash(GHashTable *hash, gchar *obj, guint32 len, gch if (objkey_val) { g_hash_table_remove(hash, &objkey_key); } - + /* So, passed key should NOT exist in hash at this point.*/ - + new_objkey_key = g_mem_chunk_alloc(giop_objkey_keys); new_objkey_key->objkey_len = len; /* save it */ new_objkey_key->objkey = (guint8 *) g_memdup(obj,len); /* copy from object and allocate ptr */ - + objkey_val = g_mem_chunk_alloc(giop_objkey_vals); objkey_val->repo_id = g_strdup(repoid); /* duplicate and store Respository ID string */ objkey_val->src = src; /* where IOR came from */ -#if DEBUG +#if DEBUG printf("giop: ******* Inserting Objkey with RepoID = %s and key length = %u into hash \n", objkey_val->repo_id, new_objkey_key->objkey_len); #endif @@ -1184,7 +1184,7 @@ static gint8 hex_char_to_val(guchar c){ if (c >= 'A' && c <= 'F') { retval = c - 55; return retval; - } + } else { return -1; } @@ -1198,7 +1198,7 @@ static gint8 hex_char_to_val(guchar c){ * User must free buffer. * * Creates a new tvbuff and call decode_IOR with a NULL tree, just to - * grab repoid etc for our objkey hash. + * grab repoid etc for our objkey hash. * */ @@ -1218,16 +1218,16 @@ static guint32 string_to_IOR(guchar *in, guint32 in_len, guint8 **out){ for (i=4; i<in_len-1; i+=2) { if ( isxdigit(in[i]) && isxdigit(in[i+1]) ) { /* hex ? */ - + if ( (tmpval_msb = hex_char_to_val(in[i])) < 0 ) { g_warning("giop: Invalid value in IOR %i \n", tmpval_msb); } - + if ( (tmpval_lsb = hex_char_to_val(in[i+1])) < 0 ) { g_warning("giop: Invalid value in IOR %i \n", tmpval_lsb); } - + tmpval = tmpval_msb << 4; tmpval += tmpval_lsb; (*out)[(i-4)/2] = (guint8) tmpval; @@ -1237,7 +1237,7 @@ static guint32 string_to_IOR(guchar *in, guint32 in_len, guint8 **out){ /* hmm */ break; } - + } return (i-4)/2; /* length */ @@ -1261,7 +1261,7 @@ static int getline(FILE *fp, gchar *line, int maxlen) { } -/* +/* * Read a list of stringified IOR's from a named file, convert to IOR's * and store in object key hash */ @@ -1270,7 +1270,7 @@ static void read_IOR_strings_from_file(gchar *name, int max_iorlen) { guchar *buf; /* NOTE reused for every line */ int len; int ior_val_len; /* length after unstringifying. */ - FILE *fp; + FILE *fp; guint8 *out; /* ptr to unstringified IOR */ tvbuff_t *tvb; /* temp tvbuff for dissectin IORs */ guint32 my_offset = 0; @@ -1293,7 +1293,7 @@ static void read_IOR_strings_from_file(gchar *name, int max_iorlen) { ior_val_len = string_to_IOR(buf,len,&out); /* convert */ if(ior_val_len>0) { - + /* Combination of tvb_new() and tvb_set_real_data(). Can throw ReportedBoundsError. @@ -1340,7 +1340,7 @@ static void giop_init(void) { /* * Create objkey/repoid hash, use my "equal" and "hash" functions. - * + * */ if (giop_objkey_hash) @@ -1353,25 +1353,25 @@ static void giop_init(void) { /* * Create hash, use my "equal" and "hash" functions. - * + * */ giop_objkey_hash = g_hash_table_new(giop_hash_objkey_hash, giop_hash_objkey_equal); giop_objkey_keys = g_mem_chunk_new("giop_objkey_keys", sizeof(struct giop_object_key), - giop_objkey_init_count * sizeof(struct giop_object_key), + giop_objkey_init_count * sizeof(struct giop_object_key), G_ALLOC_AND_FREE); - giop_objkey_vals = g_mem_chunk_new("giop_objkey_vals", + giop_objkey_vals = g_mem_chunk_new("giop_objkey_vals", sizeof(struct giop_object_val), - giop_objkey_init_count * sizeof(struct giop_object_val), + giop_objkey_init_count * sizeof(struct giop_object_val), G_ALLOC_AND_FREE); /* * Create complete_reply_hash, use my "equal" and "hash" functions. - * + * */ if (giop_complete_reply_hash) @@ -1384,40 +1384,40 @@ static void giop_init(void) { /* * Create hash, use my "equal" and "hash" functions. - * + * */ giop_complete_reply_hash = g_hash_table_new(complete_reply_hash_fn, complete_reply_equal_fn); giop_complete_reply_keys = g_mem_chunk_new("giop_complete_reply_keys", sizeof(struct complete_reply_hash_key), - complete_reply_hash_count * sizeof(struct complete_reply_hash_key), + complete_reply_hash_count * sizeof(struct complete_reply_hash_key), G_ALLOC_AND_FREE); - giop_complete_reply_vals = g_mem_chunk_new("giop_complete_reply_vals", + giop_complete_reply_vals = g_mem_chunk_new("giop_complete_reply_vals", sizeof(struct complete_reply_hash_val), - complete_reply_hash_count * sizeof(struct complete_reply_hash_val), + complete_reply_hash_count * sizeof(struct complete_reply_hash_val), G_ALLOC_AND_FREE); - + read_IOR_strings_from_file("IOR.txt", 600); /* testing */ } -/* +/* * Insert an entry in the GIOP Heuristic User table. * Uses a GList. * Uses giop_sub_handle_t to wrap giop user info. * */ - + void register_giop_user(giop_sub_dissector_t *sub, gchar *name, int sub_proto) { giop_sub_handle_t *subh; - + subh = g_malloc(sizeof (giop_sub_handle_t)); subh->sub_name = name; @@ -1425,7 +1425,7 @@ void register_giop_user(giop_sub_dissector_t *sub, gchar *name, int sub_proto) { subh->sub_proto = sub_proto; /* proto_XXX from sub dissectors's proto_register_protocol() */ giop_sub_list = g_slist_append (giop_sub_list, subh); - + } @@ -1454,24 +1454,24 @@ static gchar * get_repoid_from_objkey(GHashTable *hash, guint8 *obj, guint32 len return objkey_val->repo_id; /* found */ } -#if DEBUG +#if DEBUG printf("FAILED Lookup of object key \n" ); #endif - + return NULL; /* not found */ } /* - * Extract top level module/interface from repoid + * Extract top level module/interface from repoid * * eg from - "IDL:Echo/interface1:1.0" * get "Echo" * * Or, from "IDL:linux.org/Penguin/Teeth:1.0" get * get linux.org/Penguin/Teeth - * + * * * User must free returned ptr after use. * @@ -1503,15 +1503,15 @@ static gchar * get_modname_from_repoid(gchar *repoid) { stop_mod = i; /* save */ if (c == ':' ) /* delimiters */ break; - + } /* Now create a new string based on start and stop and \0 */ - + modname = g_strndup(repoid+4, stop_mod - start_mod); - + return modname; - + } /* @@ -1532,7 +1532,7 @@ static void display_module_hash(gpointer key, gpointer val, gpointer user_data) struct giop_module_key *mk = (struct giop_module_key *) key; printf("giop:module: Key = (%s) , Val = (%s) \n", mk->module, mv->subh->sub_name); - + return; } @@ -1547,7 +1547,7 @@ static void display_complete_reply_hash(gpointer key, gpointer val, gpointer use struct complete_reply_hash_key *mk = (struct complete_reply_hash_key *) key; printf("giop:complete_reply: FN (key) = %8u , MFN (val) = %8u \n", mk->fn, mv->mfn); - + return; } @@ -1577,9 +1577,9 @@ static void display_objkey_hash(gpointer key, gpointer val, gpointer user_data) printf(", Repo ID = %s \n", mv->repo_id); } else { - printf(", Repo ID = %s , (file) \n", mv->repo_id); + printf(", Repo ID = %s , (file) \n", mv->repo_id); } - + return; } @@ -1592,7 +1592,7 @@ static void display_heuristic_user_list() { int i; int len; giop_sub_handle_t *subh; /* handle */ - + /* Get length of list */ len = g_slist_length(giop_sub_list); /* find length */ @@ -1603,7 +1603,7 @@ static void display_heuristic_user_list() { subh = ( giop_sub_handle_t *) g_slist_nth_data(giop_sub_list,i); /* grab entry */ printf("giop:heuristic_user: Element = %i, Val (user) = %s \n", i, subh->sub_name); } - + } /* @@ -1614,7 +1614,7 @@ static void display_complete_request_list() { int i; int len; comp_req_list_entry_t *entry; - + /* Get length of list */ len = g_list_length(giop_complete_request_list); /* find length */ @@ -1623,16 +1623,16 @@ static void display_complete_request_list() { for (i=0; i<len; i++) { entry = (comp_req_list_entry_t *) g_list_nth_data(giop_complete_request_list,i); /* grab entry */ - printf("giop:Index = %8i , FN = %8i, reqid = %8u , operation = %20s , repoid = %30s \n", i, entry->fn, + printf("giop:Index = %8i , FN = %8i, reqid = %8u , operation = %20s , repoid = %30s \n", i, entry->fn, entry->reqid,entry->operation, entry->repoid); } - + } -/* Dump Hash/List contents +/* Dump Hash/List contents * * collection_type specifies the list or hash to dump * @@ -1690,7 +1690,7 @@ static void giop_dump_collection(collection_data_t collection_type) { printf("+----------------------------------------------+ \n"); printf("+-------------- Objkey (End) ------------------+ \n"); printf("+----------------------------------------------+ \n\n"); - + break; case cd_complete_reply_hash: @@ -1705,7 +1705,7 @@ static void giop_dump_collection(collection_data_t collection_type) { printf("+----------------------------------------------+ \n"); break; - + default: printf("giop: giop_dump_collection: Unknown type \n"); @@ -1731,7 +1731,7 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, int i,len; gboolean res = FALSE; /* result of calling a heuristic sub dissector */ - giop_sub_handle_t *subh = NULL; + giop_sub_handle_t *subh = NULL; const char *saved_proto; len = g_slist_length(giop_sub_list); /* find length */ @@ -1750,7 +1750,7 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, if (res) { pinfo->current_proto = saved_proto; return TRUE; /* found one, lets return */ - } + } } /* protocol_is_enabled */ } /* loop */ @@ -1766,10 +1766,10 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, /* * Find the matching repoid in the module hash and call * the dissector function if offset exists. - * * - * Repoid is eg IDL:tux.antarctic/Penguin/Teeth:1.0 but subdissectors - * will register possibly "tux.antarctic/Penguin" and "tux.antarctic/Penguin/Teeth". + * + * Repoid is eg IDL:tux.antarctic/Penguin/Teeth:1.0 but subdissectors + * will register possibly "tux.antarctic/Penguin" and "tux.antarctic/Penguin/Teeth". * * * @@ -1787,10 +1787,10 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p /* - * Get top level module/interface from complete repoid + * Get top level module/interface from complete repoid */ - modname = get_modname_from_repoid(repoid); + modname = get_modname_from_repoid(repoid); if (modname == NULL) { return res; /* unknown module name */ } @@ -1804,7 +1804,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p if (module_val == NULL) { return res; /* module not registered */ } - + subdiss = (giop_sub_handle_t *) module_val->subh; /* grab dissector handle */ if (subdiss) { @@ -1818,8 +1818,8 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p /* Call subdissector if current offset exists , and dissector is enabled in GUI "edit protocols" */ - if (tvb_offset_exists(tvb, *offset)) { -#if DEBUG + if (tvb_offset_exists(tvb, *offset)) { +#if DEBUG printf("giop:try_explicit_dissector calling sub = %s with module = (%s) \n", subdiss->sub_name , modname); #endif @@ -1834,7 +1834,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p } /* protocol_is_enabled */ } /* offset exists */ } /* subdiss */ - + return res; /* return result */ } @@ -1845,7 +1845,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p * * The array may contain \0's so dont use strdup * The string is \0 terminated, and thus longer than - * the initial sequence. + * the initial sequence. * Caller must free the new string. */ @@ -1855,9 +1855,9 @@ static gchar * make_printable_string (gchar *in, guint32 len) { print_string = (gchar * )g_malloc0(len + 1); /* make some space and zero it */ memcpy(print_string, in, len); /* and make a copy of input data */ - + for(i=0; i < len; i++) { - if( !isprint( (unsigned char)print_string[i] ) ) + if( !isprint( (unsigned char)print_string[i] ) ) print_string[i] = '.'; } @@ -1891,13 +1891,13 @@ gboolean is_big_endian (MessageHeader * header) { -/* - * Calculate new offset, based on the current offset, and user supplied +/* + * Calculate new offset, based on the current offset, and user supplied * "offset delta" value, and the alignment requirement. * * * - * eg: Used for GIOP 1.2 where Request and Reply bodies are + * eg: Used for GIOP 1.2 where Request and Reply bodies are * aligned on 8 byte boundaries. */ @@ -1912,7 +1912,7 @@ static void set_new_alignment(int *offset, int delta, int alignment) { /* - * ------------------------------------------------------------------------------------------+ + * ------------------------------------------------------------------------------------------+ * Public get_CDR_xxx functions. * ------------------------------------------------------------------------------------------+ */ @@ -1924,10 +1924,10 @@ static void set_new_alignment(int *offset, int delta, int alignment) { * followed by the encoded value. */ -void get_CDR_any(tvbuff_t *tvb, proto_tree *tree, gint *offset, +void get_CDR_any(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header ) { - + guint32 TCKind; /* TypeCode */ /* get TypeCode of any */ @@ -1938,7 +1938,7 @@ void get_CDR_any(tvbuff_t *tvb, proto_tree *tree, gint *offset, } -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a boolean value, and convert * it to a boolean value. * Offset is then incremented by 1, to indicate the 1 octet which @@ -1953,7 +1953,7 @@ gboolean get_CDR_boolean(tvbuff_t *tvb, int *offset) { return val; } -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a char, and convert * it to an char value. * offset is then incremented by 1, to indicate the 1 octet which @@ -1970,10 +1970,10 @@ guint8 get_CDR_char(tvbuff_t *tvb, int *offset) { -/* - * Floating Point Data Type double IEEE 754-1985 +/* + * Floating Point Data Type double IEEE 754-1985 * - * Copy an 8 octet sequence from the tvbuff + * Copy an 8 octet sequence from the tvbuff * which represents a double value, and convert * it to a double value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2000,7 +2000,7 @@ gdouble get_CDR_double(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian } -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents an enum value, and convert * it to an enum value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2024,13 +2024,13 @@ guint32 get_CDR_enum(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, * which represents a Fixed point decimal type, and create a string representing * a Fixed point decimal type. There are no alignment restrictions. * Size and scale of fixed decimal type is determined by IDL. - * + * * digits - IDL specified number of "digits" for this fixed type * scale - IDL specified "scale" for this fixed type * * * eg: typedef fixed <5,2> fixed_t; - * could represent numbers like 123.45, 789.12, + * could represent numbers like 123.45, 789.12, * * * As the fixed type could be any size, I will not try to fit it into our @@ -2038,7 +2038,7 @@ guint32 get_CDR_enum(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, * a representation (after scale is applied), and with a decimal point or zero padding * inserted at the right place if necessary. The string is null terminated * - * so string may look like + * so string may look like * * * "+1.234" or "-3456.78" or "1234567309475760377365465897891" or "-2789000000" etc @@ -2063,7 +2063,7 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin guint8 tval; /* temp val storage */ /* - * how many bytes to hold digits and scale (if scale <0) + * how many bytes to hold digits and scale (if scale <0) * * eg: fixed <5,2> = 5 digits * fixed <5,-2> = 7 digits (5 + 2 added 0's) @@ -2082,8 +2082,8 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin #if DEBUG printf("giop:get_CDR_fixed(): slen = %.2x \n", slen); #endif - - tmpbuf = g_new0(gchar, slen); /* allocate temp buffer */ + + tmpbuf = g_new0(gchar, slen); /* allocate temp buffer */ /* * Register a cleanup function in case on of our tvbuff accesses @@ -2103,8 +2103,8 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin } /* - * Loop, but stop BEFORE we hit last digit and sign - * if digits = 1 or 2, then this part is skipped + * Loop, but stop BEFORE we hit last digit and sign + * if digits = 1 or 2, then this part is skipped */ if (digits>2) { @@ -2113,19 +2113,19 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin #if DEBUG printf("giop:get_CDR_fixed():odd: octet = %.2x \n", tval); #endif - + tmpbuf[sindex] = ((tval & 0xf0) >> 4) + 0x30; /* convert top nibble to ascii */ sindex++; tmpbuf[sindex] = (tval & 0x0f) + 0x30; /* convert bot nibble to ascii */ sindex++; - + } } /* digits > 3 */ #if DEBUG printf("giop:get_CDR_fixed(): before last digit \n"); #endif - + /* Last digit and sign if digits >1, or 1st dig and sign if digits = 1 */ @@ -2138,22 +2138,22 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin sign = tval & 0x0f; /* get sign */ - /* So now, we have all digits in an array, and the sign byte + /* So now, we have all digits in an array, and the sign byte * so lets generate a printable string, taking into account the scale * and sign values. */ - + sindex = 0; /* reset */ - *seq = g_new0(gchar, slen + 3); /* allocate temp buffer , including space for sign, decimal point and + *seq = g_new0(gchar, slen + 3); /* allocate temp buffer , including space for sign, decimal point and * \0 -- TODO check slen is reasonable first */ #if DEBUG printf("giop:get_CDR_fixed(): sign = %.2x \n", sign); -#endif - +#endif + switch(sign) { case 0x0c: (*seq)[sindex] = '+'; /* put sign in first string position */ - break; + break; case 0x0d: (*seq)[sindex] = '-'; break; @@ -2171,19 +2171,19 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin if (scale>0) { for (i=0; i<digits-scale; i++) { - (*seq)[sindex] = tmpbuf[i]; /* digits to the left of the decimal point */ + (*seq)[sindex] = tmpbuf[i]; /* digits to the left of the decimal point */ sindex++; } - - (*seq)[sindex] = '.'; /* decimal point */ + + (*seq)[sindex] = '.'; /* decimal point */ sindex++; - + for (i=digits-scale; i<digits; i++) { - (*seq)[sindex] = tmpbuf[i]; /* remaining digits to the right of the decimal point */ + (*seq)[sindex] = tmpbuf[i]; /* remaining digits to the right of the decimal point */ sindex++; } - (*seq)[sindex] = '\0'; /* string terminator */ + (*seq)[sindex] = '\0'; /* string terminator */ } else { @@ -2191,15 +2191,15 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin for (i=0; i<digits-scale; i++) { if (i<digits) { - (*seq)[sindex] = tmpbuf[i]; /* save digits */ + (*seq)[sindex] = tmpbuf[i]; /* save digits */ } else { - (*seq)[sindex] = '0'; /* all digits used up, so pad with 0's */ + (*seq)[sindex] = '0'; /* all digits used up, so pad with 0's */ } sindex++; } - (*seq)[sindex] = '\0'; /* string terminator */ - + (*seq)[sindex] = '\0'; /* string terminator */ + } /* @@ -2207,21 +2207,21 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin * it, and then pop the cleanup handler. */ CLEANUP_CALL_AND_POP; - + #if DEBUG printf("giop:get_CDR_fixed(): value = %s \n", *seq); #endif - return; + return; } /* - * Floating Point Data Type float IEEE 754-1985 - * - * Copy an 4 octet sequence from the tvbuff + * Floating Point Data Type float IEEE 754-1985 + * + * Copy an 4 octet sequence from the tvbuff * which represents a float value, and convert * it to a float value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2231,9 +2231,9 @@ void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, guint32 digits, gin */ gfloat get_CDR_float(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, int boundary) { - + gfloat val; - + /* float values must be aligned on a 4 byte boundary */ while( ( (*offset + boundary) % 4) != 0) @@ -2252,17 +2252,17 @@ gfloat get_CDR_float(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, * Decode an Interface type, and display it on the tree. */ -void get_CDR_interface(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, +void get_CDR_interface(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, gboolean stream_is_big_endian, int boundary) { decode_IOR(tvb, pinfo, tree, offset, boundary, stream_is_big_endian); - + return; } -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents a signed long value, and convert * it to an signed long vaule, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2282,24 +2282,24 @@ gint32 get_CDR_long(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, i val = (stream_is_big_endian) ? tvb_get_ntohl (tvb, *offset) : tvb_get_letohl (tvb, *offset); - *offset += 4; - return val; + *offset += 4; + return val; } /* * Decode an Object type, and display it on the tree. */ -void get_CDR_object(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, +void get_CDR_object(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, gboolean stream_is_big_endian, int boundary) { - + decode_IOR(tvb, pinfo, tree, offset, boundary, stream_is_big_endian); - + return; } -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a octet, and convert * it to an octet value. * offset is then incremented by 1, to indicate the 1 octet which @@ -2316,9 +2316,9 @@ guint8 get_CDR_octet(tvbuff_t *tvb, int *offset) { /* Copy a sequence of octets from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. - * This function also increments offset by len. + * This function also increments offset by len. */ void get_CDR_octet_seq(tvbuff_t *tvb, gchar **seq, int *offset, guint32 len) { @@ -2344,7 +2344,7 @@ void get_CDR_octet_seq(tvbuff_t *tvb, gchar **seq, int *offset, guint32 len) { } -/* Copy a 2 octet sequence from the tvbuff +/* Copy a 2 octet sequence from the tvbuff * which represents a signed short value, and convert * it to a signed short value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2364,13 +2364,13 @@ gint16 get_CDR_short(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, val = (stream_is_big_endian) ? tvb_get_ntohs (tvb, *offset) : tvb_get_letohs (tvb, *offset); - *offset += 2; - return val; + *offset += 2; + return val; } -/* Copy an octet sequence from the tvbuff +/* Copy an octet sequence from the tvbuff * which represents a string, and convert * it to an string value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2389,9 +2389,9 @@ gint16 get_CDR_short(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, */ -guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_is_big_endian, +guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_is_big_endian, int boundary ) { - + guint32 slength; slength = get_CDR_ulong(tvb,offset,stream_is_big_endian,boundary); /* get length first */ @@ -2399,7 +2399,7 @@ guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_ #if 0 (*offset)++; /* must step past \0 delimiter */ #endif - + if (slength > 0) { get_CDR_octet_seq(tvb, seq, offset, slength); } else { @@ -2410,18 +2410,18 @@ guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_ } -/* Process a sequence of octets that represent the +/* Process a sequence of octets that represent the * Pseudo Object Type "TypeCode". Typecodes are used for example, - * by "Any values". + * by "Any values". * This function also increments offset to the correct position. * * It will parse the TypeCode and output data to the "tree" provided * by the user * - * It returns a guint32 representing a TCKind value. + * It returns a guint32 representing a TCKind value. */ -guint32 get_CDR_typeCode(tvbuff_t *tvb, proto_tree *tree, gint *offset, +guint32 get_CDR_typeCode(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header ) { guint32 val; @@ -2552,7 +2552,7 @@ guint32 get_CDR_typeCode(tvbuff_t *tvb, proto_tree *tree, gint *offset, -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents an unsigned long value, and convert * it to an unsigned long vaule, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2572,12 +2572,12 @@ guint32 get_CDR_ulong(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, val = (stream_is_big_endian) ? tvb_get_ntohl (tvb, *offset) : tvb_get_letohl (tvb, *offset); - *offset += 4; - return val; + *offset += 4; + return val; } -/* Copy a 2 octet sequence from the tvbuff +/* Copy a 2 octet sequence from the tvbuff * which represents an unsigned short value, and convert * it to an unsigned short value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -2597,14 +2597,14 @@ guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian val = (stream_is_big_endian) ? tvb_get_ntohs (tvb, *offset) : tvb_get_letohs (tvb, *offset); - *offset += 2; - return val; + *offset += 2; + return val; } /* Copy a wchar from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. * This function also increments offset according to * the wchar size. @@ -2624,7 +2624,7 @@ guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian /* NOTE: This is very primitive in that it just reads * the wchar as a series of octets and returns them * to the user. No translation is attempted based on - * byte orientation, nor on code set. I.e it only + * byte orientation, nor on code set. I.e it only * really reads past the wchar and sets the offset * correctly. */ @@ -2634,7 +2634,7 @@ guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian */ gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, MessageHeader * header) { - + gint slength; gchar *raw_wstring; @@ -2671,7 +2671,7 @@ gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, MessageHeader * head /* Copy a wstring from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. * This function also increments offset, according to * wstring length. length is returned as guint32 @@ -2680,7 +2680,7 @@ gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, MessageHeader * head /* NOTE: This is very primitive in that it just reads * the wstring as a series of octets and returns them * to the user. No translation is attempted based on - * byte orientation, nor on code set. I.e it only + * byte orientation, nor on code set. I.e it only * really reads past the wstring and sets the offset * correctly. */ @@ -2690,9 +2690,9 @@ gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, MessageHeader * head */ -guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_is_big_endian, +guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header) { - + guint32 slength; gchar *raw_wstring; @@ -2706,7 +2706,7 @@ guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream *seq = NULL; /* set in case GIOP 1.2 length is 0 */ /* get length, same for all GIOP versions, - * although for 1.2 CORBA doesnt say, so assume. + * although for 1.2 CORBA doesnt say, so assume. */ slength = get_CDR_ulong(tvb,offset,stream_is_big_endian,boundary); @@ -2716,7 +2716,7 @@ guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream slength = 5; /* better than core dumping during debug */ } #endif - + if (header->GIOP_version.minor < 2) { #if 0 (*offset)++; /* must step past \0 delimiter */ @@ -2760,7 +2760,7 @@ guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream */ static void -dissect_target_address(tvbuff_t * tvb, packet_info *pinfo, int *offset, proto_tree * tree, +dissect_target_address(tvbuff_t * tvb, packet_info *pinfo, int *offset, proto_tree * tree, gboolean stream_is_big_endian) { guint16 discriminant; @@ -2775,7 +2775,7 @@ dissect_target_address(tvbuff_t * tvb, packet_info *pinfo, int *offset, proto_tr proto_tree_add_text (tree, tvb, *offset -2, 2, "TargetAddress Discriminant: %u", discriminant); } - + switch (discriminant) { case 0: /* KeyAddr */ @@ -2790,7 +2790,7 @@ dissect_target_address(tvbuff_t * tvb, packet_info *pinfo, int *offset, proto_tr get_CDR_octet_seq(tvb, &object_key, offset, len); p_object_key = make_printable_string( object_key, len ); - + if(tree) { proto_tree_add_text (tree, tvb, *offset -len, len, @@ -2828,13 +2828,13 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, guint sequence_length; gboolean exres = FALSE; /* result of trying explicit dissectors */ gchar * repoid = NULL; /* Repositor ID looked up from objkey */ - + /* * comp_req_list stuff */ comp_req_list_entry_t * entry = NULL; /* data element in our list */ - + guint32 mfn; switch (reply_status) @@ -2868,10 +2868,10 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, /* read exception id from buffer and store in*/ tvb_get_nstringz0(tvb,offset,sequence_length, header->exception_id ); - -#endif - + +#endif + offset += sequence_length; } @@ -2882,16 +2882,16 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, * Now just fall through to the NO_EXCEPTION part * as this is common . */ - + case NO_EXCEPTION: /* lookup MFN in hash directly */ - - mfn = get_mfn_from_fn(pinfo->fd->num); - + + mfn = get_mfn_from_fn(pinfo->fd->num); + if (mfn == pinfo->fd->num) return; /* no matching frame number, what am I */ @@ -2900,19 +2900,19 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, if (!entry) return; /* no matching entry */ - + /* - * If this packet is a REPLY to a RESOLVE(request) + * If this packet is a REPLY to a RESOLVE(request) * then decode IOR. * TODO - make this lookup faster -- FS */ - + if (!strcmp(giop_op_resolve,entry->operation)) { decode_IOR(tvb, pinfo, tree, &offset, GIOP_HEADER_SIZE,stream_is_big_endian); return; /* done */ } - + /* TODO -- Put stuff here for other "interesting operations" */ /* @@ -2923,7 +2923,7 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, */ - if(entry->repoid) { + if(entry->repoid) { exres = try_explicit_giop_dissector(tvb,pinfo,clnp_tree, &offset, header, entry->operation, entry->repoid ); } @@ -2931,11 +2931,11 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, if(! exres) { try_heuristic_giop_dissector(tvb,pinfo,clnp_tree,&offset,header,entry->operation); - } + } break; - + case LOCATION_FORWARD: decode_IOR(tvb, pinfo, tree, &offset, GIOP_HEADER_SIZE, stream_is_big_endian); @@ -2958,17 +2958,17 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, } default: - + g_warning("giop: Unknown reply status %i request_id = %u\n",reply_status, header->req_id); - + break; - + } /* switch */ - + g_free(repoid); /* free resource */ - + return; /* done */ - + } @@ -3002,14 +3002,14 @@ static void dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree if (reply_tree == NULL) { reply_tree = proto_item_add_subtree (tf, ett_giop_reply); - + } } - + /* * Decode IOP::ServiceContextList */ - + decode_ServiceContextList(tvb, reply_tree, &offset,stream_is_big_endian, GIOP_HEADER_SIZE); request_id = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); @@ -3035,7 +3035,7 @@ static void dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree proto_tree_add_text (reply_tree, tvb, offset-4, 4, "Reply status: %s", val_to_str(reply_status, reply_status_types, "Unknown (%u)")); - + } /* @@ -3065,7 +3065,7 @@ static void dissect_giop_reply (tvbuff_t * tvb, packet_info * pinfo, proto_tree * struct ReplyHeader_1_2 { * unsigned long request_id; * ReplyStatusType_1_2 reply_status; - * IOP:ServiceContextList service_context; + * IOP:ServiceContextList service_context; * }; */ @@ -3080,15 +3080,15 @@ static void dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree *reply_tree = NULL; proto_item *tf; guint32 mfn; /* matching frame number */ - + if (tree) { tf = proto_tree_add_text (tree, tvb, offset, -1, "General Inter-ORB Protocol Reply"); reply_tree = proto_item_add_subtree (tf, ett_giop_reply); } - + request_id = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " %u", request_id); } @@ -3099,7 +3099,7 @@ static void dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, } reply_status = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str(reply_status, reply_status_types, "Unknown (%u)")); @@ -3128,7 +3128,7 @@ static void dissect_giop_reply_1_2 (tvbuff_t * tvb, packet_info * pinfo, /* * Save FN and MFN in complete_reply_hash, only if user is NOT clicking */ - + if (! pinfo->fd->flags.visited) { mfn = get_mfn_from_fn_and_reqid(pinfo->fd->num,request_id); /* find MFN for this FN */ if (mfn != pinfo->fd->num) { /* if mfn is not fn, good */ @@ -3166,7 +3166,7 @@ static void dissect_giop_cancel_request (tvbuff_t * tvb, packet_info * pinfo, } request_id = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " %u", request_id); } @@ -3176,7 +3176,7 @@ static void dissect_giop_cancel_request (tvbuff_t * tvb, packet_info * pinfo, "Request id: %u", request_id); } - + } /** The formats for GIOP 1.0 and 1.1 Request messages are defined @@ -3234,7 +3234,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, /* * Decode IOP::ServiceContextList */ - + decode_ServiceContextList(tvb, request_tree, &offset,stream_is_big_endian, GIOP_HEADER_SIZE); @@ -3283,7 +3283,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, { proto_tree_add_text (request_tree, tvb, offset-4, 4, /**/ "Object Key length: %u", objkey_len); - } + } if (objkey_len > 0) { @@ -3298,8 +3298,8 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, } - g_free( print_objkey ); - } + g_free( print_objkey ); + } /* * Register a cleanup function in case on of our tvbuff accesses @@ -3307,13 +3307,13 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, */ CLEANUP_PUSH(g_free, objkey); - /* length of operation string and string */ + /* length of operation string and string */ len = get_CDR_string(tvb, &operation, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); if(tree) { proto_tree_add_text (request_tree, tvb, offset - 4 - len, 4, /**/ "Operation length: %u", len); - } + } if( len > 0) { @@ -3335,13 +3335,13 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, */ CLEANUP_PUSH(g_free, operation); - /* length of requesting_principal string */ + /* length of requesting_principal string */ len = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); if(tree) { proto_tree_add_text (request_tree, tvb, offset-4, 4, /**/ "Requesting Principal Length: %u", len); - } + } if( len > 0) { @@ -3351,7 +3351,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, if(tree) { - proto_tree_add_text (request_tree, tvb, offset - len, len, + proto_tree_add_text (request_tree, tvb, offset - len, len, /**/ "Requesting Principal: %s", print_requesting_principal); } @@ -3370,10 +3370,10 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list,pinfo->fd->num, request_id,operation,NULL); - + /* * Call subdissector here before freeing "operation" and "key" - * pass request_id also. + * pass request_id also. * First try an find an explicit sub_dissector, then if that * fails, try the heuristic method. * @@ -3384,7 +3384,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, repoid = get_repoid_from_objkey(giop_objkey_hash,objkey,objkey_len); - if(repoid) { + if(repoid) { exres = try_explicit_giop_dissector(tvb,pinfo,tree,&offset,header,operation,repoid); } @@ -3393,7 +3393,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, if (! exres) { try_heuristic_giop_dissector(tvb,pinfo,tree,&offset,header,operation); } - + /* * We're done with operation, so we can call the cleanup handler to free @@ -3409,7 +3409,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo, } -/** The format of a GIOP 1.2 RequestHeader message is +/** The format of a GIOP 1.2 RequestHeader message is * (CORBA 2.4, sec. 15.4.2): * * struct RequestHeader_1_2 { @@ -3464,7 +3464,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, { proto_tree_add_text (request_tree, tvb, offset-1, 1, "Response flags: %s (%u)", - match_strval(response_flags, sync_scope), + match_strval(response_flags, sync_scope), response_flags); } @@ -3478,13 +3478,13 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, dissect_target_address(tvb, pinfo, &offset, request_tree, stream_is_big_endian); - /* length of operation string */ + /* length of operation string */ len = get_CDR_string(tvb, &operation, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); if(tree) { proto_tree_add_text (request_tree, tvb, offset - len - 4, 4, /**/ "Operation length: %u", len); - } + } if( len > 0) { @@ -3525,7 +3525,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, * Save FN,reqid,and operation for later. Add sub_handle later. * But only if user is NOT clicking. */ - + if (! pinfo->fd->flags.visited) giop_complete_request_list = insert_in_comp_req_list(giop_complete_request_list,pinfo->fd->num, request_id,operation,NULL); @@ -3536,9 +3536,9 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, * First try an find a explicit sub_dissector, then if that * fails, try the heuristic method. */ - - if(repoid) { + + if(repoid) { exres = try_explicit_giop_dissector(tvb,pinfo,tree,&offset,header,operation,repoid); } @@ -3547,7 +3547,7 @@ dissect_giop_request_1_2 (tvbuff_t * tvb, packet_info * pinfo, if (! exres) { try_heuristic_giop_dissector(tvb,pinfo,tree,&offset,header,operation); } - + /* * We're done with operation, so we can call the cleanup handler to free @@ -3604,7 +3604,7 @@ dissect_giop_locate_request( tvbuff_t * tvb, packet_info * pinfo, get_CDR_octet_seq(tvb, &object_key, &offset, len); p_object_key = make_printable_string(object_key, len); - + if(locate_request_tree) { @@ -3618,7 +3618,7 @@ dissect_giop_locate_request( tvbuff_t * tvb, packet_info * pinfo, } else /* GIOP 1.2 and higher */ { - dissect_target_address(tvb, pinfo, &offset, locate_request_tree, + dissect_target_address(tvb, pinfo, &offset, locate_request_tree, stream_is_big_endian); } @@ -3663,7 +3663,7 @@ dissect_giop_locate_reply( tvbuff_t * tvb, packet_info * pinfo, if (locate_reply_tree) { proto_tree_add_text (locate_reply_tree, tvb, offset-4, 4, - "Locate status: %s", + "Locate status: %s", match_strval(locate_status, giop_locate_status_types) ); } @@ -3731,7 +3731,7 @@ dissect_giop_fragment( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, proto_tree_add_text (fragment_tree, tvb, offset-4, 4, "Request id: %u", request_id); } - + } @@ -3751,7 +3751,7 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { /* DEBUG */ - + #if DEBUG giop_dump_collection(cd_module_hash); giop_dump_collection(cd_objkey_hash); @@ -3776,7 +3776,7 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { giop_header_tvb = tvb_new_subset (tvb, 0, GIOP_HEADER_SIZE, -1); payload_tvb = tvb_new_subset (tvb, GIOP_HEADER_SIZE, -1, -1); - + /* * because I have added extra elements in MessageHeader struct * for sub dissectors. -- FS @@ -3825,8 +3825,8 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { return TRUE; } - if (check_col (pinfo->cinfo, COL_INFO)) - { + if (check_col (pinfo->cinfo, COL_INFO)) + { col_add_fstr (pinfo->cinfo, COL_INFO, "GIOP %u.%u %s", header.GIOP_version.major, header.GIOP_version.minor, val_to_str(header.message_type, giop_message_types, @@ -3882,8 +3882,8 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { } /* tree */ #if 0 - if (check_col (pinfo->cinfo, COL_INFO)) - { + if (check_col (pinfo->cinfo, COL_INFO)) + { col_add_fstr (pinfo->cinfo, COL_INFO, "GIOP %u.%u %s", header.GIOP_version.major, header.GIOP_version.minor, match_strval(header.message_type, giop_message_types)); @@ -3900,11 +3900,11 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { &header, stream_is_big_endian); } else - { + { dissect_giop_request_1_2 (payload_tvb, pinfo, tree, &header, stream_is_big_endian); } - + break; @@ -3935,7 +3935,7 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { case Fragment: dissect_giop_fragment(payload_tvb, pinfo, tree, stream_is_big_endian); - break; + break; default: break; @@ -3961,7 +3961,7 @@ proto_register_giop (void) { "Message type", "giop.type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, - + { &hf_giop_message_size, { "Message size", "giop.len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } @@ -4199,17 +4199,17 @@ proto_register_giop (void) */ giop_module_hash = g_hash_table_new(giop_hash_module_hash, giop_hash_module_equal); - + giop_module_keys = g_mem_chunk_new("giop_module_keys", sizeof(struct giop_module_key), - giop_module_init_count * sizeof(struct giop_module_key), + giop_module_init_count * sizeof(struct giop_module_key), G_ALLOC_AND_FREE); - - giop_module_vals = g_mem_chunk_new("giop_module_vals", + + giop_module_vals = g_mem_chunk_new("giop_module_vals", sizeof(struct giop_module_val), - giop_module_init_count * sizeof(struct giop_module_val), + giop_module_init_count * sizeof(struct giop_module_val), G_ALLOC_AND_FREE); - + } @@ -4233,7 +4233,7 @@ void proto_reg_handoff_giop (void) { /* -module IOP{ +module IOP{ typedef unsigned long ProfileId; @@ -4289,7 +4289,7 @@ void decode_IOR(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offse u_octet4 = get_CDR_string(tvb,&repobuf,offset,stream_is_big_endian,boundary); - if (tree) { + if (tree) { proto_tree_add_uint(tree,hf_giop_string_length,tvb, *offset-u_octet4-sizeof(u_octet4),4,u_octet4); if (u_octet4 > 0) { @@ -4308,16 +4308,16 @@ void decode_IOR(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offse /* Now get a sequence of profiles */ /* Get sequence length (number of elements) */ - + seqlen_p = get_CDR_ulong(tvb,offset,stream_is_big_endian,boundary); if (tree) { proto_tree_add_uint(tree,hf_giop_sequence_length,tvb, *offset-sizeof(seqlen_p),4,seqlen_p); } - + /* fetch all TaggedProfiles in this sequence */ - + for (i=0; i< seqlen_p; i++) { /* for every TaggedProfile */ decode_TaggedProfile(tvb, pinfo, tree, offset, boundary, stream_is_big_endian, repobuf); } @@ -4353,8 +4353,8 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } /* get sequence length, new endianness and boundary for encapsulation */ - - seqlen_pd = get_CDR_encap_info(tvb, tree, offset, + + seqlen_pd = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_big_endianess, &new_boundary); @@ -4363,10 +4363,10 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if(seqlen_pd == 0) return; - + /* - * Lets see what kind of TAG it is. If TAG_INTERNET_IOP then - * decode it, otherwise just dump the octet sequence + * Lets see what kind of TAG it is. If TAG_INTERNET_IOP then + * decode it, otherwise just dump the octet sequence * * also, store IOR in our objectkey hash * @@ -4375,31 +4375,31 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree * switch(pidtag) { case IOP_TAG_INTERNET_IOP: - + decode_IIOP_IOR_profile(tvb, pinfo, tree, offset, new_boundary, new_big_endianess, repobuf, TRUE); break; default: - + /* fetch all octets in this sequence , but skip endianess */ - + get_CDR_octet_seq(tvb, &profile_data, offset, seqlen_pd -1); - + /* Make a printable string */ - + p_profile_data = make_printable_string( profile_data, seqlen_pd -1); - + if(tree) { proto_tree_add_text (tree, tvb, *offset -seqlen_pd + 1, seqlen_pd - 1, "Profile Data: %s", p_profile_data); } - + g_free(p_profile_data); g_free(profile_data); break; - + } } @@ -4427,14 +4427,14 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre gchar *objkey; /* object key pointer */ gchar *p_chars; /* printable characters pointer */ - + /* Get major/minor version */ v_major = get_CDR_octet(tvb,offset); v_minor = get_CDR_octet(tvb,offset); - if (tree) { + if (tree) { proto_tree_add_uint(tree,hf_giop_iiop_v_maj,tvb, *offset-sizeof(v_minor)-sizeof(v_major),1,v_major ); proto_tree_add_uint(tree,hf_giop_iiop_v_min,tvb, @@ -4443,10 +4443,10 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* host */ - + u_octet4 = get_CDR_string(tvb,&buf,offset,stream_is_big_endian,boundary); - - if (tree) { + + if (tree) { proto_tree_add_uint(tree,hf_giop_string_length,tvb, *offset-u_octet4-sizeof(u_octet4),4,u_octet4); if (u_octet4 > 0) { @@ -4454,14 +4454,14 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre *offset-u_octet4,u_octet4,buf); } } - + g_free(buf); /* dont forget */ - + /* Port */ u_octet2 = get_CDR_ushort(tvb,offset,stream_is_big_endian,boundary); - if (tree) { + if (tree) { proto_tree_add_uint(tree,hf_giop_iiop_port,tvb, *offset-sizeof(u_octet2),2,u_octet2); } @@ -4477,7 +4477,7 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre } if (seqlen > 0) { - /* fetch all octets in this sequence */ + /* fetch all octets in this sequence */ get_CDR_octet_seq(tvb, &objkey, offset, seqlen); /* @@ -4492,38 +4492,38 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (repo_id_buf) { if (pinfo) { if(!pinfo->fd->flags.visited) - insert_in_objkey_hash(giop_objkey_hash,objkey,seqlen,repo_id_buf,req_res); + insert_in_objkey_hash(giop_objkey_hash,objkey,seqlen,repo_id_buf,req_res); } else { - + /* * No pinfo, but store anyway if flag set. eg: IOR read from file */ if (store_flag) - insert_in_objkey_hash(giop_objkey_hash,objkey,seqlen,repo_id_buf,file); + insert_in_objkey_hash(giop_objkey_hash,objkey,seqlen,repo_id_buf,file); } } /* Make a printable string */ - + p_chars = make_printable_string( objkey, seqlen ); - + if(tree) { proto_tree_add_text (tree, tvb, *offset -seqlen, seqlen, "Object Key: %s", p_chars); } g_free(p_chars); - g_free(objkey); + g_free(objkey); } - + /* * Now see if if its v1.1 or 1.2, as they can contain * extra sequence of IOP::TaggedComponents * */ - + switch(v_minor) { case 0: @@ -4564,12 +4564,12 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (tree) { /* Make a printable string of data */ - + p_chars = make_printable_string(buf, seqlen1); - + proto_tree_add_text (tree, tvb, *offset -seqlen1, seqlen1, "component_data: %s", p_chars); - + g_free(p_chars); } @@ -4585,11 +4585,11 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre g_warning("giop:Invalid v_minor value = %u ", v_minor); break; } - + } -/* +/* * Service Contexts Begin * */ @@ -4663,7 +4663,7 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, } /* Get sequence length (number of elements) */ - + seqlen = get_CDR_ulong(tvb,offset,stream_is_be,boundary); if (tree) { proto_tree_add_uint(tree,hf_giop_sequence_length,tvb, @@ -4674,7 +4674,7 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, if(seqlen == 0) return; - + /* Loop for all ServiceContext's */ for (i=0; i<seqlen; i++) { @@ -4688,7 +4688,7 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, *offset-sizeof(context_id),4,context_id); } - + vscid = context_id && 0xfffff000; /* vendor info, top 20 bits */ scid = context_id && 0x00000fff; /* standard service info, lower 12 bits */ @@ -4696,8 +4696,8 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, #if CONTEXT_DATA_IS_ENCAPSULATED /* get sequence length, new endianness and boundary for encapsulation */ - - seqlen_cd = get_CDR_encap_info(tvb, tree, offset, + + seqlen_cd = get_CDR_encap_info(tvb, tree, offset, stream_is_be, boundary, &new_big_endianess, &new_boundary); @@ -4713,20 +4713,20 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, if(seqlen_cd == 0) return; - + /* * Now decode sequence according to vendor ServiceId, but I dont * have that yet, so just dump it as data. - */ + */ /* fetch all octets in this sequence */ - + get_CDR_octet_seq(tvb, &context_data, offset, seqlen_cd); /* Make a printable string */ - + p_context_data = make_printable_string( context_data, seqlen_cd ); - + if(tree) { proto_tree_add_text (tree, tvb, *offset - seqlen_cd , seqlen_cd, "context_data: %s", p_context_data); @@ -4739,7 +4739,7 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, return; /* for now, fix later */ - + } @@ -4754,7 +4754,7 @@ static void decode_SystemExceptionReplyBody (tvbuff_t *tvb, proto_tree *tree, gi guint32 minor_code_value; guint32 completion_status; - gchar *buf; /* pointer to string buffer */ + gchar *buf; /* pointer to string buffer */ length = get_CDR_string(tvb, &buf, offset, stream_is_big_endian, boundary); @@ -4770,7 +4770,7 @@ static void decode_SystemExceptionReplyBody (tvbuff_t *tvb, proto_tree *tree, gi minor_code_value = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); completion_status = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); - + if (tree) { proto_tree_add_text(tree, tvb, *offset-8, 4, "Minor code value: %u", minor_code_value); @@ -4781,13 +4781,13 @@ static void decode_SystemExceptionReplyBody (tvbuff_t *tvb, proto_tree *tree, gi /* - * Helper functions for dissecting TypeCodes + * Helper functions for dissecting TypeCodes * * These functions decode the complex parameter lists * of TypeCodes as defined in the CORBA spec chapter 15. */ -static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary) { guint32 new_boundary; /* new boundary for encapsulation */ @@ -4796,7 +4796,7 @@ static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -4811,7 +4811,7 @@ static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offs } -static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header ) { @@ -4823,7 +4823,7 @@ static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 i; /* loop index */ /* get sequence lengt,h new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -4855,7 +4855,7 @@ static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offs } -static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -4870,7 +4870,7 @@ static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 i; /* loop index */ /* get sequence legnth, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -4914,7 +4914,7 @@ static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offse } -static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary) { guint32 new_boundary; /* new boundary for encapsulation */ @@ -4925,7 +4925,7 @@ static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -4954,7 +4954,7 @@ static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset } -static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -4966,7 +4966,7 @@ static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *of guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -4982,7 +4982,7 @@ static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *of } -static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -4994,7 +4994,7 @@ static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5010,7 +5010,7 @@ static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offse } -static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -5020,7 +5020,7 @@ static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 seqlen; /* sequence length */ /* get sequence legnth, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5038,7 +5038,7 @@ static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offse } -static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -5050,7 +5050,7 @@ static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5082,7 +5082,7 @@ static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offs } -static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -5096,7 +5096,7 @@ static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5145,7 +5145,7 @@ static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offse } -static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header) { @@ -5155,7 +5155,7 @@ static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *o guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5172,7 +5172,7 @@ static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *o } -static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary) { guint32 new_boundary; /* new boundary for encapsulation */ @@ -5181,7 +5181,7 @@ static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5196,7 +5196,7 @@ static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offs } -static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary) { guint32 new_boundary; /* new boundary for encapsulation */ @@ -5205,7 +5205,7 @@ static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree guint32 seqlen; /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + seqlen = get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5221,11 +5221,11 @@ static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree /* Typecode parameter lists are encoded as encapsulations and * this function gets the encapsulation information; see - * CORBA spec chapter 15 + * CORBA spec chapter 15 * * - * Renamed to get_CDR_encap_info() for any encapsulation - * we come across, useful helper function + * Renamed to get_CDR_encap_info() for any encapsulation + * we come across, useful helper function * * Also, should return immediately if seqlen == 0. * ie: Forget about trying to grab endianess for @@ -5236,17 +5236,17 @@ static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree * * Note: there seemed to be considerable confusion in corba * circles as to the correct interpretation of encapsulations, - * and zero length sequences etc, but this is our best bet at the + * and zero length sequences etc, but this is our best bet at the * moment. * * -- FS * */ -guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, +guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean old_stream_is_big_endian, guint32 old_boundary, gboolean *new_stream_is_big_endian_ptr, guint32 *new_boundary_ptr ) { - + guint32 seqlen; /* sequence length */ guint8 giop_endianess; @@ -5257,7 +5257,7 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, *offset-sizeof(seqlen),4,seqlen); } - + /* * seqlen == 0, implies no endianess and no data @@ -5300,12 +5300,12 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, } -/* +/* * gets a TypeCode complex string parameter and * displays it in the relevant tree. */ -static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean new_stream_is_big_endian, guint32 new_boundary, int hf_id ) { guint32 u_octet4; /* unsigned int32 */ @@ -5313,15 +5313,15 @@ static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint /* get string */ u_octet4 = get_CDR_string(tvb,&buf,offset,new_stream_is_big_endian,new_boundary); - - if (tree) { + + if (tree) { proto_tree_add_uint(tree,hf_giop_string_length,tvb, *offset-u_octet4-sizeof(u_octet4),4,u_octet4); if (u_octet4 > 0) { proto_tree_add_string(tree,hf_id,tvb,*offset-u_octet4,u_octet4,buf); } } - + g_free(buf); /* dont forget */ } @@ -5331,7 +5331,7 @@ static void dissect_typecode_string_param(tvbuff_t *tvb, proto_tree *tree, gint * and displays it in the relevant tree. */ -static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *offset, +static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, guint32 boundary, MessageHeader * header, guint32 data_type ) { @@ -5454,7 +5454,7 @@ static void dissect_data_for_typecode(tvbuff_t *tvb, proto_tree *tree, gint *off *offset-u_octet4,u_octet4,buf); } } - + g_free(buf); /* dont forget */ break; case tk_sequence: diff --git a/packet-giop.h b/packet-giop.h index 3e43eac4dc..ad4d67eaee 100644 --- a/packet-giop.h +++ b/packet-giop.h @@ -4,22 +4,22 @@ * * Based on CORBAv2.4.2 Chapter 15 GIOP Description. * - * $Id: packet-giop.h,v 1.9 2002/05/13 01:24:46 guy Exp $ + * $Id: packet-giop.h,v 1.10 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -40,7 +40,7 @@ typedef struct Version { } Version; -/* +/* * Useful data collected from message header. Note, this * struct encapsulates useful data from GIOP header, as well * as request_id and reply_status for use by sub dissectors. @@ -58,7 +58,7 @@ typedef struct MessageHeader { guint32 req_id; /* request id in MSG */ /* MSG dependant data */ - + guint32 rep_status; /* reply status in MSG if available */ gchar *exception_id; /* exception string if a USER EXCEPTION occurs */ @@ -173,7 +173,7 @@ extern void get_CDR_any(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header ); -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a boolean value, and convert * it to a boolean value. * Offset is then incremented by 1, to indicate the 1 octet which @@ -183,7 +183,7 @@ extern void get_CDR_any(tvbuff_t *tvb, proto_tree *tree, gint *offset, extern gboolean get_CDR_boolean(tvbuff_t *tvb, int *offset); -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a char, and convert * it to an char value. * offset is then incremented by 1, to indicate the 1 octet which @@ -194,10 +194,10 @@ extern guint8 get_CDR_char(tvbuff_t *tvb, int *offset); -/* - * Floating Point Data Type double IEEE 754-1985 +/* + * Floating Point Data Type double IEEE 754-1985 * - * Copy an 8 octet sequence from the tvbuff + * Copy an 8 octet sequence from the tvbuff * which represents a double value, and convert * it to a double value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -210,7 +210,7 @@ extern gdouble get_CDR_double(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, int boundary); -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents an enum value, and convert * it to an enum value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -231,13 +231,13 @@ extern guint32 get_CDR_enum(tvbuff_t *tvb, int *offset, * which represents a Fixed point decimal type, and create a string representing * a Fixed point decimal type. There are no alignment restrictions. * Size and scale of fixed decimal type is determined by IDL. - * + * * digits - IDL specified number of "digits" for this fixed type * scale - IDL specified "scale" for this fixed type * * * eg: typedef fixed <5,2> fixed_t; - * could represent numbers like 123.45, 789.12, + * could represent numbers like 123.45, 789.12, * * * As the fixed type could be any size, I will not try to fit it into our @@ -245,7 +245,7 @@ extern guint32 get_CDR_enum(tvbuff_t *tvb, int *offset, * a representation (after scale is applied), and with a decimal point or zero padding * inserted at the right place if necessary. The string is null terminated * - * so string may look like + * so string may look like * * * "+1.234" or "-3456.78" or "1234567309475760377365465897891" or "-2789000000" etc @@ -264,9 +264,9 @@ extern void get_CDR_fixed(tvbuff_t *tvb, gchar **seq, gint *offset, /* - * Floating Point Data Type float IEEE 754-1985 - * - * Copy a 4 octet sequence from the tvbuff + * Floating Point Data Type float IEEE 754-1985 + * + * Copy a 4 octet sequence from the tvbuff * which represents a float value, and convert * it to a float value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -287,7 +287,7 @@ extern void get_CDR_interface(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, gboolean stream_is_big_endian, int boundary); -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents a signed long value, and convert * it to an signed long vaule, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -301,7 +301,7 @@ extern gint32 get_CDR_long(tvbuff_t *tvb, int *offset, -/* Copy a 16 octet sequence from the tvbuff +/* Copy a 16 octet sequence from the tvbuff * which represents a long double value, and convert * it to a long double value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -324,7 +324,7 @@ extern gdouble get_CDR_long_double(tvbuff_t *tvb, int *offset, #endif -/* Copy an 8 octet sequence from the tvbuff +/* Copy an 8 octet sequence from the tvbuff * which represents a signed long long value, and convert * it to a signed long long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -346,7 +346,7 @@ extern void get_CDR_object(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, gboolean stream_is_big_endian, int boundary); -/* Copy a 1 octet sequence from the tvbuff +/* Copy a 1 octet sequence from the tvbuff * which represents a octet, and convert * it to an octet value. * offset is then incremented by 1, to indicate the 1 octet which @@ -357,14 +357,14 @@ extern guint8 get_CDR_octet(tvbuff_t *tvb, int *offset); /* Copy a sequence of octets from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. - * This function also increments offset by len. + * This function also increments offset by len. */ extern void get_CDR_octet_seq(tvbuff_t *tvb, gchar **seq, int *offset, guint32 len); -/* Copy a 2 octet sequence from the tvbuff +/* Copy a 2 octet sequence from the tvbuff * which represents a signed short value, and convert * it to a signed short value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -377,7 +377,7 @@ extern gint16 get_CDR_short(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, int boundary); -/* Copy an octet sequence from the tvbuff +/* Copy an octet sequence from the tvbuff * which represents a string, and convert * it to an string value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -399,21 +399,21 @@ extern guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, gboolean stream_is_big_endian, int boundary); -/* Process a sequence of octets that represent the +/* Process a sequence of octets that represent the * Pseudo Object Type "TypeCode". Typecodes are used for example, - * by "Any values". + * by "Any values". * This function also increments offset to the correct position. * * It will parse the TypeCode and output data to the "tree" provided * by the user * - * It returns a guint32 representing a TCKind value. + * It returns a guint32 representing a TCKind value. */ extern guint32 get_CDR_typeCode(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header ); -/* Copy a 4 octet sequence from the tvbuff +/* Copy a 4 octet sequence from the tvbuff * which represents an unsigned long value, and convert * it to an unsigned long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -426,7 +426,7 @@ extern guint32 get_CDR_ulong(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, int boundary); -/* Copy an 8 octet sequence from the tvbuff +/* Copy an 8 octet sequence from the tvbuff * which represents an unsigned long long value, and convert * it to an unsigned long long value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -441,7 +441,7 @@ extern guint64 get_CDR_ulong_long(tvbuff_t *tvb, int *offset, #endif -/* Copy a 2 octet sequence from the tvbuff +/* Copy a 2 octet sequence from the tvbuff * which represents an unsigned short value, and convert * it to an unsigned short value, taking into account byte order. * offset is first incremented so that it falls on a proper alignment @@ -455,7 +455,7 @@ extern guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, /* Copy a wchar from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. * This function also increments offset according to * the wchar size. @@ -475,7 +475,7 @@ extern guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, /* NOTE: This is very primitive in that it just reads * the wchar as a series of octets and returns them * to the user. No translation is attempted based on - * byte orientation, nor on code set. I.e it only + * byte orientation, nor on code set. I.e it only * really reads past the wchar and increments the offset * by the length of the octet sequence. */ @@ -489,7 +489,7 @@ extern gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, /* Copy a wstring from the tvbuff. - * Caller of this function must remember to free the + * Caller of this function must remember to free the * array pointed to by seq. * This function also increments offset, according to * wstring length. length is returned as guint32 @@ -498,7 +498,7 @@ extern gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, /* NOTE: This is very primitive in that it just reads * the wstring as a series of octets and returns them * to the user. No translation is attempted based on - * byte orientation, nor on code set. I.e it only + * byte orientation, nor on code set. I.e it only * really reads past the wstring and increments the offset * by the length of the octet sequence. */ @@ -530,7 +530,7 @@ extern gboolean is_big_endian (MessageHeader * header); * and *offset, and returns the sequence length. */ -extern guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, +extern guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, gboolean old_stream_is_big_endian, guint32 old_boundary, gboolean *new_stream_is_big_endian_ptr, guint32 *new_boundary_ptr ); diff --git a/packet-gmrp.c b/packet-gmrp.c index 7e76bfa789..0354eeb329 100644 --- a/packet-gmrp.c +++ b/packet-gmrp.c @@ -5,7 +5,7 @@ * Based on the code from packet-gvrp.c (GVRP) from * Kevin Shi <techishi@ms22.hinet.net> Copyright 2000 * - * $Id: packet-gmrp.c,v 1.9 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-gmrp.c,v 1.10 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -15,12 +15,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -119,11 +119,11 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 octet; guint8 attribute_type; int msg_index, attr_index, offset = 0, length = tvb_reported_length(tvb); - - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GMRP"); - - if (check_col(pinfo->cinfo, COL_INFO)) + + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GMRP"); if (tree) @@ -134,20 +134,20 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Read in GARP protocol ID */ protocol_id = tvb_get_ntohs(tvb, GARP_PROTOCOL_ID); - + proto_tree_add_uint_format(gmrp_tree, hf_gmrp_proto_id, tvb, - GARP_PROTOCOL_ID, sizeof(guint16), + GARP_PROTOCOL_ID, sizeof(guint16), protocol_id, - "Protocol Identifier: 0x%04x (%s)", + "Protocol Identifier: 0x%04x (%s)", protocol_id, - protocol_id == GARP_DEFAULT_PROTOCOL_ID ? + protocol_id == GARP_DEFAULT_PROTOCOL_ID ? "GARP Multicast Registration Protocol" : "Unknown Protocol"); /* Currently only one protocol ID is supported */ if (protocol_id != GARP_DEFAULT_PROTOCOL_ID) { - proto_tree_add_text(gmrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16), + proto_tree_add_text(gmrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16), " (Warning: this version of Ethereal only knows about protocol id = 1)"); call_dissector(data_handle, tvb_new_subset(tvb, GARP_PROTOCOL_ID + sizeof(guint16), -1, -1), @@ -219,7 +219,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Check for end of mark */ if (octet == GARP_END_OF_MARK) { - /* If at least one message has been already read, + /* If at least one message has been already read, * check for another end of mark. */ if (attr_index) @@ -305,7 +305,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Service Requirement */ proto_tree_add_item(gmrp_tree, hf_gmrp_attribute_value_service_requirement, tvb, offset, sizeof(guint8), FALSE); - + offset += sizeof(guint8); length -= sizeof(guint8); } @@ -342,7 +342,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_gmrp(void) -{ +{ static hf_register_info hf[] = { { &hf_gmrp_proto_id, { "Protocol ID", "garp.protocol_id", @@ -374,7 +374,7 @@ proto_register_gmrp(void) FT_UINT8, BASE_HEX, NULL, 0x0, "" , HFILL } } - + }; static gint *ett[] = { @@ -388,9 +388,9 @@ proto_register_gmrp(void) * used by GMRP */ proto_register_field_array(proto_gmrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + register_dissector("gmrp", dissect_gmrp, proto_gmrp); - + } void diff --git a/packet-gnutella.c b/packet-gnutella.c index ecd2696d2a..d425030e39 100644 --- a/packet-gnutella.c +++ b/packet-gnutella.c @@ -2,7 +2,7 @@ * Routines for gnutella dissection * Copyright 2001, B. Johannessen <bob@havoq.com> * - * $Id: packet-gnutella.c,v 1.14 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-gnutella.c,v 1.15 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -368,22 +368,22 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree unsigned int size; char *payload_descriptor_text; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gnutella"); - - if (check_col(pinfo->cinfo, COL_INFO)) + + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Gnutella"); snap_len = tvb_length(tvb); if(snap_len < GNUTELLA_HEADER_LENGTH) { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %i bytes [INCOMPLETE]", snap_len); return; } else { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %i bytes", snap_len); } @@ -569,172 +569,172 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } -void proto_register_gnutella(void) { +void proto_register_gnutella(void) { static hf_register_info hf[] = { { &hf_gnutella_header, { "Descriptor Header", "gnutella.header", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella Descriptor Header", HFILL } }, { &hf_gnutella_pong_payload, { "Pong", "gnutella.pong.payload", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella Pong Payload", HFILL } }, { &hf_gnutella_push_payload, { "Push", "gnutella.push.payload", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella Push Payload", HFILL } }, { &hf_gnutella_query_payload, { "Query", "gnutella.query.payload", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella Query Payload", HFILL } }, { &hf_gnutella_queryhit_payload, { "QueryHit", "gnutella.queryhit.payload", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella QueryHit Payload", HFILL } }, { &hf_gnutella_truncated, { "Truncated Frame", "gnutella.truncated", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "The Gnutella Frame Was Truncated", HFILL } }, { &hf_gnutella_stream, { "Gnutella Upload / Download Stream", "gnutella.stream", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella Upload / Download Stream", HFILL } }, { &hf_gnutella_header_id, { "ID", "gnutella.header.id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "Gnutella Descriptor ID", HFILL } }, { &hf_gnutella_header_payload, { "Payload", "gnutella.header.payload", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT8, BASE_DEC, NULL, 0, "Gnutella Descriptor Payload", HFILL } }, { &hf_gnutella_header_ttl, { "TTL", "gnutella.header.ttl", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT8, BASE_DEC, NULL, 0, "Gnutella Descriptor Time To Live", HFILL } }, { &hf_gnutella_header_hops, { "Hops", "gnutella.header.hops", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT8, BASE_DEC, NULL, 0, "Gnutella Descriptor Hop Count", HFILL } }, { &hf_gnutella_header_size, { "Length", "gnutella.header.size", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT8, BASE_DEC, NULL, 0, "Gnutella Descriptor Payload Length", HFILL } }, { &hf_gnutella_pong_port, { "Port", "gnutella.pong.port", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Gnutella Pong TCP Port", HFILL } }, { &hf_gnutella_pong_ip, { "IP", "gnutella.pong.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_DEC, NULL, 0, "Gnutella Pong IP Address", HFILL } }, { &hf_gnutella_pong_files, { "Files Shared", "gnutella.pong.files", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella Pong Files Shared", HFILL } }, { &hf_gnutella_pong_kbytes, { "KBytes Shared", "gnutella.pong.kbytes", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella Pong KBytes Shared", HFILL } }, { &hf_gnutella_query_min_speed, { "Min Speed", "gnutella.query.min_speed", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella Query Minimum Speed", HFILL } }, { &hf_gnutella_query_search, { "Search", "gnutella.query.search", - FT_STRINGZ, BASE_NONE, NULL, 0, + FT_STRINGZ, BASE_NONE, NULL, 0, "Gnutella Query Search", HFILL } }, { &hf_gnutella_queryhit_hit, { "Hit", "gnutella.queryhit.hit", - FT_NONE, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Gnutella QueryHit", HFILL } }, { &hf_gnutella_queryhit_hit_index, { "Index", "gnutella.queryhit.hit.index", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella QueryHit Index", HFILL } }, { &hf_gnutella_queryhit_hit_size, { "Size", "gnutella.queryhit.hit.size", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella QueryHit Size", HFILL } }, { &hf_gnutella_queryhit_hit_name, { "Name", "gnutella.queryhit.hit.name", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "Gnutella Query Name", HFILL } }, { &hf_gnutella_queryhit_hit_extra, { "Extra", "gnutella.queryhit.hit.extra", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "Gnutella Query Extra", HFILL } }, { &hf_gnutella_queryhit_count, { "Count", "gnutella.queryhit.count", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT8, BASE_DEC, NULL, 0, "Gnutella QueryHit Count", HFILL } }, { &hf_gnutella_queryhit_port, { "Port", "gnutella.queryhit.port", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Gnutella QueryHit Port", HFILL } }, { &hf_gnutella_queryhit_ip, { "IP", "gnutella.queryhit.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_DEC, NULL, 0, "Gnutella QueryHit IP Address", HFILL } }, { &hf_gnutella_queryhit_speed, { "Speed", "gnutella.queryhit.speed", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella QueryHit Speed", HFILL } }, { &hf_gnutella_queryhit_extra, { "Extra", "gnutella.queryhit.extra", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "Gnutella QueryHit Extra", HFILL } }, { &hf_gnutella_queryhit_servent_id, { "Servent ID", "gnutella.queryhit.servent_id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "Gnutella QueryHit Servent ID", HFILL } }, { &hf_gnutella_push_servent_id, { "Servent ID", "gnutella.push.servent_id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "Gnutella Push Servent ID", HFILL } }, { &hf_gnutella_push_ip, { "IP", "gnutella.push.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_DEC, NULL, 0, "Gnutella Push IP Address", HFILL } }, { &hf_gnutella_push_index, { "Index", "gnutella.push.index", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Gnutella Push Index", HFILL } }, { &hf_gnutella_push_port, { "Port", "gnutella.push.port", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Gnutella Push Port", HFILL } }, }; diff --git a/packet-gnutella.h b/packet-gnutella.h index fa080aeb55..f518b7292a 100644 --- a/packet-gnutella.h +++ b/packet-gnutella.h @@ -2,7 +2,7 @@ * Declarations for gnutella dissection * Copyright 2001, B. Johannessen <bob@havoq.com> * - * $Id: packet-gnutella.h,v 1.1 2001/06/06 01:30:29 guy Exp $ + * $Id: packet-gnutella.h,v 1.2 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-gre.c b/packet-gre.c index b82aa03ff4..fc19b21697 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,22 +2,22 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.51 2002/08/02 23:35:49 jmayer Exp $ + * $Id: packet-gre.c,v 1.52 2002/08/28 21:00:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -205,7 +205,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; } } - + if (flags_and_ver & GH_B_S) { if (tree) { proto_tree_add_text(gre_tree, tvb, offset, 4, @@ -278,11 +278,11 @@ add_flags_and_ver(proto_tree *tree, guint16 flags_and_ver, tvbuff_t *tvb, proto_item * ti; proto_tree * fv_tree; int nbits = sizeof(flags_and_ver) * 8; - - ti = proto_tree_add_text(tree, tvb, offset, 2, + + ti = proto_tree_add_text(tree, tvb, offset, 2, "Flags and version: %#04x", flags_and_ver); fv_tree = proto_item_add_subtree(ti, ett_gre_flags); - + proto_tree_add_text(fv_tree, tvb, offset, sizeof(flags_and_ver), "%s", decode_boolean_bitfield(flags_and_ver, GH_B_C, nbits, "Checksum", "No checksum")); @@ -326,7 +326,7 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree) proto_item * ti; proto_tree * rh_tree; guint8 rh_flags; - + ti = proto_tree_add_text(tree, tvb, offset, 4, "Redirect header"); rh_tree = proto_item_add_subtree(ti, ett_gre_wccp2_redirect_header); @@ -346,7 +346,7 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_text(rh_tree, tvb, offset + 3, 1, "Primary bucket index: %u", tvb_get_guint8(tvb, offset + 3)); } - + void proto_register_gre(void) { diff --git a/packet-gssapi.c b/packet-gssapi.c index ed93008592..dd2c07bbf4 100644 --- a/packet-gssapi.c +++ b/packet-gssapi.c @@ -2,22 +2,22 @@ * Dissector for GSS-API tokens as described in rfc2078, section 3.1 * Copyright 2002, Tim Potter <tpot@samba.org> * - * $Id: packet-gssapi.c,v 1.6 2002/08/28 02:30:18 sharpe Exp $ + * $Id: packet-gssapi.c,v 1.7 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -44,7 +44,7 @@ static int hf_gssapi = -1; static gint ett_gssapi = -1; -/* +/* * Subdissectors */ @@ -131,7 +131,7 @@ dissect_gssapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Read header */ asn1_open(&hnd, tvb, offset); - + ret = asn1_header_decode(&hnd, &cls, &con, &tag, &def, &len1); if (ret != ASN1_ERR_NOERROR) { @@ -162,7 +162,7 @@ dissect_gssapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) oid_string = format_oid(oid, oid_len); - proto_tree_add_text(subtree, tvb, offset, nbytes, "OID: %s", + proto_tree_add_text(subtree, tvb, offset, nbytes, "OID: %s", oid_string); offset += nbytes; @@ -192,7 +192,7 @@ dissect_gssapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* No dissector for this oid */ proto_tree_add_text( - subtree, tvb, offset, + subtree, tvb, offset, tvb_length_remaining(tvb, offset), "Token object"); goto done; @@ -226,21 +226,21 @@ proto_register_gssapi(void) { static hf_register_info hf[] = { { &hf_gssapi, - { "GSS-API", "gss-api", FT_NONE, BASE_NONE, NULL, 0x0, + { "GSS-API", "gss-api", FT_NONE, BASE_NONE, NULL, 0x0, "GSS-API", HFILL }}, }; - + static gint *ett[] = { &ett_gssapi, }; - + proto_gssapi = proto_register_protocol( "Generic Security Service Application Program Interface", "GSS-API", "gss-api"); proto_register_field_array(proto_gssapi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + register_dissector("gssapi", dissect_gssapi, proto_gssapi); gssapi_oids = g_hash_table_new(gssapi_oid_hash, gssapi_oid_equal); diff --git a/packet-gssapi.h b/packet-gssapi.h index 20503f2c3e..fdc1749346 100644 --- a/packet-gssapi.h +++ b/packet-gssapi.h @@ -2,22 +2,22 @@ * Dissector for GSS-API tokens as described in rfc2078, section 3.1 * Copyright 2002, Tim Potter <tpot@samba.org> * - * $Id: packet-gssapi.h,v 1.2 2002/08/27 23:30:34 sharpe Exp $ + * $Id: packet-gssapi.h,v 1.3 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-gtp.c b/packet-gtp.c index a9faa94f1c..10d8b3fca1 100644 --- a/packet-gtp.c +++ b/packet-gtp.c @@ -1,10 +1,10 @@ /* packet-gtp.c - * + * * Routines for GTP dissection * Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com> * Nicolas Balkota <balkota@mac.com> * - * $Id: packet-gtp.c,v 1.35 2002/08/26 20:22:27 guy Exp $ + * $Id: packet-gtp.c,v 1.36 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,10 +41,10 @@ #include "ppptypes.h" #include "prefs.h" -/* +/* * All data related to GTP v0 (GPRS) uses "gtpv0" or "GTPv0", * all data related to GTP v1 (UMTS) uses "gtpv1" or "GTPv1", - * if there is any gtp alone statement it means that this data is common + * if there is any gtp alone statement it means that this data is common * for both: GPRS and UMTS */ @@ -57,8 +57,8 @@ #define GTP_PRIME_HDR_LENGTH 6 /* for function checking compliance with ETSI */ -#define MANDATORY 1 -#define OPTIONAL 2 +#define MANDATORY 1 +#define OPTIONAL 2 #define CONDITIONAL 4 static int g_gtpv0_port = GTPv0_PORT; @@ -531,15 +531,15 @@ static const value_string message_type[] = { #define GTP_EXT_SEL_MODE 0x0F #define GTP_EXT_16 0x10 -#define GTP_EXT_FLOW_LABEL 0x10 +#define GTP_EXT_FLOW_LABEL 0x10 #define GTP_EXT_TEID 0x10 /* 0xFF10 3G */ #define GTP_EXT_17 0x11 -#define GTP_EXT_FLOW_SIG 0x11 +#define GTP_EXT_FLOW_SIG 0x11 #define GTP_EXT_TEID_CP 0x11 /* 0xFF11 3G */ #define GTP_EXT_18 0x12 -#define GTP_EXT_FLOW_II 0x12 +#define GTP_EXT_FLOW_II 0x12 #define GTP_EXT_TEID_II 0x12 /* 0xFF12 3G*/ #define GTP_EXT_19 0x13 @@ -600,19 +600,19 @@ static const value_string gtp_val[] = { { GTP_EXT_16, "Flow label data I" }, { GTP_EXT_FLOW_LABEL, "Flow label data I" }, { GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I" }, /* 3G */ - + { GTP_EXT_17, "Flow label signalling" }, { GTP_EXT_FLOW_SIG, "Flow label signalling" }, { GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane" }, /* 3G */ - + { GTP_EXT_18, "Flow label data II" }, { GTP_EXT_FLOW_II, "Flow label data II" }, { GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II" }, /* 3G */ - + { GTP_EXT_19, "MS not reachable reason" }, { GTP_EXT_MS_REASON, "MS not reachable reason" }, { GTP_EXT_TEAR_IND, "Teardown ID" }, /* 3G */ - + { GTP_EXT_NSAPI, "NSAPI" }, /* 3G */ { GTP_EXT_RANAP_CAUSE, "RANAP cause" }, /* 3G */ { GTP_EXT_RAB_CNTXT, "RAB context" }, /* 3G */ @@ -652,7 +652,7 @@ static const value_string gtp_val[] = { }; /* GPRS: 9.60 v7.6.0, page 37 - * UMTS: 29.060 v4.0, page 45 + * UMTS: 29.060 v4.0, page 45 */ static const value_string cause_type[] = { { 0, "Request IMSI" }, @@ -781,7 +781,7 @@ static const value_string qos_peak_type[] = { { 0x07, "Up to 64 000 oct/s" }, { 0x08, "Up to 128 000 oct/s" }, { 0x09, "Up to 256 000 oct/s" }, -/* QoS Peak throughput classes from 0x0A to 0x0F (from 10 to 15) are subscribed */ +/* QoS Peak throughput classes from 0x0A to 0x0F (from 10 to 15) are subscribed */ { 0x0A, "Reserved" }, { 0x0B, "Reserved" }, { 0x0C, "Reserved" }, @@ -866,7 +866,7 @@ static const value_string qos_traf_class[] = { static const value_string qos_max_sdu_size[] = { { 0x00, "Subscribed maximum SDU size (in MS to network direction" }, - /* For values from 0x01 to 0x96 (from 1 to 150), use a granularity of 10 octets */ + /* For values from 0x01 to 0x96 (from 1 to 150), use a granularity of 10 octets */ { 0x97, "1502 octets" }, { 0x98, "1510 octets" }, { 0x99, "1520 octets" }, @@ -917,7 +917,7 @@ static const value_string qos_sdu_err_ratio[] = { { 0x07, "1/10 = 1x10^-1" }, { 0x0F, "Reserved" }, /* All other values are reserved */ { 0, NULL } -}; +}; static const value_string qos_traf_handl_prio[] = { { 0x00, "Subscribed traffic handling priority (in MS to network direction)" }, @@ -1154,7 +1154,7 @@ static const value_string mm_rr_mess[] = { { 0x30, "Configuration change command" }, { 0x31, "Configuration change ack" }, { 0x33, "Configuration change reject" }, - + { 0x2E, "Assignment command" }, { 0x29, "Assignment complete" }, { 0x2F, "Assigment failure" }, @@ -1245,7 +1245,7 @@ static const value_string mm_mm_mess[] = { { 0, NULL } }; -static const value_string mm_cc_mess[] = { +static const value_string mm_cc_mess[] = { { 0x00, "escape to nationally specific" }, /*{ 0 x 0 0, "- - - Call establishment messages:" },*/ { 0x01, "ALERTING" }, @@ -1334,7 +1334,7 @@ static const value_string cdr_close_type[] = { { 7, "Abnormal" }, { 0, NULL } }; - + static dissector_handle_t ip_handle; static dissector_handle_t ppp_handle; @@ -1393,7 +1393,7 @@ static int decode_gtp_priv_ext (tvbuff_t *tvb, int offset, packet_info *pinfo, static int decode_gtp_unknown (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); typedef struct _gtp_opt { - int optcode; + int optcode; /* char *name; */ int (*decode)(tvbuff_t *, int, packet_info *, proto_tree *); } gtp_opt_t; @@ -1622,13 +1622,13 @@ static struct _stcdr { /* STCDR 79B */ guint32 time2; guint16 smsres; } stcdr; - + static guint8 gtp_version = 0; static char *yesno[] = { "False", "True" }; - + static void col_append_str_gtp(column_info *cinfo, gint el, gchar *proto_name) { - + int i; int max_len; gchar _tmp[COL_MAX_LEN]; @@ -1638,11 +1638,11 @@ col_append_str_gtp(column_info *cinfo, gint el, gchar *proto_name) { for (i = 0; i < cinfo->num_cols; i++) { if (cinfo->fmt_matx[i][el]) { if (cinfo->col_data[i] != cinfo->col_buf[i]) { - + strncpy(cinfo->col_buf[i], cinfo->col_data[i], max_len); cinfo->col_buf[i][max_len - 1] = '\0'; } - + _tmp[0] = '\0'; strcat(_tmp, proto_name); strcat(_tmp, " <"); @@ -1657,7 +1657,7 @@ col_append_str_gtp(column_info *cinfo, gint el, gchar *proto_name) { static gchar * id_to_str(const guint8 *ad) { - + static gchar *str[17]; gchar *p; guint8 bits8to5, bits4to1, i; @@ -1669,7 +1669,7 @@ id_to_str(const guint8 *ad) { for (;;) { bits8to5 = (ad[i] >> 4) & 0x0F; bits4to1 = ad[i] & 0x0F; - if (bits8to5 < 0xA) *--p = hex_digits[bits8to5]; + if (bits8to5 < 0xA) *--p = hex_digits[bits8to5]; if (bits4to1 < 0xA) *--p = hex_digits[bits4to1]; if (i == 0) break; i--; @@ -1679,7 +1679,7 @@ id_to_str(const guint8 *ad) { static gchar * msisdn_to_str(const guint8 *ad, int len) { - + static gchar *str[17]; gchar *p; guint8 bits8to5, bits4to1, i; @@ -1724,8 +1724,8 @@ rel_time_int_to_str (guint32 time) return rel_time_to_str (&nstime); } -/* Next definitions and function check_field_presence checks if given field - * in GTP packet is compliant with ETSI +/* Next definitions and function check_field_presence checks if given field + * in GTP packet is compliant with ETSI */ typedef struct _header { guint8 code; @@ -1738,12 +1738,12 @@ typedef struct _message { } _gtp_mess_items; /* --------------------- - * GPRS messages + * GPRS messages * ---------------------*/ static _gtp_mess_items gprs_mess_items[] = { { - GTP_MSG_ECHO_REQ, { + GTP_MSG_ECHO_REQ, { { GTP_EXT_PRIV_EXT, OPTIONAL }, { 0, 0 } } @@ -1788,7 +1788,7 @@ static _gtp_mess_items gprs_mess_items[] = { { 0, 0 } } }, -{ +{ GTP_MSG_CREATE_PDP_REQ, { { GTP_EXT_QOS_GPRS, MANDATORY }, { GTP_EXT_RECOVER, OPTIONAL }, @@ -1805,7 +1805,7 @@ static _gtp_mess_items gprs_mess_items[] = { { 0, 0 } } }, -{ +{ GTP_MSG_CREATE_PDP_RESP, { { GTP_EXT_CAUSE, MANDATORY }, { GTP_EXT_QOS_GPRS, CONDITIONAL }, @@ -1823,7 +1823,7 @@ static _gtp_mess_items gprs_mess_items[] = { { 0, 0 } } }, -{ +{ GTP_MSG_UPDATE_PDP_REQ, { { GTP_EXT_QOS_GPRS, MANDATORY }, { GTP_EXT_RECOVER, OPTIONAL }, @@ -1880,7 +1880,7 @@ static _gtp_mess_items gprs_mess_items[] = { } }, { - GTP_MSG_CREATE_AA_PDP_RESP, { + GTP_MSG_CREATE_AA_PDP_RESP, { { GTP_EXT_CAUSE, MANDATORY }, { GTP_EXT_QOS_GPRS, CONDITIONAL }, { GTP_EXT_REORDER, CONDITIONAL }, @@ -1924,7 +1924,7 @@ static _gtp_mess_items gprs_mess_items[] = { { 0, 0 } } }, -{ +{ GTP_MSG_PDU_NOTIFY_RESP, { { GTP_EXT_CAUSE, MANDATORY }, { GTP_EXT_PRIV_EXT, OPTIONAL }, @@ -2069,12 +2069,12 @@ static _gtp_mess_items gprs_mess_items[] = { }; /* ----------------------------- - * UMTS messages + * UMTS messages * -----------------------------*/ static _gtp_mess_items umts_mess_items[] = { { - GTP_MSG_ECHO_REQ, { + GTP_MSG_ECHO_REQ, { { GTP_EXT_PRIV_EXT, OPTIONAL }, { 0, 0 } } @@ -2437,17 +2437,17 @@ static _gtp_mess_items umts_mess_items[] = { } }; -static int +static int check_field_presence(guint8 message, guint8 field, int *position) { - + guint i = 0; _gtp_mess_items *mess_items; switch(gtp_version) { - case 0: + case 0: mess_items = gprs_mess_items; break; - case 1: + case 1: mess_items = umts_mess_items; break; default: @@ -2456,12 +2456,12 @@ check_field_presence(guint8 message, guint8 field, int *position) { while (mess_items[i].code) { if (mess_items[i].code == message) { - + while (mess_items[i].fields[*position].code) { if (mess_items[i].fields[*position].code == field) { (*position)++; return 0; - } else { + } else { if (mess_items[i].fields[*position].presence == MANDATORY) { return mess_items[i].fields[(*position)++].code; } else { @@ -2471,7 +2471,7 @@ check_field_presence(guint8 message, guint8 field, int *position) { return -1; } i++; - } + } return -2; } @@ -2485,9 +2485,9 @@ static int decode_gtp_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint8 cause; - - cause = tvb_get_guint8(tvb, offset+1); - + + cause = tvb_get_guint8(tvb, offset+1); + proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_cause : hf_gtpv0_cause, tvb, offset, 2, cause); return 2; @@ -2496,16 +2496,16 @@ decode_gtp_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * /* GPRS: 9.60 v7.6.0, chapter 7.9.2 * UMTS: 29.060 v4.0, chapter 7.7.2 */ -static int +static int decode_gtp_imsi(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 tid_val[8]; gchar *tid_str; tvb_memcpy(tvb, tid_val, offset+1, 8); tid_val[1] = tid_val[1] & 0x0F; tid_str = id_to_str(tid_val); - + proto_tree_add_string(tree, gtp_version ? hf_gtpv1_imsi : hf_gtpv0_imsi, tvb, offset, 9, tid_str); return 9; @@ -2517,20 +2517,20 @@ decode_gtp_imsi(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t */ static int decode_gtp_rai(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + proto_tree *ext_tree_rai; proto_item *te; guint8 byte[3]; - - te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_RAI, gtp_val, "Unknown message")); + + te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_RAI, gtp_val, "Unknown message")); ext_tree_rai = proto_item_add_subtree(te, ett_gtp_rai); - + /* tvb_memcpy (tvb, (guint8 *)&byte, offset + 1, 3); */ byte[1] = tvb_get_guint8 (tvb, offset + 1); byte[2] = tvb_get_guint8 (tvb, offset + 2); byte[3] = tvb_get_guint8 (tvb, offset + 3); - - + + proto_tree_add_uint(ext_tree_rai, gtp_version ? hf_gtpv1_rai_mcc : hf_gtpv0_rai_mcc, tvb, offset+1, 2, (byte[1] & 0x0F) * 100 + ((byte[1] & 0xF0) >> 4) * 10 + (byte[2] & 0x0F )); proto_tree_add_uint(ext_tree_rai, gtp_version ? hf_gtpv1_rai_mnc : hf_gtpv0_rai_mnc, tvb, offset+2, 2, ((byte[3] & 0xF0) >> 4 ) * 10 + (byte[3] & 0x0F)); proto_tree_add_uint(ext_tree_rai, gtp_version ? hf_gtpv1_rai_lac : hf_gtpv0_rai_lac, tvb, offset+4, 2, tvb_get_ntohs (tvb, offset+4)); @@ -2544,11 +2544,11 @@ decode_gtp_rai(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr */ static int decode_gtp_tlli(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint32 tlli; - - tlli = tvb_get_ntohl(tvb, offset+1); - proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_tlli : hf_gtpv0_tlli, tvb, offset, 5, tlli); + + tlli = tvb_get_ntohl(tvb, offset+1); + proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_tlli : hf_gtpv0_tlli, tvb, offset, 5, tlli); return 5; } @@ -2558,24 +2558,24 @@ decode_gtp_tlli(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t */ static int decode_gtp_ptmsi(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint32 ptmsi; - - ptmsi = tvb_get_ntohl(tvb, offset); + + ptmsi = tvb_get_ntohl(tvb, offset); proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_ptmsi : hf_gtpv0_ptmsi, tvb, offset, 5, ptmsi); return 5; } -/* adjust - how many bytes before offset should be highlighted +/* adjust - how many bytes before offset should be highlighted */ static int decode_qos_gprs(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, guint8 adjust) { - + guint8 spare1, delay, reliability, peak, spare2, precedence, spare3, mean; proto_tree *ext_tree_qos; proto_item *te; - + spare1 = tvb_get_guint8(tvb, offset) & 0xC0; delay = tvb_get_guint8(tvb, offset) & 0x38; reliability = tvb_get_guint8(tvb, offset) & 0x07; @@ -2584,7 +2584,7 @@ decode_qos_gprs(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui precedence = tvb_get_guint8(tvb, offset+1) & 0x07; spare3 = tvb_get_guint8(tvb, offset+2) & 0xE0; mean = tvb_get_guint8(tvb, offset+2) & 0x1F; - + te = proto_tree_add_text(tree, tvb, offset-adjust, 3+adjust, "%s: delay: %u, reliability: %u, peak: %u, precedence: %u, mean: %u", qos_str, delay, reliability, peak, precedence, mean); ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos); @@ -2600,20 +2600,20 @@ decode_qos_gprs(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui proto_tree_add_uint(ext_tree_qos, hf_gtpv0_qos_mean, tvb, offset+2, 1, mean); } - return 3; + return 3; } /* GPRS: 9.60 v7.6.0, chapter 7.9.6, page 39 * 4.08 * 3.60 * UMTS: not present - * TODO: check if length is included: ETSI 4.08 vs 9.60 + * TODO: check if length is included: ETSI 4.08 vs 9.60 */ static int decode_gtp_qos_gprs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + return (1+decode_qos_gprs(tvb, offset+1, tree, "Quality of Service", 1)); - + } /* GPRS: 9.60 v7.6.0, chapter 7.9.7, page 39 @@ -2623,15 +2623,15 @@ static int decode_gtp_reorder(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint8 reorder; - - reorder = tvb_get_guint8(tvb, offset+1) & 0x01; - proto_tree_add_boolean(tree, gtp_version ? hf_gtpv1_reorder : hf_gtpv0_reorder, tvb, offset, 2, reorder); + + reorder = tvb_get_guint8(tvb, offset+1) & 0x01; + proto_tree_add_boolean(tree, gtp_version ? hf_gtpv1_reorder : hf_gtpv0_reorder, tvb, offset, 2, reorder); return 2; } /* GPRS: 9.60 v7.6.0, chapter 7.9.8, page 40 - * 4.08 v7.1.2, chapter 10.5.3.1+ + * 4.08 v7.1.2, chapter 10.5.3.1+ * UMTS: 29.060 v4.0, chapter 7.7.7 * TODO: Add blurb support by registering items in the protocol registration */ @@ -2641,14 +2641,14 @@ decode_gtp_auth_tri(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree *ext_tree_auth_tri; proto_item *te; guint32 rand[4], sres, kc[2]; - + tvb_memcpy(tvb, (guint8 *)&rand, offset+1, 16); sres = tvb_get_ntohl(tvb, offset+17); tvb_memcpy(tvb, (guint8 *)&kc, offset+21, 16); - + te = proto_tree_add_text(tree, tvb, offset, 29, val_to_str(GTP_EXT_AUTH_TRI, gtp_val, "Unknown message")); ext_tree_auth_tri = proto_item_add_subtree(tree, ett_gtp_auth_tri); - + proto_tree_add_text(ext_tree_auth_tri, tvb, offset+1, 16, "RAND: %x%x%x%x", rand[0], rand[1], rand[2], rand[3]); proto_tree_add_text(ext_tree_auth_tri, tvb, offset+17, 4, "SRES: %x", sres); proto_tree_add_text(ext_tree_auth_tri, tvb, offset+21, 8, "Kc: %x%x", kc[0], kc[1]); @@ -2663,10 +2663,10 @@ decode_gtp_auth_tri(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_map_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 map_cause; - - map_cause = tvb_get_guint8(tvb, offset+1); + + map_cause = tvb_get_guint8(tvb, offset+1); proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_map_cause : hf_gtpv0_map_cause, tvb, offset, 2, map_cause); return 2; @@ -2677,10 +2677,10 @@ decode_gtp_map_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr */ static int decode_gtp_ptmsi_sig(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint32 ptmsi_sig; - - ptmsi_sig = tvb_get_ntoh24(tvb, offset+1); + + ptmsi_sig = tvb_get_ntoh24(tvb, offset+1); proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_ptmsi_sig : hf_gtpv0_ptmsi_sig, tvb, offset, 4, ptmsi_sig); return 4; @@ -2691,10 +2691,10 @@ decode_gtp_ptmsi_sig(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr */ static int decode_gtp_ms_valid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 ms_valid; - - ms_valid = tvb_get_guint8(tvb, offset+1) & 0x01; + + ms_valid = tvb_get_guint8(tvb, offset+1) & 0x01; proto_tree_add_boolean(tree, gtp_version ? hf_gtpv1_ms_valid : hf_gtpv0_ms_valid, tvb, offset, 2, ms_valid); return 2; @@ -2705,10 +2705,10 @@ decode_gtp_ms_valid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_recovery(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 recovery; - - recovery = tvb_get_guint8(tvb, offset+1); + + recovery = tvb_get_guint8(tvb, offset+1); proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_recovery : hf_gtpv0_recovery, tvb, offset, 2, recovery); return 2; @@ -2719,10 +2719,10 @@ decode_gtp_recovery(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_sel_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 sel_mode; - - sel_mode = tvb_get_guint8(tvb, offset+1) & 0x03; + + sel_mode = tvb_get_guint8(tvb, offset+1) & 0x03; proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_sel_mode : hf_gtpv0_sel_mode, tvb, offset, 2, sel_mode); return 2; @@ -2733,24 +2733,24 @@ decode_gtp_sel_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_16(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint16 ext_flow_label; + + guint16 ext_flow_label; guint32 teid_data; switch (gtp_version) { case 0: - ext_flow_label = tvb_get_ntohs(tvb, offset+1); + ext_flow_label = tvb_get_ntohs(tvb, offset+1); proto_tree_add_uint(tree, hf_gtpv0_ext_flow_label, tvb, offset, 3, ext_flow_label); - + return 3; case 1: teid_data = tvb_get_ntohl(tvb, offset+1); proto_tree_add_uint(tree, hf_gtpv1_teid_data, tvb, offset, 5, teid_data); return 5; - default: + default: proto_tree_add_text(tree, tvb, offset, 1, "Flow label/TEID Data I : GTP version not supported"); - + return 3; } } @@ -2766,18 +2766,18 @@ decode_gtp_17(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre switch (gtp_version) { case 0: - flow_sig = tvb_get_ntohs(tvb, offset+1); + flow_sig = tvb_get_ntohs(tvb, offset+1); proto_tree_add_uint(tree, hf_gtpv0_flow_sig, tvb, offset, 3, flow_sig); - + return 3; case 1: teid_cp = tvb_get_ntohl(tvb, offset+1); proto_tree_add_uint(tree, hf_gtpv1_teid_cp, tvb, offset, 5, teid_cp); - + return 5; default: proto_tree_add_text(tree, tvb, offset, 1, "Flow label signalling/TEID control plane : GTP version not supported"); - + return 3; } } @@ -2797,27 +2797,27 @@ decode_gtp_18(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre case 0: te = proto_tree_add_text(tree, tvb, offset, 4, val_to_str(GTP_EXT_FLOW_II, gtp_val, "Unknown message")); ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii); - + proto_tree_add_uint(ext_tree_flow_ii, hf_gtpv0_nsapi, tvb, offset+1, 1, tvb_get_guint8(tvb, offset+1) & 0x0F); - - flow_ii = tvb_get_ntohs(tvb, offset+2); + + flow_ii = tvb_get_ntohs(tvb, offset+2); proto_tree_add_uint(ext_tree_flow_ii, hf_gtpv0_flow_ii, tvb, offset+2, 2, flow_ii); - + return 4; - case 1: + case 1: te = proto_tree_add_text(tree, tvb, offset, 6, val_to_str(GTP_EXT_TEID_II, gtp_val, "Unknown message")); ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii); - + proto_tree_add_uint(ext_tree_flow_ii, hf_gtpv1_nsapi, tvb, offset+1, 1, tvb_get_guint8(tvb, offset+1) & 0x0F); - + teid_ii = tvb_get_ntohl(tvb, offset+2); proto_tree_add_uint(ext_tree_flow_ii, hf_gtpv1_teid_ii, tvb, offset+2, 4, teid_ii); - + return 6; default: proto_tree_add_text(tree, tvb, offset, 1, "Flow data II/TEID Data II : GTP Version not supported"); - + return 4; } } @@ -2828,19 +2828,19 @@ decode_gtp_18(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre */ static int decode_gtp_19(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint8 field19; - - field19 = tvb_get_guint8(tvb, offset+1); - + + guint8 field19; + + field19 = tvb_get_guint8(tvb, offset+1); + switch (gtp_version) { - case 0: + case 0: proto_tree_add_uint(tree, hf_gtpv0_ms_reason, tvb, offset, 2, field19); - + break; case 1: proto_tree_add_boolean(tree, hf_gtpv1_tear_ind, tvb, offset, 2, field19 & 0x01); - + break; default: proto_tree_add_text(tree, tvb, offset, 1, "Information Element Type = 19 : GTP Version not supported"); @@ -2856,10 +2856,10 @@ decode_gtp_19(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre */ static int decode_gtp_nsapi(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 nsapi; - - nsapi = tvb_get_guint8(tvb, offset+1) & 0x0F; + + nsapi = tvb_get_guint8(tvb, offset+1) & 0x0F; proto_tree_add_uint(tree, hf_gtpv1_nsapi, tvb, offset, 2, nsapi); return 2; @@ -2870,9 +2870,9 @@ decode_gtp_nsapi(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * */ static int decode_gtp_ranap_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 ranap; - + ranap = tvb_get_guint8(tvb, offset+1); if(ranap > 0 && ranap <=64) @@ -2901,16 +2901,16 @@ decode_gtp_ranap_cause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ */ static int decode_gtp_rab_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 nsapi, dl_pdcp_seq, ul_pdcp_seq; guint16 dl_gtpu_seq, ul_gtpu_seq; proto_tree *ext_tree_rab_cntxt; proto_item *te; - + te = proto_tree_add_text(tree, tvb, offset, 8, val_to_str(GTP_EXT_RAB_CNTXT, gtp_val, "Unknown message")); ext_tree_rab_cntxt = proto_item_add_subtree(te, ett_gtp_rab_cntxt); - - nsapi = tvb_get_guint8(tvb, offset+1) & 0x0F; + + nsapi = tvb_get_guint8(tvb, offset+1) & 0x0F; dl_gtpu_seq = tvb_get_ntohs(tvb, offset+2); ul_gtpu_seq = tvb_get_ntohs(tvb, offset+4); dl_pdcp_seq = tvb_get_guint8(tvb, offset+6); @@ -2931,10 +2931,10 @@ decode_gtp_rab_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr */ static int decode_gtp_rp_sms(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint8 rp_sms; - - rp_sms = tvb_get_guint8(tvb, offset+1) & 0x07; + + rp_sms = tvb_get_guint8(tvb, offset+1) & 0x07; proto_tree_add_uint(tree, hf_gtpv1_rp_sms, tvb, offset, 2, rp_sms); return 2; @@ -2945,11 +2945,11 @@ decode_gtp_rp_sms(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree */ static int decode_gtp_rp(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + proto_tree *ext_tree_rp; proto_item *te; guint8 nsapi, rp, spare; - + nsapi = tvb_get_guint8(tvb, offset+1) & 0xF0; spare = tvb_get_guint8(tvb, offset+1) & 0x08; rp = tvb_get_guint8(tvb, offset+1) & 0x07; @@ -2969,11 +2969,11 @@ decode_gtp_rp(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre */ static int decode_gtp_pkt_flow_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + proto_tree *ext_tree_pkt_flow_id; proto_item *te; guint8 nsapi, pkt_flow_id; - + nsapi = tvb_get_guint8(tvb, offset+1) & 0x0F; pkt_flow_id = tvb_get_guint8(tvb, offset+2); @@ -2982,7 +2982,7 @@ decode_gtp_pkt_flow_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ proto_tree_add_uint(ext_tree_pkt_flow_id, hf_gtpv1_nsapi, tvb, offset+1, 1, nsapi); proto_tree_add_uint_format(ext_tree_pkt_flow_id, hf_gtpv1_pkt_flow_id, tvb, offset+2, 1, pkt_flow_id, "%s : %u", val_to_str(GTP_EXT_PKT_FLOW_ID, gtp_val, "Unknown message"), pkt_flow_id); - + return 3; } @@ -2992,66 +2992,66 @@ decode_gtp_pkt_flow_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ */ static int decode_gtp_chrg_char(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 chrg_char; proto_item *te; proto_tree *ext_tree_chrg_char; - + chrg_char = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, 3, "%s: %x", val_to_str(GTP_EXT_CHRG_CHAR, gtp_val, "Unknown message"), chrg_char); ext_tree_chrg_char = proto_item_add_subtree(te, ett_gtp_chrg_char); - + proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_s, tvb, offset+1, 2, chrg_char); proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_n, tvb, offset+1, 2, chrg_char); proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_p, tvb, offset+1, 2, chrg_char); proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_f, tvb, offset+1, 2, chrg_char); proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_h, tvb, offset+1, 2, chrg_char); proto_tree_add_uint(ext_tree_chrg_char, hf_gtpv1_chrg_char_r, tvb, offset+1, 2, chrg_char); - + return 3; } /* GPRS: not present - * UMTS: 29.060 v4.0, chapter 7.7.24, page + * UMTS: 29.060 v4.0, chapter 7.7.24, page */ static int decode_gtp_trace_ref(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 trace_ref; - + trace_ref = tvb_get_ntohs(tvb, offset+1); - + proto_tree_add_uint(tree, hf_gtpv1_trace_ref, tvb, offset, 3, trace_ref); return 3; } /* GPRS: not present - * UMTS: 29.060 v4.0, chapter 7.7.25, page + * UMTS: 29.060 v4.0, chapter 7.7.25, page */ static int decode_gtp_trace_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 trace_type; - + trace_type = tvb_get_ntohs(tvb, offset+1); - + proto_tree_add_uint(tree, hf_gtpv1_trace_type, tvb, offset, 3, trace_type); - + return 3; } /* GPRS: 9.60 v7.6.0, chapter 7.9.16A - * UMTS: 29.060 v4.0, chapter 7.7.25A, page + * UMTS: 29.060 v4.0, chapter 7.7.25A, page */ static int decode_gtp_ms_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint8 reason; - - reason = tvb_get_guint8(tvb, offset+1); - + + guint8 reason; + + reason = tvb_get_guint8(tvb, offset+1); + proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_ms_reason : hf_gtpv0_ms_reason, tvb, offset, 2, reason); return 2; @@ -3063,11 +3063,11 @@ decode_gtp_ms_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr */ static int decode_gtp_tr_comm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint8 tr_command; - - tr_command = tvb_get_ntohl(tvb, offset+1); - + + guint8 tr_command; + + tr_command = tvb_get_ntohl(tvb, offset+1); + proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_tr_comm : hf_gtpv0_tr_comm, tvb, offset, 2, tr_command); return 2; @@ -3078,10 +3078,10 @@ decode_gtp_tr_comm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree */ static int decode_gtp_chrg_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint32 chrg_id; - - chrg_id = tvb_get_ntohl(tvb, offset+1); + + guint32 chrg_id; + + chrg_id = tvb_get_ntohl(tvb, offset+1); proto_tree_add_uint(tree, gtp_version ? hf_gtpv1_chrg_id : hf_gtpv0_chrg_id, tvb, offset, 5, chrg_id); return 5; @@ -3092,15 +3092,15 @@ decode_gtp_chrg_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree */ static int decode_gtp_user_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 length; - guint8 pdp_typ, pdp_org; + guint8 pdp_typ, pdp_org; guint32 addr_ipv4; struct e_in6_addr addr_ipv6; proto_tree *ext_tree_user; proto_item *te; - - + + length = tvb_get_ntohs(tvb, offset+1); pdp_org = tvb_get_guint8(tvb, offset+3) & 0x0F; pdp_typ = tvb_get_guint8(tvb, offset+4); @@ -3110,11 +3110,11 @@ decode_gtp_user_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr val_to_str(pdp_org, pdp_org_type, "Unknown PDP Organization"), val_to_str(pdp_typ, pdp_type, "Unknown PDP Type")); ext_tree_user = proto_item_add_subtree(te, ett_gtp_user); - + proto_tree_add_text(ext_tree_user, tvb, offset+1, 2, "Length : %u", length); proto_tree_add_uint(ext_tree_user, gtp_version ? hf_gtpv1_user_addr_pdp_org : hf_gtpv0_user_addr_pdp_org, tvb, offset+3, 1, pdp_org); proto_tree_add_uint(ext_tree_user, gtp_version ? hf_gtpv1_user_addr_pdp_type : hf_gtpv0_user_addr_pdp_type, tvb, offset+4, 1, pdp_typ); - + if (length == 2) { if (pdp_org == 0 && pdp_typ == 1) proto_item_append_text(te, " (Point to Point Protocol)"); @@ -3135,32 +3135,32 @@ decode_gtp_user_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } } else proto_item_append_text(te, " : empty PDP Address"); - + return 3+length; } static int decode_triplet(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 count) { - + proto_tree *ext_tree_trip; proto_item *te_trip; guint32 rand[4], sres, kc[2]; guint16 i; - + for (i=0;i<count;i++) { - + tvb_memcpy(tvb, (guint8 *)&rand, offset+i*28, 16); sres = tvb_get_ntohl(tvb, offset+i*28+16); tvb_memcpy(tvb, (guint8 *)&kc, offset+i*28+20, 8); te_trip = proto_tree_add_text(tree, tvb, offset+i*28, 28, "Triplet no%x", i); ext_tree_trip = proto_item_add_subtree(te_trip, ett_gtp_trip); - + proto_tree_add_text(ext_tree_trip, tvb, offset+i*28, 16, "RAND: %x%x%x%x", rand[0], rand[1], rand[2], rand[3]); proto_tree_add_text(ext_tree_trip, tvb, offset+i*28+16, 4, "SRES: %x", sres); proto_tree_add_text(ext_tree_trip, tvb, offset+i*28+20, 8, "Kc: %x%x", kc[0], kc[1]); } - + return count*28; } @@ -3168,20 +3168,20 @@ decode_triplet(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 count) { */ static int decode_quintuplet(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 count, guint8 adjust) { - + proto_tree *ext_tree_quint; proto_item *te_quint; guint32 rand[4], q_ck[4], q_ik[4]; guint16 q_len, xres_len, auth_len, q_offset, i; q_offset = 0; - - for (i=0;i<count;i++) { - + + for (i=0;i<count;i++) { + offset = offset + q_offset; - + q_len = tvb_get_ntohs(tvb, offset); - + tvb_memcpy(tvb, (guint8 *)&rand, offset+2, 16); xres_len = tvb_get_ntohs(tvb, offset+18); /* xres = tvb_get_ptr(tvb, offset+20, xres_len);*/ @@ -3192,7 +3192,7 @@ decode_quintuplet(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 count, gu te_quint = proto_tree_add_text(tree, tvb, offset-adjust, q_len+adjust, "Quintuplet #%x", i); ext_tree_quint = proto_item_add_subtree(te_quint, ett_gtp_quint); - + proto_tree_add_text(ext_tree_quint, tvb, offset, 2, "Length: %x", q_len); proto_tree_add_text(ext_tree_quint, tvb, offset+2, 16, "RAND: %x%x%x%x", rand[0], rand[1], rand[2], rand[3]); proto_tree_add_text(ext_tree_quint, tvb, offset+18, 2, "XRES length: %x", xres_len); @@ -3204,35 +3204,35 @@ decode_quintuplet(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 count, gu q_offset = q_offset + q_len + 2; } - + return q_offset; } -/* GPRS: 9.60 v7.6.0, chapter 7.9.19 page +/* GPRS: 9.60 v7.6.0, chapter 7.9.19 page * UMTS: 29.060 v4.0, chapter 7.7.28 page 57 * TODO: - check if for quintuplets first 2 bytes are length, according to AuthQuint * - finish displaying last 3 parameters */ static int decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint16 length, quint_len, net_cap, con_len; + + guint16 length, quint_len, net_cap, con_len; guint8 cksn, count, sec_mode, cipher, trans_id, proto_disc, message, drx_split, drx_len, drx_ccch, non_drx_timer; guint32 kc[4], ik[4]; proto_tree *ext_tree_mm; proto_item *te; - + te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_MM_CNTXT, gtp_val, "Unknown message")); ext_tree_mm = proto_item_add_subtree(te, ett_gtp_mm); - + length = tvb_get_ntohs(tvb, offset+1); if (length < 1) return 3; - + cksn = tvb_get_guint8(tvb, offset+3) & 0x07; sec_mode = (tvb_get_guint8(tvb, offset+4) >> 6) & 0x03; count = (tvb_get_guint8(tvb, offset+4) >> 3) & 0x07; cipher = tvb_get_guint8(tvb, offset+4) & 0x07; - + proto_tree_add_text(ext_tree_mm, tvb, offset+1, 2, "Length: %x", length); proto_tree_add_text(ext_tree_mm, tvb, offset+3, 1, "Ciphering Key Sequence Number: %u", cksn); if (gtp_version != 0) { @@ -3240,11 +3240,11 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } else { sec_mode = 1; } - + proto_tree_add_text(ext_tree_mm, tvb, offset+4, 1, "No of triplets: %u", count); switch (sec_mode) { - case 0: + case 0: if (cipher == 0) { proto_tree_add_text(ext_tree_mm, tvb, offset+4, 1, "Ciphering: no ciphering"); } else { @@ -3258,10 +3258,10 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(ext_tree_mm, tvb, offset+37, 2, "Quintuplets length: %x", quint_len); offset = offset + decode_quintuplet(tvb, offset+39, ext_tree_mm, count, 0) + 39; - - + + break; - case 1: + case 1: if (cipher == 0) { proto_tree_add_text(ext_tree_mm, tvb, offset+4, 1, "Ciphering: no ciphering"); } else { @@ -3273,18 +3273,18 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre offset = offset + decode_triplet(tvb, offset+13, ext_tree_mm, count) + 13; break; - case 2: + case 2: tvb_memcpy(tvb, (guint8 *)&kc, offset+5, 16); proto_tree_add_text(ext_tree_mm, tvb, offset+5, 16, "Ciphering key CK: %x%x%x%x", kc[0], kc[1], kc[2], kc[3]); tvb_memcpy(tvb, (guint8 *)&ik, offset+21, 16); proto_tree_add_text(ext_tree_mm, tvb, offset+21, 16, "Integrity key CK: %x%x%x%x", ik[0], ik[1], ik[2], ik[3]); quint_len = tvb_get_ntohs(tvb, offset+37); proto_tree_add_text(ext_tree_mm, tvb, offset+37, 2, "Quintuplets length: %x", quint_len); - + offset = offset + decode_quintuplet(tvb, offset+39, ext_tree_mm, count, 0) + 39; - + break; - case 3: + case 3: if (cipher == 0) { proto_tree_add_text(ext_tree_mm, tvb, offset+4, 1, "Ciphering: no ciphering"); } else { @@ -3296,13 +3296,13 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(ext_tree_mm, tvb, offset+13, 2, "Quintuplets length: %x", quint_len); offset = offset + decode_quintuplet(tvb, offset+15, ext_tree_mm, count, 0) + 15; - + break; default: break; } - - + + drx_split = tvb_get_guint8(tvb, offset); drx_len = (tvb_get_guint8(tvb, offset+1) >> 4) & 0x0F; drx_ccch = (tvb_get_guint8(tvb, offset+1) >> 3) & 0x01; @@ -3310,7 +3310,7 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre net_cap = tvb_get_ntohs(tvb, offset+2); con_len = tvb_get_ntohs(tvb, offset+4); - + proto_tree_add_text(ext_tree_mm, tvb, offset, 1, "DRX: split PG cycle code: %u", drx_split); proto_tree_add_text(ext_tree_mm, tvb, offset+1, 1, "DRX: CN specific DRX cycle length coefficient: %u", drx_len); proto_tree_add_text(ext_tree_mm, tvb, offset+1, 1, "DRX: split PG cycle on CCCH supported by MS: %s", yesno[drx_ccch]); @@ -3319,10 +3319,10 @@ decode_gtp_mm_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } else { proto_tree_add_text(ext_tree_mm, tvb, offset+1, 1, "DRX: max sec non-DRX mode after transfer state: 2^%u", non_drx_timer-1); } - + proto_tree_add_text(ext_tree_mm, tvb, offset+2, 2, "MS network capability: %u", net_cap); proto_tree_add_text(ext_tree_mm, tvb, offset+4, 2, "Container length: %u", con_len); - + if (con_len > 0) { trans_id = (tvb_get_guint8(tvb, offset+6) >> 4) & 0x0F; proto_disc = tvb_get_guint8(tvb, offset+6) & 0x0F; @@ -3348,15 +3348,15 @@ static guint8 hex2dec (guint8 x) return x; } -/* Wrapper function to add UTF-8 decoding for QoS attributes in +/* Wrapper function to add UTF-8 decoding for QoS attributes in * RADIUS messages. * */ static guint8 wrapped_tvb_get_guint8( tvbuff_t *tvb, int offset, int type) { if (type == 2) - return (hex2dec(tvb_get_guint8(tvb, offset)) << 4 - | hex2dec(tvb_get_guint8(tvb, offset + 1))); + return (hex2dec(tvb_get_guint8(tvb, offset)) << 4 + | hex2dec(tvb_get_guint8(tvb, offset + 1))); else return tvb_get_guint8(tvb, offset); } @@ -3383,13 +3383,13 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui int mss, mu, md, gu, gd; /* Will keep if the input is UTF-8 encoded (as in RADIUS messages). - * If 1, input is *not* UTF-8 encoded (i.e. each input octet corresponds + * If 1, input is *not* UTF-8 encoded (i.e. each input octet corresponds * to one byte to be dissected). * If 2, input is UTF-8 encoded (i.e. each *couple* of input octets * corresponds to one byte to be dissected) * */ guint8 utf8_type = 1; - + /* In RADIUS messages the QoS has a version field of two octets prepended. * */ guint8 version_buffer[2]; @@ -3408,14 +3408,14 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui proto_tree_add_text (ext_tree_qos, tvb, offset + 1, 2, "Length: %u", length); type++; /* +1 because of first 0x86 byte for UMTS QoS */ break; - case 3: + case 3: /* For QoS inside RADIUS Client messages from GGSN */ utf8_type = 2; - + /* The field in the RADIUS message starts one byte before :) */ length = tvb_get_guint8 (tvb, offset); te = proto_tree_add_text (tree, tvb, offset - 1, length, "%s", qos_str); - + ext_tree_qos = proto_item_add_subtree (te, ett_gtp_qos); version_buffer[0] = tvb_get_guint8(tvb, offset + 1); version_buffer[1] = tvb_get_guint8(tvb, offset + 2); @@ -3431,9 +3431,9 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui ext_tree_qos = NULL; break; } - + offset += type; - + /* In RADIUS messages there is no allocation-retention priority * so I don't need to wrap the following call to tvb_get_guint8 * */ @@ -3459,7 +3459,7 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui /* In RADIUS messages there is no allocation-retention priority */ if (type != 3) proto_tree_add_uint(ext_tree_qos, hf_gtpv1_qos_al_ret_priority, tvb, offset, 1, al_ret_priority); - + /* All additions must take care of the fact that QoS fields in RADIUS * messages are UTF-8 encoded, so we have to use the same trick as above. * */ @@ -3473,7 +3473,7 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui proto_tree_add_uint(ext_tree_qos, hf_gtpv1_qos_mean, tvb, offset+(3 - 1) * utf8_type + 1, utf8_type, mean); if (length > 4) { - + /* See above for the need of wrapping * */ traf_class = wrapped_tvb_get_guint8(tvb, offset+(4 - 1) * utf8_type + 1, utf8_type) & 0xE0; @@ -3488,7 +3488,7 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui traf_handl_prio = wrapped_tvb_get_guint8(tvb, offset+(9 - 1) * utf8_type + 1, utf8_type) & 0x03; guar_ul = wrapped_tvb_get_guint8(tvb, offset+(10 - 1) * utf8_type + 1, utf8_type); guar_dl = wrapped_tvb_get_guint8(tvb, offset+(11 - 1) * utf8_type + 1, utf8_type); - + /* See above comments for the changes * */ proto_tree_add_uint(ext_tree_qos, hf_gtpv1_qos_traf_class, tvb, offset+(4 - 1) * utf8_type + 1, utf8_type, traf_class); @@ -3509,7 +3509,7 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui mu = 64 + ( max_ul - 64 ) * 8; proto_tree_add_uint_format(ext_tree_qos, hf_gtpv1_qos_max_ul, tvb, offset+(6 - 1) * utf8_type + 1, utf8_type, mu, "Maximum bit rate for uplink : %u kbps", mu); } - + if(max_ul > 127 && max_ul <=254) { mu = 576 + ( max_ul - 128 ) * 64; proto_tree_add_uint_format(ext_tree_qos, hf_gtpv1_qos_max_ul, tvb, offset+(6 - 1) * utf8_type + 1, utf8_type, mu, "Maximum bit rate for uplink : %u kbps", mu); @@ -3558,9 +3558,9 @@ decode_qos_umts(tvbuff_t *tvb, int offset, proto_tree *tree, gchar* qos_str, gui gd = 576 + ( guar_dl - 128 ) * 64; proto_tree_add_uint_format(ext_tree_qos, hf_gtpv1_qos_guar_dl, tvb, offset+(11 - 1) * utf8_type + 1, utf8_type, gd, "Guaranteed bit rate for downlink : %u kbps", gd); } - + } - + return length + type; } @@ -3586,7 +3586,7 @@ decode_apn(tvbuff_t *tvb, int offset, guint16 length, proto_tree *tree) { } else { tvb_memcpy (tvb, apn, offset, length); } - + apn[length-1] = '\0'; proto_tree_add_string(tree, gtp_version ? hf_gtpv1_apn : hf_gtpv0_apn, tvb, offset, length, apn); g_free(apn); @@ -3595,7 +3595,7 @@ decode_apn(tvbuff_t *tvb, int offset, guint16 length, proto_tree *tree) { /* GPRS: 9.60 v7.6.0, chapter 7.9.20 * UMTS: 29.060 v4.0, chapter 7.7.29 - * TODO: unify addr functions + * TODO: unify addr functions */ static int decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { @@ -3604,33 +3604,33 @@ decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr pdp_type_org, pdp_type_num, pdp_addr_len; guint16 length, sn_down, sn_up, up_flow; guint32 addr_ipv4, up_teid, up_teid_cp; - struct e_in6_addr addr_ipv6; + struct e_in6_addr addr_ipv6; proto_tree *ext_tree_pdp; proto_item *te; - + length = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, length+3, val_to_str(GTP_EXT_PDP_CNTXT, gtp_val, "Unknown message")); ext_tree_pdp = proto_item_add_subtree(te, ett_gtp_pdp); - + vaa = (tvb_get_guint8(tvb, offset+3) >> 6) & 0x01; order = (tvb_get_guint8(tvb, offset+3) >> 4) & 0x01; nsapi = tvb_get_guint8(tvb, offset+3) & 0x0F; sapi = tvb_get_guint8(tvb, offset+4) & 0x0F; - + proto_tree_add_text(ext_tree_pdp, tvb, offset+3, 1, "VPLMN address allowed: %s", yesno[vaa]); proto_tree_add_text(ext_tree_pdp, tvb, offset+3, 1, "Reordering required: %s", yesno[order]); proto_tree_add_text(ext_tree_pdp, tvb, offset+3, 1, "NSAPI: %u", nsapi); proto_tree_add_text(ext_tree_pdp, tvb, offset+4, 1, "SAPI: %u", sapi); - + switch (gtp_version) { - case 0: + case 0: decode_qos_gprs(tvb, offset+5, ext_tree_pdp, "QoS subscribed", 0); decode_qos_gprs(tvb, offset+8, ext_tree_pdp, "QoS requested", 0); decode_qos_gprs(tvb, offset+11, ext_tree_pdp, "QoS negotiated", 0); offset = offset + 14; break; - case 1: + case 1: offset = offset + 5; offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS subscribed", 1); offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS requested", 1); @@ -3639,17 +3639,17 @@ decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr default: break; } - + sn_down = tvb_get_ntohs(tvb, offset); sn_up = tvb_get_ntohs(tvb, offset+2); pdu_send_no = tvb_get_guint8(tvb, offset+4); pdu_rec_no = tvb_get_guint8(tvb, offset+5); - + proto_tree_add_text(ext_tree_pdp, tvb, offset, 2, "Sequence number down: %u", sn_down); proto_tree_add_text(ext_tree_pdp, tvb, offset+2, 2, "Sequence number up: %u", sn_up); proto_tree_add_text(ext_tree_pdp, tvb, offset+4, 1, "Send N-PDU number: %u", pdu_send_no); proto_tree_add_text(ext_tree_pdp, tvb, offset+5, 1, "Receive N-PDU number: %u", pdu_rec_no); - + switch (gtp_version) { case 0: up_flow = tvb_get_ntohs(tvb, offset+6); @@ -3672,7 +3672,7 @@ decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr pdp_type_org = tvb_get_guint8(tvb, offset) & 0x0F; pdp_type_num = tvb_get_guint8(tvb, offset+1); pdp_addr_len = tvb_get_guint8(tvb, offset+2); - + proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "PDP organization: %s", val_to_str(pdp_type_org, pdp_type, "Unknown PDP org")); proto_tree_add_text(ext_tree_pdp, tvb, offset+1, 1, "PDP type: %s", val_to_str(pdp_type_num, pdp_org_type, "Unknown PDP type")); proto_tree_add_text(ext_tree_pdp, tvb, offset+2, 1, "PDP address length: %u", pdp_addr_len); @@ -3691,38 +3691,38 @@ decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr break; } } - + offset = offset + 3 + pdp_addr_len; ggsn_addr_len = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "GGSN address length: %u", ggsn_addr_len); - + switch (ggsn_addr_len) { - case 4: + case 4: tvb_memcpy(tvb, (guint8 *)&addr_ipv4, offset+1, sizeof addr_ipv4); proto_tree_add_text(ext_tree_pdp, tvb, offset+1, 4, "GGSN address: %s", ip_to_str((guint8 *)&addr_ipv4)); break; - case 16: + case 16: tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+1, sizeof addr_ipv6); proto_tree_add_text(ext_tree_pdp, tvb, offset+1, 16, "GGSN address: %s", ip6_to_str((struct e_in6_addr*)&addr_ipv6)); break; default: break; } - + offset = offset + 1 + ggsn_addr_len; - + if (gtp_version == 1) { ggsn_addr_len = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "GGSN 2 address length: %u", ggsn_addr_len); - + switch (ggsn_addr_len) { - case 4: + case 4: tvb_memcpy(tvb, (guint8 *)&addr_ipv4, offset+1, sizeof addr_ipv4); proto_tree_add_text(ext_tree_pdp, tvb, offset+1, 4, "GGSN 2 address: %s", ip_to_str((guint8 *)&addr_ipv4)); break; - case 16: + case 16: tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+1, sizeof addr_ipv6); proto_tree_add_text(ext_tree_pdp, tvb, offset+1, 16, "GGSN 2 address: %s", ip6_to_str((struct e_in6_addr*)&addr_ipv6)); break; @@ -3730,15 +3730,15 @@ decode_gtp_pdp_cntxt(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr break; } offset = offset + 1 + ggsn_addr_len; - + } - + apn_len = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "APN length: %u", apn_len); decode_apn(tvb, offset+1, apn_len, ext_tree_pdp); offset = offset + 1 + apn_len; - + trans_id = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "Transaction identifier: %u", trans_id); @@ -3754,12 +3754,12 @@ decode_gtp_apn(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr guint16 length; proto_tree *ext_tree_apn; proto_item *te; - - length = tvb_get_ntohs(tvb, offset+1); + + length = tvb_get_ntohs(tvb, offset+1); te = proto_tree_add_text(tree, tvb, offset, length+3, val_to_str(GTP_EXT_APN, gtp_val, "Unknown field")); ext_tree_apn = proto_item_add_subtree(te, ett_gtp_apn); - + proto_tree_add_text(ext_tree_apn, tvb, offset+1, 2, "APN length : %u", length); decode_apn(tvb, offset+3, length, ext_tree_apn); @@ -3791,43 +3791,43 @@ decode_gtp_proto_conf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree conf = tvb_get_guint8 (tvb, offset + 3) & 0x07; proto_tree_add_text (ext_tree_proto, tvb, offset + 3, 1, "Configuration protocol (00000xxx): %u", conf); - + proto_offset = 1; /* ... 1st byte is conf */ offset += 4; for (;;) { if (proto_offset >= length) break; - proto_len = tvb_get_guint8 (tvb, offset + 2); + proto_len = tvb_get_guint8 (tvb, offset + 2); proto_offset += proto_len + 3; /* 3 = proto id + length byte */ - - if ((proto_len > 0) && ppp_reorder) { - - /* this part changes layout of GTP payload: - * it swaps "length field" with "protocol header" */ - - ptr = (guint8 *)tvb_get_ptr(tvb, offset, 3); - - tmp = ptr[2]; - ptr[2] = ptr[1]; - ptr[1] = ptr[0]; - ptr[0] = tmp; - + + if ((proto_len > 0) && ppp_reorder) { + + /* this part changes layout of GTP payload: + * it swaps "length field" with "protocol header" */ + + ptr = (guint8 *)tvb_get_ptr(tvb, offset, 3); + + tmp = ptr[2]; + ptr[2] = ptr[1]; + ptr[1] = ptr[0]; + ptr[0] = tmp; + proto_tree_add_text (ext_tree_proto, tvb, offset, 3, "[WARNING] Next 3 bytes were swapped to allow processing PPP section"); proto_tree_add_text (ext_tree_proto, tvb, offset, 1, "Protocol %u length: %u", cnt, proto_len); - - next_tvb = tvb_new_subset (tvb, offset + 1, proto_len + 2, proto_len + 2); - call_dissector(ppp_handle, next_tvb, pinfo, ext_tree_proto); - + + next_tvb = tvb_new_subset (tvb, offset + 1, proto_len + 2, proto_len + 2); + call_dissector(ppp_handle, next_tvb, pinfo, ext_tree_proto); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP"); - - if (check_col(pinfo->cinfo, COL_INFO)) { - - msg = tvb_get_guint8(tvb, 1); - - col_set_str(pinfo->cinfo, COL_INFO, val_to_str(msg, message_type, "Unknown")); - } - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP"); + + if (check_col(pinfo->cinfo, COL_INFO)) { + + msg = tvb_get_guint8(tvb, 1); + + col_set_str(pinfo->cinfo, COL_INFO, val_to_str(msg, message_type, "Unknown")); + } + } offset += proto_len + 3; cnt++; @@ -3841,19 +3841,19 @@ decode_gtp_proto_conf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree */ static int decode_gtp_gsn_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint8 addr_type, addr_len; - guint16 length; + + guint8 addr_type, addr_len; + guint16 length; guint32 addr_ipv4; struct e_in6_addr addr_ipv6; proto_tree *ext_tree_gsn_addr; proto_item *te; - + length = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, 3+length, "GSN address : "); ext_tree_gsn_addr = proto_item_add_subtree(te, ett_gtp_gsn_addr); - + switch (length) { case 4: proto_tree_add_text(ext_tree_gsn_addr, tvb, offset+1, 2, "GSN address length : %u", length); @@ -3872,12 +3872,12 @@ decode_gtp_gsn_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_ipv4(ext_tree_gsn_addr, gtp_version ? hf_gtpv1_gsn_ipv4 : hf_gtpv0_gsn_ipv4, tvb, offset+4, 4, addr_ipv4); break; case 16: - proto_tree_add_text(ext_tree_gsn_addr, tvb, offset+1, 2, "GSN address length : %u", length); + proto_tree_add_text(ext_tree_gsn_addr, tvb, offset+1, 2, "GSN address length : %u", length); tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+3, sizeof addr_ipv6); proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr*)&addr_ipv6)); proto_tree_add_ipv6(ext_tree_gsn_addr, gtp_version ? hf_gtpv1_gsn_ipv6 : hf_gtpv0_gsn_ipv6, tvb, offset+3, 16, (guint8*)&addr_ipv6); break; - case 17: + case 17: proto_tree_add_text(ext_tree_gsn_addr, tvb, offset+1, 2, "GSN address Information Element length : %u", length); addr_type = tvb_get_guint8(tvb, offset+3) & 0xC0; proto_tree_add_uint(ext_tree_gsn_addr, gtp_version ? hf_gtpv1_gsn_addr_type : hf_gtpv0_gsn_addr_type, tvb, offset+3, 1, addr_type); @@ -3891,7 +3891,7 @@ decode_gtp_gsn_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_item_append_text(te, "unknown type or wrong length"); break; } - + return 3+length; } @@ -3900,20 +3900,20 @@ decode_gtp_gsn_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_msisdn(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + const guint8 *msisdn_val; gchar *msisdn_str; guint16 length; - + length = tvb_get_ntohs(tvb, offset+1); - + if (length < 1) return 3; - + msisdn_val = tvb_get_ptr(tvb, offset+3, length); msisdn_str = msisdn_to_str(msisdn_val, length); - + proto_tree_add_string(tree, gtp_version ? hf_gtpv1_msisdn : hf_gtpv0_msisdn, tvb, offset, 3+length, msisdn_str); - + return 3+length; } @@ -3932,7 +3932,7 @@ decode_gtp_qos_umts(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_auth_qui(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + return (1 + decode_quintuplet(tvb, offset+1, tree, 1, 1)); } @@ -3950,60 +3950,60 @@ decode_gtp_tft(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr struct e_in6_addr addr_ipv6, mask_ipv6; proto_tree *ext_tree_tft, *ext_tree_tft_pf, *ext_tree_tft_flags; proto_item *te, *tee, *tef; - + length = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, 3+length, "Traffic flow template"); ext_tree_tft = proto_item_add_subtree(te, ett_gtp_tft); - + tft_flags = tvb_get_guint8(tvb, offset+3); tft_code = (tft_flags >> 5) & 0x07; spare = (tft_flags >> 4) & 0x01; no_packet_filters = tft_flags & 0x0F; - + proto_tree_add_text(ext_tree_tft, tvb, offset+1, 2, "TFT length: %u", length); tef = proto_tree_add_text (ext_tree_tft, tvb, offset + 3, 1, "TFT flags"); ext_tree_tft_flags = proto_item_add_subtree (tef, ett_gtp_tft_flags); - proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_code, tvb, offset + 3, 1, tft_flags); - proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_spare, tvb, offset + 3, 1, tft_flags); - proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_number, tvb, offset + 3, 1, tft_flags); + proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_code, tvb, offset + 3, 1, tft_flags); + proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_spare, tvb, offset + 3, 1, tft_flags); + proto_tree_add_uint (ext_tree_tft_flags, hf_gtpv1_tft_number, tvb, offset + 3, 1, tft_flags); offset = offset + 4; - + for (i=0;i<no_packet_filters;i++) { - + pf_id = tvb_get_guint8(tvb, offset); - + tee = proto_tree_add_text (ext_tree_tft, tvb, offset, 1, "Packet filter id: %u", pf_id); ext_tree_tft_pf = proto_item_add_subtree (tee, ett_gtp_tft_pf); offset++; if (tft_code != 2) { - + pf_eval = tvb_get_guint8(tvb, offset); pf_len = tvb_get_guint8(tvb, offset + 1); - + proto_tree_add_uint (ext_tree_tft_pf, hf_gtpv1_tft_eval, tvb, offset, 1, pf_eval); proto_tree_add_text (ext_tree_tft_pf, tvb, offset+1, 1, "Content length: %u", pf_len); offset = offset + 2; pf_offset = 0; - while (pf_offset < pf_len) { - + while (pf_offset < pf_len) { + pf_content_id = tvb_get_guint8 (tvb, offset + pf_offset); switch (pf_content_id) { /* address IPv4 and mask = 8 bytes*/ - case 0x10: + case 0x10: tvb_memcpy (tvb, (guint8 *)&addr_ipv4, offset + pf_offset + 1, sizeof addr_ipv4); tvb_memcpy (tvb, (guint8 *)&mask_ipv4, offset + pf_offset + 5, sizeof mask_ipv4); proto_tree_add_text (ext_tree_tft_pf, tvb, offset + pf_offset, 9, "ID 0x10: IPv4/mask: %s/%s", ip_to_str ((guint8 *)&addr_ipv4), ip_to_str ((guint8 *)&mask_ipv4)); pf_offset = pf_offset + 9; break; /* address IPv6 and mask = 32 bytes*/ - case 0x20: + case 0x20: tvb_memcpy (tvb, (guint8 *)&addr_ipv6, offset+pf_offset+1, sizeof addr_ipv6); tvb_memcpy (tvb, (guint8 *)&mask_ipv6, offset+pf_offset+17, sizeof mask_ipv6); proto_tree_add_text (ext_tree_tft_pf, tvb, offset+pf_offset, 33, "ID 0x20: IPv6/mask: %s/%s", ip6_to_str ((struct e_in6_addr*)&addr_ipv6), ip6_to_str ((struct e_in6_addr*)&mask_ipv6)); @@ -4059,8 +4059,8 @@ decode_gtp_tft(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_text (ext_tree_tft_pf, tvb, offset + pf_offset, 4, "ID 0x80: Flow Label: %u (%x)", label, label); pf_offset = pf_offset + 4; break; - - default: + + default: proto_tree_add_text (ext_tree_tft_pf, tvb, offset + pf_offset, 1, "Unknown value: %x ", pf_content_id); pf_offset++; /* to avoid infinite loop */ break; @@ -4068,7 +4068,7 @@ decode_gtp_tft(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr } offset = offset + pf_offset; - } + } } return 3 + length; @@ -4086,7 +4086,7 @@ decode_gtp_target_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr length = tvb_get_ntohs(tvb, offset + 1); proto_tree_add_text(tree, tvb, offset, 3 + length, "Targer Identification"); - + return 3 + length; } @@ -4106,7 +4106,7 @@ decode_gtp_utran_cont(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t return 3 + length; } - + /* GPRS: not present * UMTS: 29.060 v4.0, chapter 7.7.39 @@ -4120,7 +4120,7 @@ decode_gtp_rab_setup(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr struct e_in6_addr addr_ipv6; proto_tree *ext_tree_rab_setup; proto_item *te; - + length = tvb_get_ntohs(tvb, offset + 1); nsapi = tvb_get_guint8(tvb, offset + 3) & 0x0F; @@ -4131,17 +4131,17 @@ decode_gtp_rab_setup(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr proto_tree_add_uint(ext_tree_rab_setup, hf_gtpv1_nsapi, tvb, offset+3, 1, nsapi); if (length > 1) { - + teid = tvb_get_ntohl(tvb, offset + 4); proto_tree_add_uint(ext_tree_rab_setup, hf_gtpv1_teid_data, tvb, offset+4, 4, teid); - + switch (length) { case 12: tvb_memcpy(tvb, (guint8 *)&addr_ipv4, offset+8, sizeof addr_ipv4); proto_tree_add_ipv4(ext_tree_rab_setup, hf_gtpv1_rnc_ipv4, tvb, offset+8, 4, addr_ipv4); break; - case 24: + case 24: tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+8, sizeof addr_ipv6); proto_tree_add_ipv6(ext_tree_rab_setup, hf_gtpv1_rnc_ipv6, tvb, offset+8, 16, (guint8 *)&addr_ipv6); break; @@ -4164,12 +4164,12 @@ decode_gtp_hdr_list(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre guint8 length, hdr; proto_tree *ext_tree_hdr_list; proto_item *te; - + length = tvb_get_guint8(tvb, offset + 1); te = proto_tree_add_text(tree, tvb, offset, 2+length, "%s", val_to_str(GTP_EXT_HDR_LIST, gtp_val, "Unknown")); ext_tree_hdr_list = proto_item_add_subtree(te, ett_gtp_hdr_list); - + proto_tree_add_text(ext_tree_hdr_list, tvb, offset+1, 1, "Number of Extension Header Types in list (i.e., length) : %u", length); for(i=0 ; i<length ; i++) { @@ -4220,27 +4220,27 @@ decode_gtp_omc_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree */ static int decode_gtp_chrg_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint16 length; + + guint16 length; guint32 addr_ipv4; struct e_in6_addr addr_ipv6; proto_tree *ext_tree_chrg_addr; proto_item *te; - + length = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, 3+length, "%s : ", val_to_str(GTP_EXT_CHRG_ADDR, gtp_val, "Unknown")); ext_tree_chrg_addr = proto_item_add_subtree(te, ett_gtp_chrg_addr); - + proto_tree_add_text(ext_tree_chrg_addr, tvb, offset+1, 2, "%s length : %u", val_to_str(GTP_EXT_CHRG_ADDR, gtp_val, "Unknown"), length); - + switch (length) { case 4: tvb_memcpy(tvb, (guint8 *)&addr_ipv4, offset+3, sizeof addr_ipv4); proto_item_append_text(te, "%s", ip_to_str((guint8 *)&addr_ipv4)); proto_tree_add_ipv4(ext_tree_chrg_addr, gtp_version ? hf_gtpv1_chrg_ipv4 : hf_gtpv0_chrg_ipv4, tvb, offset+3, 4, addr_ipv4); break; - case 16: + case 16: tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+3, sizeof addr_ipv6); proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr*)&addr_ipv6)); proto_tree_add_ipv6(ext_tree_chrg_addr, gtp_version ? hf_gtpv1_chrg_ipv6 : hf_gtpv0_chrg_ipv6, tvb, offset+3, 16, (guint8*)&addr_ipv6); @@ -4258,18 +4258,18 @@ decode_gtp_chrg_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr */ static int decode_gtp_rel_pack(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 length, n, number; proto_tree *ext_tree_rel_pack; proto_item *te; length = tvb_get_ntohs(tvb, offset + 1); - + te = proto_tree_add_text(tree, tvb, offset, 3 + length, "Sequence numbers of released packets IE"); ext_tree_rel_pack = proto_item_add_subtree(te, ett_gtp_rel_pack); - + n = 0; - + while (n < length) { number = tvb_get_ntohs(tvb, offset + 3 + n); @@ -4277,7 +4277,7 @@ decode_gtp_rel_pack(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre n = n + 2; } - + return 3 + length; } @@ -4286,18 +4286,18 @@ decode_gtp_rel_pack(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_can_pack(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 length, n, number; proto_tree *ext_tree_can_pack; proto_item *te; length = tvb_get_ntohs(tvb, offset + 1); - + te = proto_tree_add_text(tree, tvb, offset, 3 + length, "Sequence numbers of cancelled packets IE"); ext_tree_can_pack = proto_item_add_subtree(te, ett_gtp_can_pack); - + n = 0; - + while (n < length) { number = tvb_get_ntohs(tvb, offset + 3 + n); @@ -4305,14 +4305,14 @@ decode_gtp_can_pack(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre n = n + 2; } - + return 3 + length; } /* CDRs dissector */ static int decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 length, format_ver, data_len, i, j; guint8 no, format, rectype; proto_tree *ext_tree, *cdr_tree; @@ -4320,12 +4320,12 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_DATA_REQ, gtp_val, "Unknown message")); ext_tree = proto_item_add_subtree(te, ett_gtp_ext); - + length = tvb_get_ntohs(tvb, offset + 1); no = tvb_get_guint8(tvb, offset + 3); format = tvb_get_guint8(tvb, offset + 4); format_ver = tvb_get_ntohs(tvb, offset + 5); - + proto_tree_add_text(ext_tree, tvb, offset+1, 2, "Length: %u", length); proto_tree_add_text(ext_tree, tvb, offset+3, 1, "Number of data records: %u", no); proto_tree_add_text(ext_tree, tvb, offset+4, 1, "Data record format: %u", format); @@ -4335,18 +4335,18 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre offset = offset + 7; if (gtpv0_cdr_as != DONT_DISSECT_CDRS) { - + for (i = 0; i < no; i++) { data_len = tvb_get_ntohs(tvb, offset); rectype = tvb_get_guint8(tvb, offset+2); switch (rectype) { - case 0x13: /* GCDR */ + case 0x13: /* GCDR */ if (tvb_length_remaining(tvb, offset) < 3 + 118) { proto_tree_add_text(ext_tree, tvb, offset, tvb_length_remaining(tvb, offset), "GCDR fragmented, can't dissect"); break; } - - tvb_memcpy(tvb, gcdr.imsi, offset+3, 8); + + tvb_memcpy(tvb, gcdr.imsi, offset+3, 8); tvb_memcpy(tvb, (guint8 *)&gcdr.ggsnaddr, offset+11, sizeof gcdr.ggsnaddr); gcdr.chrgid = tvb_get_ntohl(tvb, offset+15); tvb_memcpy(tvb, (guint8 *)&gcdr.sgsnaddr, offset+19, sizeof gcdr.sgsnaddr); @@ -4362,7 +4362,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre gcdr.duration = tvb_get_ntohl(tvb, offset+112); gcdr.closecause = tvb_get_guint8(tvb, offset+116); gcdr.seqno = tvb_get_ntohl(tvb, offset+117); - + ce = proto_tree_add_text(ext_tree, tvb, offset, data_len + 2, "GCDR (0x13), sequence number: %u", gcdr.seqno); cdr_tree = proto_item_add_subtree(ce, ett_gtp_ext); proto_tree_add_text(cdr_tree, tvb, offset, 2, "Length: %u", data_len); @@ -4384,12 +4384,12 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+112, 4, "Duration: %s", rel_time_int_to_str(gcdr.duration)); proto_tree_add_text(cdr_tree, tvb, offset+116, 1, "Cause for close: %s (%u)", val_to_str(gcdr.closecause, cdr_close_type, "Unknown cause"), gcdr.closecause); proto_tree_add_text(cdr_tree, tvb, offset+117, 4, "Sequence number: %u", gcdr.seqno); - + if (data_len > 119) { tvb_memcpy (tvb, gcdr.msisdn, offset + 121, 9); proto_tree_add_text(cdr_tree, tvb, offset+121, 9, "MSISDN: %s", msisdn_to_str (gcdr.msisdn, 9)); } - + break; case 0x12: /* SCDR */ @@ -4397,7 +4397,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(ext_tree, tvb, offset, tvb_length_remaining(tvb, offset), "SCDR fragmented, can't dissect"); break; } - + scdr.len = tvb_get_letohs(tvb, offset+3); scdr.netini = tvb_get_guint8(tvb, offset+5); scdr.anon = tvb_get_guint8(tvb, offset+6); @@ -4457,7 +4457,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+35, 4, "SGSN address: %s", ip_to_str((guint8 *)&scdr.sgsnaddr)); proto_tree_add_text(cdr_tree, tvb, offset+39, 12, "(not used)"); proto_tree_add_text(cdr_tree, tvb, offset+51, 1, "MS network capability length: %u", scdr.msclass_caplen); - + /* cap_id = proto_tree_add_text(cdr_tree, tvb, offset+52, 1, "MS network capability: %u", scdr.msclass_cap); cap_tree = proto_item_add_subtree(cap_id, ett_chrg_cap); proto_tree_add_uint(cap_tree, hf_gtpv0_chrg_cap_gea, tvb, offset+52, 1, scdr.cap); @@ -4488,7 +4488,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+152+23*j, 4, "Downlink: %x", scdr.change[j].downlink); decode_qos_gprs(tvb, offset+156, cdr_tree, "QoS requested", 0); decode_qos_gprs(tvb, offset+159, cdr_tree, "QoS negotiated", 0); - } + } proto_tree_add_text(cdr_tree, tvb, offset+254, 4, "Timestamp: %s", time_int_to_str(scdr.timestamp)); proto_tree_add_text(cdr_tree, tvb, offset+258, 4, "Opening: %s", time_int_to_str(scdr.opening)); proto_tree_add_text(cdr_tree, tvb, offset+262, 4, "Duration: %s", rel_time_int_to_str(scdr.duration)); @@ -4553,7 +4553,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+33, 4, "SGSN address: %s", ip_to_str((guint8 *)&mcdr.sgsnaddr)); proto_tree_add_text(cdr_tree, tvb, offset+37, 12, "(not used)"); proto_tree_add_text(cdr_tree, tvb, offset+49, 1, "MS network capability length: %u", mcdr.msclass_caplen); - + /* cap_id = proto_tree_add_text(cdr_tree, tvb, offset+50, 1, "MS network capability: %u", mcdr.msclass_cap); cap_tree = proto_item_add_subtree(cap_id, ett_chrg_cap); proto_tree_add_uint(cap_tree, hf_gtpv0_chrg_cap_gea, tvb, offset+50, 1, mcdr.cap); @@ -4627,7 +4627,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+23, 10, "MSISDN: %s", msisdn_to_str(socdr.msisdn, 10)); proto_tree_add_text(cdr_tree, tvb, offset+33, 12, "(not used)"); proto_tree_add_text(cdr_tree, tvb, offset+45, 1, "MS network capability length: %u", socdr.msclass_caplen); - + /* cap_id = proto_tree_add_text(cdr_tree, tvb, offset+46, 1, "MS network capability: %u", socdr.msclass_cap); cap_tree = proto_item_add_subtree(cap_id, ett_chrg_cap); proto_tree_add_uint(cap_tree, hf_gtpv0_chrg_cap_gea, tvb, offset+46, 1, socdr.cap); @@ -4686,7 +4686,7 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_text(cdr_tree, tvb, offset+23, 10, "MSISDN: %s", msisdn_to_str(stcdr.msisdn, 10)); proto_tree_add_text(cdr_tree, tvb, offset+33, 12, "(not used)"); proto_tree_add_text(cdr_tree, tvb, offset+45, 1, "MS network capability length: %u", stcdr.msclass_caplen); - + /* cap_id = proto_tree_add_text(cdr_tree, tvb, offset+46, 1, "MS network capability: %u", stcdr.msclass_cap); cap_tree = proto_item_add_subtree(cap_id, ett_chrg_cap); proto_tree_add_uint(cap_tree, hf_gtpv0_chrg_cap_gea, tvb, offset+46, 1, stcdr.cap); @@ -4718,18 +4718,18 @@ decode_gtp_data_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre */ static int decode_gtp_data_resp(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - + guint16 length, n, number; proto_tree *ext_tree_data_resp; proto_item *te; length = tvb_get_ntohs(tvb, offset + 1); - + te = proto_tree_add_text(tree, tvb, offset, 3 + length, "Requests responded"); ext_tree_data_resp = proto_item_add_subtree(te, ett_gtp_data_resp); - + n = 0; - + while (n < length) { number = tvb_get_ntohs(tvb, offset + 3 + n); @@ -4741,33 +4741,33 @@ decode_gtp_data_resp(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr return 3 + length; } - + /* GPRS: 12.15 * UMTS: 33.015 */ static int decode_gtp_node_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint16 length; + + guint16 length; guint32 addr_ipv4; struct e_in6_addr addr_ipv6; proto_tree *ext_tree_node_addr; proto_item *te; - + length = tvb_get_ntohs(tvb, offset+1); - + te = proto_tree_add_text(tree, tvb, offset, 3+length, "Node address: "); ext_tree_node_addr = proto_item_add_subtree(te, ett_gtp_node_addr); - + proto_tree_add_text(ext_tree_node_addr, tvb, offset+1, 2, "Node address length: %u", length); - + switch (length) { case 4: tvb_memcpy(tvb, (guint8 *)&addr_ipv4, offset+3, sizeof addr_ipv4); proto_item_append_text(te, "%s", ip_to_str((guint8 *)&addr_ipv4)); proto_tree_add_ipv4(ext_tree_node_addr, gtp_version ? hf_gtpv1_node_ipv4 : hf_gtpv0_node_ipv4, tvb, offset+3, 4, addr_ipv4); break; - case 16: + case 16: tvb_memcpy(tvb, (guint8 *)&addr_ipv6, offset+3, sizeof addr_ipv6); proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr*)&addr_ipv6)); proto_tree_add_ipv6(ext_tree_node_addr, gtp_version ? hf_gtpv1_node_ipv6 : hf_gtpv0_node_ipv6, tvb, offset+3, 16, (guint8*)&addr_ipv6); @@ -4785,25 +4785,25 @@ decode_gtp_node_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr * UMTS: 29.060 v4.0, chapter 7.7.44 */ static int -decode_gtp_priv_ext(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - - guint16 length, ext_id; +decode_gtp_priv_ext(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { + + guint16 length, ext_id; gchar ext_val[64]; proto_tree *ext_tree_priv_ext; proto_item *te; - + te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_PRIV_EXT, gtp_val, "Unknown message")); ext_tree_priv_ext = proto_item_add_subtree(te, ett_gtp_ext); - + length = tvb_get_ntohs(tvb, offset+1); if (length < 1) return 3+length; - - ext_id = tvb_get_ntohs(tvb, offset+3); + + ext_id = tvb_get_ntohs(tvb, offset+3); tvb_memcpy(tvb, ext_val, offset+5, length > 65 ? 63 : length-2); ext_val[length > 65 ? 64 : length-1] = '\0'; proto_tree_add_uint(ext_tree_priv_ext, gtp_version ? hf_gtpv1_ext_id : hf_gtpv0_ext_id, tvb, offset+3, 2, ext_id); proto_tree_add_string(ext_tree_priv_ext, gtp_version ? hf_gtpv1_ext_val : hf_gtpv0_ext_val, tvb, offset+5, length-2, ext_val); - + return 3+length; } @@ -4818,7 +4818,7 @@ decode_gtp_unknown(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static void dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - + _gtpv0_hdr gtpv0_hdr; proto_item *ti, *tf; proto_tree *gtpv0_tree, *flags_tree; @@ -4827,13 +4827,13 @@ dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *tid_val; gchar *tid_str; int offset, length, i, mandatory, checked_field, gtp_prime = 0; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - tvb_memcpy(tvb, (guint8 *)>pv0_hdr, 0, 12); + tvb_memcpy(tvb, (guint8 *)>pv0_hdr, 0, 12); tid_val = tvb_get_ptr(tvb, 12, 8); tid_str = id_to_str(tid_val); gtp_version = (gtpv0_hdr.flags >> 5) & 0x07; @@ -4857,9 +4857,9 @@ dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(gtpv0_hdr.message, message_type, "Unknown")); - + if (tree) { - + /* dissect GTP header */ ti = proto_tree_add_item(tree, proto_gtpv0, tvb, 0, -1, FALSE); gtpv0_tree = proto_item_add_subtree(ti, ett_gtp); @@ -4871,7 +4871,7 @@ dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(flags_tree, hf_gtpv0_flags_pt, tvb, 0, 1, gtpv0_hdr.flags); proto_tree_add_uint(flags_tree, hf_gtpv0_flags_spare, tvb, 0, 1, gtpv0_hdr.flags); proto_tree_add_boolean(flags_tree, hf_gtpv0_flags_snn, tvb, 0, 1, gtpv0_hdr.flags); - + gtpv0_hdr.length = g_ntohs(gtpv0_hdr.length); gtpv0_hdr.seq_no = g_ntohs(gtpv0_hdr.seq_no); proto_tree_add_uint(gtpv0_tree, hf_gtpv0_message_type, tvb, 1, 1, gtpv0_hdr.message); @@ -4884,22 +4884,22 @@ dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(gtpv0_tree, hf_gtpv0_sndcp_number, tvb, 8, 1, gtpv0_hdr.sndcp_no); proto_tree_add_string(gtpv0_tree, hf_gtpv0_tid, tvb, 12, 8, tid_str); } - + if (gtpv0_hdr.message != GTP_MSG_TPDU) { - + proto_tree_add_text(gtpv0_tree, tvb, 0, 0, "[--- end of GTPv0 header, beginning of extension headers ---]"); - + offset = gtp_prime ? GTP_PRIME_HDR_LENGTH : GTPv0_HDR_LENGTH; length = tvb_length(tvb); mandatory = 0; /* check order of GTP fields against ETSI */ - + for (;;) { - + if (offset >= length) break; ext_hdr_val = tvb_get_guint8(tvb, offset); - + if (gtpv0_etsi_order) { checked_field = check_field_presence (gtpv0_hdr.message, ext_hdr_val , (int *)&mandatory); switch (checked_field) { @@ -4911,30 +4911,30 @@ dissect_gtpv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: proto_tree_add_text(gtpv0_tree, tvb, offset, 1, "[WARNING] wrong next field, should be: %s", val_to_str(checked_field, gtp_val, "Unknown extension field")); } } - + i = -1; while (gtpopt[++i].optcode) if (gtpopt[i].optcode == ext_hdr_val) break; offset = offset + (*gtpopt[i].decode)(tvb, offset, pinfo, gtpv0_tree); } } - } + } /* next part dissects sublayers of GTP * right now it's only IP */ - + if ((gtpv0_hdr.message == GTP_MSG_TPDU) && gtp_tpdu) { next_tvb = tvb_new_subset(tvb, 20, -1, -1); call_dissector(ip_handle, next_tvb, pinfo, tree); if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_append_str_gtp(pinfo->cinfo, COL_PROTOCOL, "GTP"); } - + } /* GTP v1 dissector */ static void dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - + _gtpv1_hdr gtpv1_hdr; proto_item *ti, *tf; proto_tree *gtpv1_tree, *flags_tree; @@ -4942,7 +4942,7 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 ext_hdr_val, i, hdr_offset = 4, next_hdr, npdu_no, sub_proto; tvbuff_t *next_tvb; int offset, length, mandatory, checked_field, gtp_prime = 0; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP-C"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -4955,22 +4955,22 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_add_str(pinfo->cinfo, COL_INFO, val_to_str(gtpv1_hdr.message, message_type, "Unknown")); if (tree) { - + ti = proto_tree_add_item(tree, proto_gtpv1, tvb, 0, -1, FALSE); gtpv1_tree = proto_item_add_subtree(ti, ett_gtp); tf = proto_tree_add_uint(gtpv1_tree, hf_gtpv1_flags, tvb, 0, 1, gtpv1_hdr.flags); flags_tree = proto_item_add_subtree(tf, ett_gtp_flags); - + proto_tree_add_uint(flags_tree, hf_gtpv1_flags_ver, tvb, 0, 1, gtpv1_hdr.flags); proto_tree_add_uint(flags_tree, hf_gtpv1_flags_pt, tvb, 0, 1, gtpv1_hdr.flags); proto_tree_add_uint(flags_tree, hf_gtpv1_flags_spare, tvb, 0, 1, gtpv1_hdr.flags); proto_tree_add_boolean(flags_tree, hf_gtpv1_flags_e, tvb, 0, 1, gtpv1_hdr.flags); proto_tree_add_boolean(flags_tree, hf_gtpv1_flags_s, tvb, 0, 1, gtpv1_hdr.flags); proto_tree_add_boolean(flags_tree, hf_gtpv1_flags_pn, tvb, 0, 1, gtpv1_hdr.flags); - + proto_tree_add_uint(gtpv1_tree, hf_gtpv1_message_type, tvb, 1, 1, gtpv1_hdr.message); - + gtpv1_hdr.length = g_ntohs(gtpv1_hdr.length); proto_tree_add_uint(gtpv1_tree, hf_gtpv1_length, tvb, 2, 2, gtpv1_hdr.length); @@ -4978,8 +4978,8 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* GTP' has 6 bytes of length */ - if (!gtp_prime) { - + if (!gtp_prime) { + gtpv1_hdr.teid = g_ntohl(gtpv1_hdr.teid); proto_tree_add_uint(gtpv1_tree, hf_gtpv1_teid, tvb, 4, 4, gtpv1_hdr.teid); @@ -4991,26 +4991,26 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { next_hdr = tvb_get_guint8(tvb, 11); proto_tree_add_uint(gtpv1_tree, hf_gtpv1_next, tvb, 11, 1, next_hdr); hdr_offset = 0; - + if (next_hdr) hdr_offset = 1; else hdr_offset = 0; } } - + if (gtpv1_hdr.message != GTP_MSG_TPDU) { proto_tree_add_text(gtpv1_tree, tvb, 0, 0, "[--- end of GTP v1 header, beginning of extension headers ---]"); - + offset = gtp_prime ? GTP_PRIME_HDR_LENGTH: GTPv1_HDR_LENGTH - hdr_offset; length = tvb_length(tvb); - + mandatory = 0; /* check order of GTP fields against ETSI */ - + for (;;) { - + if (offset >= length) break; ext_hdr_val = tvb_get_guint8(tvb, offset); - + if (gtpv1_etsi_order) { checked_field = check_field_presence (gtpv1_hdr.message, ext_hdr_val , (int *)&mandatory); switch (checked_field) { @@ -5022,12 +5022,12 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: proto_tree_add_text(gtpv1_tree, tvb, offset, 1, "[WARNING] wrong next field, should be: %s", val_to_str(checked_field, gtp_val, "Unknown extension field")); } } - + i = -1; while (gtpopt[++i].optcode) if (gtpopt[i].optcode == ext_hdr_val) break; offset = offset + (*gtpopt[i].decode)(tvb, offset, pinfo, gtpv1_tree); } - } + } } if (gtpv1_hdr.message == GTP_MSG_ERR_IND) @@ -5036,8 +5036,8 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ((gtpv1_hdr.message == GTP_MSG_TPDU) && gtp_tpdu) { - - if (gtpv1_hdr.flags & 0x07) { + + if (gtpv1_hdr.flags & 0x07) { if (tvb_get_guint8 (tvb, 11)) hdr_offset = 1; /* if next_hdr != 0 */ else @@ -5048,9 +5048,9 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { switch(sub_proto) { case GTP_PPP_0x00: - case GTP_PPP_0xC0: - case GTP_PPP_0x80: - case GTP_PPP_0xC2: + case GTP_PPP_0xC0: + case GTP_PPP_0x80: + case GTP_PPP_0xC2: next_tvb = tvb_new_subset(tvb, GTPv1_HDR_LENGTH - hdr_offset, -1, -1); call_dissector(ppp_handle, next_tvb, pinfo, tree); if (check_col(pinfo->cinfo, COL_PROTOCOL)) @@ -5061,9 +5061,9 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { sub_proto = tvb_get_guint8(tvb,GTPv1_HDR_LENGTH - hdr_offset+2); switch(sub_proto) { case GTP_PPP_0x00: - case GTP_PPP_0xC0: - case GTP_PPP_0x80: - case GTP_PPP_0xC2: + case GTP_PPP_0xC0: + case GTP_PPP_0x80: + case GTP_PPP_0xC2: next_tvb = tvb_new_subset(tvb, GTPv1_HDR_LENGTH - hdr_offset+2, -1, -1); call_dissector(ppp_handle, next_tvb, pinfo, tree); if (check_col(pinfo->cinfo, COL_PROTOCOL)) @@ -5079,24 +5079,24 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; } break; - default: + default: next_tvb = tvb_new_subset(tvb, GTPv1_HDR_LENGTH - hdr_offset, -1, -1); call_dissector(ip_handle, next_tvb, pinfo, tree); if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_append_str_gtp(pinfo->cinfo, COL_PROTOCOL, "GTP-U"); break; - } + } } } -static const true_false_string yes_no_tfs = { +static const true_false_string yes_no_tfs = { "yes" , "no" }; void proto_register_gtp(void) -{ +{ static hf_register_info hf_gtpv0[] = { @@ -5160,7 +5160,7 @@ proto_register_gtp(void) }; - + static hf_register_info hf_gtpv1[] = { { &hf_gtpv1_flags, { "Flags", "gtpv1.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare/E/S/PN", HFILL }}, @@ -5247,12 +5247,12 @@ proto_register_gtp(void) { &hf_gtpv1_qos_traf_handl_prio, { "Traffic handling priority", "gtpv1.qos_traf_handl_prio", FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK, "Traffic Handling Priority", HFILL }}, { &hf_gtpv1_qos_guar_ul, { "Guaranteed bit rate for uplink", "gtpv1.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, "Guaranteed bit rate for uplink", HFILL }}, { &hf_gtpv1_qos_guar_dl, { "Guaranteed bit rate for downlink", "gtpv1.qos_guar_dl", FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0, "Guaranteed bit rate for downlink", HFILL }}, - + { &hf_gtpv1_tft_code, { "TFT operation code", "gtpv1.tft_code", FT_UINT8, BASE_DEC, VALS (tft_code_type), GTPv1_TFT_CODE_MASK, "TFT operation code", HFILL }}, { &hf_gtpv1_tft_spare, { "TFT spare bit", "gtpv1.tft_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK, "TFT spare bit", HFILL }}, { &hf_gtpv1_tft_number, { "Number of packet filters", "gtpv1.tft_number", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK, "Number of packet filters", HFILL }}, { &hf_gtpv1_tft_eval, { "Evaluation precedence", "gtpv1.tft_eval", FT_UINT8, BASE_DEC, NULL, 0, "Evaluation precedence", HFILL }}, - + { &hf_gtpv1_rnc_ipv4, { "RNC address IPv4", "gtpv1.rnc_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "Radio Network Controller address IPv4", HFILL }}, { &hf_gtpv1_rnc_ipv6, { "RNC address IPv6", "gtpv1.rnc_ipv6", FT_IPv6, BASE_HEX, NULL, 0, "Radio Network Controller address IPv6", HFILL }}, { &hf_gtpv1_chrg_ipv4, { "CG address IPv4", "gtpv1.chrg_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "Charging Gateway address IPv4", HFILL }}, @@ -5299,7 +5299,7 @@ proto_register_gtp(void) }; module_t *gtp_module; - + static enum_val_t gtpv0_cdr_options[] = { { "GSM 12.15 (not implemented yet)", 0 }, { "Nokia CDR", 1 }, @@ -5309,17 +5309,17 @@ proto_register_gtp(void) /* proto_gtp defined only for preference tab */ proto_gtp = proto_register_protocol ("GPRS Tunneling Protocol", "GTP", "gtp"); - + proto_gtpv0 = proto_register_protocol ("GPRS Tunnelling Protocol v0", "GTPv0", "gtpv0"); proto_register_field_array(proto_gtpv0, hf_gtpv0, array_length(hf_gtpv0)); proto_register_subtree_array(ett_gtp_array, array_length(ett_gtp_array)); - + proto_gtpv1 = proto_register_protocol("GPRS Tunnelling Protocol v1", "GTPv1", "gtpv1"); proto_register_field_array(proto_gtpv1, hf_gtpv1, array_length(hf_gtpv1)); proto_register_subtree_array(ett_gtp_array, array_length(ett_gtp_array)); - + gtp_module = prefs_register_protocol(proto_gtp, proto_reg_handoff_gtp); - + prefs_register_uint_preference(gtp_module, "gtpv0_port", "GTPv0 port ", "GTPv0 port (default 3386)", 10, &g_gtpv0_port); prefs_register_uint_preference(gtp_module, "gtpv1c_port", "GTPv1 control plane (GTP-C) port ", "GTPv1 control plane port (default 2123)", 10, &g_gtpv1c_port); prefs_register_uint_preference(gtp_module, "gtpv1u_port", "GTPv1 user plane (GTP-U) port ", "GTPv1 user plane port (default 2152)", 10, &g_gtpv1u_port); @@ -5328,7 +5328,7 @@ proto_register_gtp(void) prefs_register_bool_preference(gtp_module, "gtpv0_check_etsi", "Compare GTPv0 order with ETSI ", "GTPv0 ETSI order", >pv0_etsi_order); prefs_register_bool_preference(gtp_module, "gtpv1_check_etsi", "Compare GTPv1 order with ETSI ", "GTPv1 ETSI order", >pv1_etsi_order); prefs_register_bool_preference(gtp_module, "ppp_reorder", "Reorder & dissect PPP in Protocol conf. options", "Reorder & dissect PPP inside of Protocol Configuration Options, 3 bytes will be swapped to allow processing PPP section: 1 byte of length with 2 bytes of protocol id (refer to ETSI 29.060, 7.7.21 & 24.008 10.5.6.3)", &ppp_reorder); - + register_dissector("gtpv0", dissect_gtpv0, proto_gtpv0); register_dissector("gtpv1", dissect_gtpv1, proto_gtpv1); @@ -5340,17 +5340,17 @@ proto_reg_handoff_gtp(void) static int Initialized = FALSE; static dissector_handle_t gtpv0_handle; static dissector_handle_t gtpv1_handle; - + if (!Initialized) { - + gtpv0_handle = find_dissector("gtpv0"); gtpv1_handle = find_dissector("gtpv1"); Initialized = TRUE; - + } else { - + dissector_delete("udp.port", gtpv0_port, gtpv0_handle); dissector_delete("tcp.port", gtpv0_port, gtpv0_handle); @@ -5359,24 +5359,24 @@ proto_reg_handoff_gtp(void) dissector_delete("udp.port", gtpv1u_port, gtpv1_handle); dissector_delete("tcp.port", gtpv1u_port, gtpv1_handle); } - + gtpv0_port = g_gtpv0_port; gtpv1c_port = g_gtpv1c_port; gtpv1u_port = g_gtpv1u_port; - + /* GTP v0 */ - + dissector_add("udp.port", g_gtpv0_port, gtpv0_handle); dissector_add("tcp.port", g_gtpv0_port, gtpv0_handle); /* GTP v1 */ - + dissector_add("udp.port", g_gtpv1c_port, gtpv1_handle); dissector_add("tcp.port", g_gtpv1c_port, gtpv1_handle); dissector_add("udp.port", g_gtpv1u_port, gtpv1_handle); dissector_add("tcp.port", g_gtpv1u_port, gtpv1_handle); dissector_add("ppp.protocol", PPP_IP, ip_handle); - + ip_handle = find_dissector("ip"); ppp_handle = find_dissector("ppp"); } diff --git a/packet-gtp.h b/packet-gtp.h index 0ff9f34a98..05d4ff3ce0 100644 --- a/packet-gtp.h +++ b/packet-gtp.h @@ -1,10 +1,10 @@ /* packet-gtp.h - * + * * Declarations of exported routines from GTP dissector * Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com> * Nicolas Balkota <balkota@mac.com> * - * $Id: packet-gtp.h,v 1.1 2002/08/26 20:22:31 guy Exp $ + * $Id: packet-gtp.h,v 1.2 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-gvrp.c b/packet-gvrp.c index ce83ad94db..4fda70f880 100644 --- a/packet-gvrp.c +++ b/packet-gvrp.c @@ -2,7 +2,7 @@ * Routines for GVRP (GARP VLAN Registration Protocol) dissection * Copyright 2000, Kevin Shi <techishi@ms22.hinet.net> * - * $Id: packet-gvrp.c,v 1.13 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-gvrp.c,v 1.14 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -104,10 +104,10 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 octet; int msg_index, attr_index, offset = 0, length = tvb_reported_length(tvb); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GVRP"); - - if (check_col(pinfo->cinfo, COL_INFO)) + + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GVRP"); if (tree) @@ -118,20 +118,20 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Read in GARP protocol ID */ protocol_id = tvb_get_ntohs(tvb, GARP_PROTOCOL_ID); - + proto_tree_add_uint_format(gvrp_tree, hf_gvrp_proto_id, tvb, - GARP_PROTOCOL_ID, sizeof(guint16), + GARP_PROTOCOL_ID, sizeof(guint16), protocol_id, - "Protocol Identifier: 0x%04x (%s)", + "Protocol Identifier: 0x%04x (%s)", protocol_id, - protocol_id == GARP_DEFAULT_PROTOCOL_ID ? + protocol_id == GARP_DEFAULT_PROTOCOL_ID ? "GARP VLAN Registration Protocol" : "Unknown Protocol"); /* Currently only one protocol ID is supported */ if (protocol_id != GARP_DEFAULT_PROTOCOL_ID) { - proto_tree_add_text(gvrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16), + proto_tree_add_text(gvrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16), " (Warning: this version of Ethereal only knows about protocol id = 1)"); call_dissector(data_handle, tvb_new_subset(tvb, GARP_PROTOCOL_ID + sizeof(guint16), -1, -1), @@ -201,7 +201,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Check for end of mark */ if (octet == GARP_END_OF_MARK) { - /* If at least one message has been already read, + /* If at least one message has been already read, * check for another end of mark. */ if (attr_index) @@ -298,7 +298,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_gvrp(void) -{ +{ static hf_register_info hf[] = { { &hf_gvrp_proto_id, { "Protocol ID", "garp.protocol_id", diff --git a/packet-h1.c b/packet-h1.c index 28a6efa023..403303f15b 100644 --- a/packet-h1.c +++ b/packet-h1.c @@ -2,22 +2,22 @@ * Routines for Sinec H1 packet disassembly * Gerrit Gehnen <G.Gehnen@atrie.de> * - * $Id: packet-h1.c,v 1.24 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-h1.c,v 1.25 2002/08/28 21:00:14 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -97,10 +97,10 @@ static gint ett_empty = -1; static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - tvbuff_t *next_tvb; - + tvbuff_t *next_tvb; + proto_tree *h1_tree = NULL; - + proto_item *ti; proto_tree *opcode_tree = NULL; proto_tree *org_tree = NULL; @@ -235,9 +235,9 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; default: - /* This is not a valid telegram. So cancel dissection + /* This is not a valid telegram. So cancel dissection and try the next dissector */ - return FALSE; + return FALSE; break; } position += tvb_get_guint8(tvb,offset + position + 1); /* Goto next section */ diff --git a/packet-h261.c b/packet-h261.c index 4755a5ca1f..167fdc63bd 100644 --- a/packet-h261.c +++ b/packet-h261.c @@ -2,25 +2,25 @@ * * Routines for ITU-T Recommendation H.261 dissection * - * $Id: packet-h261.c,v 1.16 2002/08/02 23:35:50 jmayer Exp $ - * + * $Id: packet-h261.c,v 1.17 2002/08/28 21:00:15 jmayer Exp $ + * * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema <andreas.sikkema@philips.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -70,7 +70,7 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "H.261" ); } - + if ( check_col( pinfo->cinfo, COL_INFO) ) { col_set_str( pinfo->cinfo, COL_INFO, "H.261 message"); } @@ -116,131 +116,131 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_register_h261(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_h261_sbit, - { - "Start bit position", - "h261.sbit", - FT_UINT8, - BASE_DEC, - NULL, + { + "Start bit position", + "h261.sbit", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_ebit, - { - "End bit position", - "h261.ebit", - FT_UINT8, - BASE_DEC, - NULL, + { + "End bit position", + "h261.ebit", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_ibit, - { - "Intra frame encoded data flag", - "h261.i", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Intra frame encoded data flag", + "h261.i", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_vbit, - { - "Motion vector flag", - "h261.v", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Motion vector flag", + "h261.v", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_gobn, - { - "GOB Number", - "h261.gobn", - FT_UINT8, - BASE_DEC, - NULL, + { + "GOB Number", + "h261.gobn", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_mbap, - { - "Macroblock address predictor", - "h261.mbap", - FT_UINT8, - BASE_DEC, - NULL, + { + "Macroblock address predictor", + "h261.mbap", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_quant, - { - "Quantizer", - "h261.quant", - FT_UINT8, - BASE_DEC, - NULL, + { + "Quantizer", + "h261.quant", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_hmvd, - { - "Horizontal motion vector data", - "h261.hmvd", - FT_UINT8, - BASE_DEC, - NULL, + { + "Horizontal motion vector data", + "h261.hmvd", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_vmvd, - { - "Vertical motion vector data", - "h261.vmvd", - FT_UINT8, - BASE_DEC, - NULL, + { + "Vertical motion vector data", + "h261.vmvd", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_h261_data, - { - "H.261 stream", - "h261.stream", - FT_BYTES, - BASE_NONE, - NULL, + { + "H.261 stream", + "h261.stream", + FT_BYTES, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_h261, }; diff --git a/packet-hclnfsd.c b/packet-hclnfsd.c index e66788d901..2998d8268a 100644 --- a/packet-hclnfsd.c +++ b/packet-hclnfsd.c @@ -2,7 +2,7 @@ * Routines for hclnfsd (Hummingbird NFS Daemon) dissection * Copyright 2001, Mike Frisch <frisch@hummingbird.com> * - * $Id: packet-hclnfsd.c,v 1.16 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-hclnfsd.c,v 1.17 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -93,7 +93,7 @@ dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr ngids = tvb_get_ntohl(tvb, offset); if (tree) { - giditem = proto_tree_add_text(tree, tvb, offset, 4, "GIDs: %d", + giditem = proto_tree_add_text(tree, tvb, offset, 4, "GIDs: %d", ngids); if (giditem) gidtree = proto_item_add_subtree(giditem, ett_hclnfsd_gids); @@ -105,7 +105,7 @@ dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr for (ngids_i = 0; ngids_i < ngids; ngids_i++) { gid = tvb_get_ntohl(tvb, offset + (4 * ngids_i)); - proto_tree_add_text(gidtree, tvb, offset + (4 * ngids_i), 4, + proto_tree_add_text(gidtree, tvb, offset + (4 * ngids_i), 4, "GID: %d", gid); } } @@ -182,7 +182,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ 4, request_type); offset += 4; - offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_device, offset, + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_device, offset, NULL); if (tree) @@ -236,7 +236,7 @@ dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U guint32 status; status = tvb_get_ntohl(tvb, offset); - if (!tree) + if (!tree) return offset; offset += 4; @@ -266,7 +266,7 @@ static int dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_gid, offset); - + return offset; } @@ -284,7 +284,7 @@ dissect_hclnfsd_grp_to_number_call(tvbuff_t *tvb, int offset, packet_info *pinfo static int dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - return dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset, + return dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset, NULL); } @@ -358,7 +358,7 @@ dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo return offset; for (nusers_i = 0; nusers_i < nusers; nusers_i++) - offset = dissect_rpc_string(tvb, usertree, + offset = dissect_rpc_string(tvb, usertree, hf_hclnfsd_username, offset, NULL); return offset; @@ -516,7 +516,7 @@ dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_offset, offset); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_length, offset); - + return offset; } @@ -542,7 +542,7 @@ dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo "Print Queues: %d", nqueues); if (queuesitem) - queuestree = proto_item_add_subtree(queuesitem, + queuestree = proto_item_add_subtree(queuesitem, ett_hclnfsd_printqueues); } offset += 4; @@ -553,11 +553,11 @@ dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo for (nqueues_i = 0; nqueues_i < nqueues; nqueues_i++) { /* create new item for print queue */ - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuename, offset, NULL); /* create subtree on new item with print queue comment */ - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuecomment, offset, NULL); } @@ -596,7 +596,7 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _ datafollows = tvb_get_ntohl(tvb, offset); if (tree) { - queueitem = proto_tree_add_text(tree, tvb, offset, 4, + queueitem = proto_tree_add_text(tree, tvb, offset, 4, "Print Jobs: %d", datafollows); if (queueitem) queuetree = proto_item_add_subtree(queueitem, ett_hclnfsd_printqueues); @@ -605,7 +605,7 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _ if (!queuetree) return offset; - + while (datafollows) { jobid = tvb_get_ntohl(tvb, offset); @@ -614,11 +614,11 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _ offset += 4; jobtree = proto_item_add_subtree(jobitem, ett_hclnfsd_printjob); - - offset = dissect_rpc_string(tvb, tree, + + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_username, offset, NULL); - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_printparams, offset, NULL); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_queuestatus, offset); @@ -627,7 +627,7 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _ offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_timesubmitted, offset); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_size, offset); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_copies, offset); - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuecomment, offset, NULL); datafollows = tvb_get_ntohl(tvb, offset); @@ -642,42 +642,42 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _ /* NULL as function pointer means: take the generic one. */ static const vsff hclnfsd1_proc[] = { - { HCLNFSDPROC_NULL, "NULL", + { HCLNFSDPROC_NULL, "NULL", NULL, NULL }, { HCLNFSDPROC_SPOOL_INQUIRE, "SPOOL_INQUIRE", - dissect_hclnfsd_spool_inquire_call, NULL }, + dissect_hclnfsd_spool_inquire_call, NULL }, { HCLNFSDPROC_SPOOL_FILE, "SPOOL_FILE", - dissect_hclnfsd_spool_file_call, NULL }, + dissect_hclnfsd_spool_file_call, NULL }, { HCLNFSDPROC_AUTHORIZE, "AUTHORIZE", - dissect_hclnfsd_authorize_call, dissect_hclnfsd_authorize_reply }, + dissect_hclnfsd_authorize_call, dissect_hclnfsd_authorize_reply }, { HCLNFSDPROC_GRP_NAME_TO_NUMB, "GRP_NAME_TO_NUMB", - dissect_hclnfsd_grp_name_to_numb_call, dissect_hclnfsd_grp_name_to_numb_reply }, + dissect_hclnfsd_grp_name_to_numb_call, dissect_hclnfsd_grp_name_to_numb_reply }, { HCLNFSDPROC_GRP_TO_NUMBER, "GRP_TO_NUMBER", dissect_hclnfsd_grp_to_number_call, dissect_hclnfsd_grp_to_number_reply }, { HCLNFSDPROC_RETURN_HOST, "RETURN_HOST", - dissect_hclnfsd_return_host_call, dissect_hclnfsd_return_host_reply }, + dissect_hclnfsd_return_host_call, dissect_hclnfsd_return_host_reply }, { HCLNFSDPROC_UID_TO_NAME, "UID_TO_NAME", - dissect_hclnfsd_uid_to_name_call, dissect_hclnfsd_uid_to_name_reply }, + dissect_hclnfsd_uid_to_name_call, dissect_hclnfsd_uid_to_name_reply }, { HCLNFSDPROC_NAME_TO_UID, "NAME_TO_UID", - dissect_hclnfsd_name_to_uid_call, dissect_hclnfsd_name_to_uid_reply }, + dissect_hclnfsd_name_to_uid_call, dissect_hclnfsd_name_to_uid_reply }, { HCLNFSDPROC_SHARE, "SHARE", - dissect_hclnfsd_share_call, dissect_hclnfsd_share_reply }, + dissect_hclnfsd_share_call, dissect_hclnfsd_share_reply }, { HCLNFSDPROC_UNSHARE, "UNSHARE", - dissect_hclnfsd_unshare_call, dissect_hclnfsd_unshare_reply }, + dissect_hclnfsd_unshare_call, dissect_hclnfsd_unshare_reply }, { HCLNFSDPROC_LOCK, "LOCK", - dissect_hclnfsd_lock_call, dissect_hclnfsd_lock_reply }, + dissect_hclnfsd_lock_call, dissect_hclnfsd_lock_reply }, { HCLNFSDPROC_REMOVE, "REMOVE", - dissect_hclnfsd_remove_call, NULL }, + dissect_hclnfsd_remove_call, NULL }, { HCLNFSDPROC_UNLOCK, "UNLOCK", - dissect_hclnfsd_unlock_call, dissect_hclnfsd_unlock_reply }, + dissect_hclnfsd_unlock_call, dissect_hclnfsd_unlock_reply }, { HCLNFSDPROC_GET_PRINTERS, "GET_PRINTERS", - NULL, dissect_hclnfsd_get_printers_reply }, + NULL, dissect_hclnfsd_get_printers_reply }, { HCLNFSDPROC_GET_PRINTQ, "GET_PRINTQ", - dissect_hclnfsd_get_printq_call, dissect_hclnfsd_get_printq_reply }, + dissect_hclnfsd_get_printq_call, dissect_hclnfsd_get_printq_reply }, { HCLNFSDPROC_CANCEL_PRJOB, "CANCEL_PRJOB", - NULL, NULL }, + NULL, NULL }, { HCLNFSDPROC_ZAP_LOCKS, "ZAP_LOCKS", - NULL, NULL }, + NULL, NULL }, { 0, NULL, NULL, NULL } }; /* end of hclnfsd version 1 */ @@ -838,7 +838,7 @@ proto_register_hclnfsd(void) &ett_hclnfsd_auth_ident }; - proto_hclnfsd = proto_register_protocol("Hummingbird NFS Daemon", + proto_hclnfsd = proto_register_protocol("Hummingbird NFS Daemon", "HCLNFSD", "hclnfsd"); proto_register_field_array(proto_hclnfsd, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-hclnfsd.h b/packet-hclnfsd.h index d74f0f1fa5..5b2ca86669 100644 --- a/packet-hclnfsd.h +++ b/packet-hclnfsd.h @@ -1,21 +1,21 @@ /* packet-hclnfsd.h * - * $Id: packet-hclnfsd.h,v 1.1 2001/01/27 20:33:01 guy Exp $ + * $Id: packet-hclnfsd.h,v 1.2 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-hsrp.c b/packet-hsrp.c index b40299f7a4..f95b1dbb34 100644 --- a/packet-hsrp.c +++ b/packet-hsrp.c @@ -4,24 +4,24 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-hsrp.c,v 1.23 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-hsrp.c,v 1.24 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-vrrp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -103,7 +103,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + opcode = tvb_get_guint8(tvb, 1); state = tvb_get_guint8(tvb, 2); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -156,7 +156,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 8; proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, FALSE); offset += 4; - + } return; @@ -166,7 +166,7 @@ void proto_register_hsrp(void) { static hf_register_info hf[] = { { &hf_hsrp_version, - { "Version", "hsrp.version", + { "Version", "hsrp.version", FT_UINT8, BASE_DEC, NULL, 0x0, "The version of the HSRP messages", HFILL }}, diff --git a/packet-http.c b/packet-http.c index 304c824b79..4906d3620b 100644 --- a/packet-http.c +++ b/packet-http.c @@ -6,22 +6,22 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 1999, Andrew Tridgell <tridge@samba.org> * - * $Id: packet-http.c,v 1.55 2002/08/14 23:34:20 tpot Exp $ + * $Id: packet-http.c,v 1.56 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -182,7 +182,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tag = "HTTP"; break; } - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, proto_tag); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -329,17 +329,17 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (http_type) { case HTTP_NOTIFICATION: - proto_tree_add_boolean_hidden(http_tree, + proto_tree_add_boolean_hidden(http_tree, hf_http_notification, tvb, 0, 0, 1); break; case HTTP_RESPONSE: - proto_tree_add_boolean_hidden(http_tree, + proto_tree_add_boolean_hidden(http_tree, hf_http_response, tvb, 0, 0, 1); break; case HTTP_REQUEST: - proto_tree_add_boolean_hidden(http_tree, + proto_tree_add_boolean_hidden(http_tree, hf_http_request, tvb, 0, 0, 1); break; @@ -526,11 +526,11 @@ proto_register_http(void) { static hf_register_info hf[] = { { &hf_http_notification, - { "Notification", "http.notification", + { "Notification", "http.notification", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if HTTP notification", HFILL }}, { &hf_http_response, - { "Response", "http.response", + { "Response", "http.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if HTTP response", HFILL }}, { &hf_http_request, @@ -563,14 +563,14 @@ proto_register_http(void) subdissector_table = register_dissector_table("http.port", "TCP port for protocols using HTTP", FT_UINT16, BASE_DEC); - /* - * Heuristic dissectors SHOULD register themselves in - * this table using the standard heur_dissector_add() + /* + * Heuristic dissectors SHOULD register themselves in + * this table using the standard heur_dissector_add() * function. */ register_heur_dissector_list("http",&heur_subdissector_list); - + } /* diff --git a/packet-http.h b/packet-http.h index e4b534cea0..962687431d 100644 --- a/packet-http.h +++ b/packet-http.h @@ -1,21 +1,21 @@ /* packet-http.h * - * $Id: packet-http.h,v 1.6 2001/12/03 03:59:35 guy Exp $ + * $Id: packet-http.h,v 1.7 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-iapp.c b/packet-iapp.c index f78660c576..94217014bf 100644 --- a/packet-iapp.c +++ b/packet-iapp.c @@ -2,7 +2,7 @@ * Routines for IAPP dissection * Copyright 2002, Alfred Arnold <aarnold@elsa.de> * - * $Id: packet-iapp.c,v 1.5 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-iapp.c,v 1.6 2002/08/28 21:00:16 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,17 +12,17 @@ * don't bother with the "Copied from" - you don't even need to put * in a "Copied from" if you copied an existing dissector, especially * if the bulk of the code in the new dissector is your code) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -55,10 +55,10 @@ static gint ett_iapp_auth = -1; #define UDP_PORT_IAPP 2313 -#define IAPP_ANNOUNCE_REQUEST 0 -#define IAPP_ANNOUNCE_RESPONSE 1 -#define IAPP_HANDOVER_REQUEST 2 -#define IAPP_HANDOVER_RESPONSE 3 +#define IAPP_ANNOUNCE_REQUEST 0 +#define IAPP_ANNOUNCE_RESPONSE 1 +#define IAPP_HANDOVER_REQUEST 2 +#define IAPP_HANDOVER_RESPONSE 3 #define IAPP_PDU_SSID 0 #define IAPP_PDU_BSSID 1 @@ -279,7 +279,7 @@ authval_to_str(int type, int len, tvbuff_t *tvb, int offset) run += sprintf(run, "%d seconds", val); break; case IAPP_AUTH_IPADDR: - run += sprintf(run, "%d.%d.%d.%d", + run += sprintf(run, "%d.%d.%d.%d", tvb_get_guint8(tvb, offset + 3), tvb_get_guint8(tvb, offset + 4), tvb_get_guint8(tvb, offset + 5), @@ -290,7 +290,7 @@ authval_to_str(int type, int len, tvbuff_t *tvb, int offset) run += sprintf(run, " %02x", tvb_get_guint8(tvb, offset + 3 + z)); break; } - + return textbuffer; } @@ -351,7 +351,7 @@ pduval_to_str(int type, int len, tvbuff_t *tvb, int offset) case IAPP_PDU_CAPABILITY: { int mask, first = 1; - + val = tvb_get_guint8(tvb, offset + 3); run += sprintf(run, "%02x (", val); for (mask = 0x80; mask; mask >>= 1) @@ -407,13 +407,13 @@ pduval_to_str(int type, int len, tvbuff_t *tvb, int offset) run += sprintf(run, strval); break; } - + return textbuffer; } /* code to dissect a list of PDUs */ -static void +static void dissect_pdus(tvbuff_t *tvb, int offset, proto_tree *pdutree, int pdulen) { e_pduhdr pduhdr; @@ -439,10 +439,10 @@ dissect_pdus(tvbuff_t *tvb, int offset, proto_tree *pdutree, int pdulen) pdustrval, pduhdr.pdu_type, valstr); if (pduhdr.pdu_type == IAPP_PDU_CAPABILITY) - dissect_caps(ti, tvb, offset); + dissect_caps(ti, tvb, offset); if (pduhdr.pdu_type == IAPP_PDU_AUTHINFO) - dissect_authinfo(ti, tvb, offset + 3, len); + dissect_authinfo(ti, tvb, offset + 3, len); pdulen -= (len + 3); offset += (len + 3); @@ -460,10 +460,10 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int ia_type; gchar *codestrval; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAPP"); - - if (check_col(pinfo->cinfo, COL_INFO)) + + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&ih, 0, sizeof(e_iapphdr)); @@ -510,7 +510,7 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_iapp(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { diff --git a/packet-icap.c b/packet-icap.c index bbbf367cae..b3d310bc23 100644 --- a/packet-icap.c +++ b/packet-icap.c @@ -3,22 +3,22 @@ * * Srishylam Simharajan simha@netapp.com * - * $Id: packet-icap.c,v 1.11 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-icap.c,v 1.12 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -229,7 +229,7 @@ is_icap_header: } } - + static int is_icap_message(const guchar *data, int linelen, icap_type_t *type) { @@ -245,10 +245,10 @@ is_icap_message(const guchar *data, int linelen, icap_type_t *type) */ if (linelen >= 5) { ICAP_COMPARE("ICAP/", 5, ICAP_RESPONSE); /* response */ - } + } if (linelen >= 7) { ICAP_COMPARE("REQMOD ", 7, ICAP_REQMOD); /* request mod */ - } + } if (linelen >= 8) { ICAP_COMPARE("OPTIONS ", 8, ICAP_OPTIONS); /* options */ ICAP_COMPARE("RESPMOD ", 8, ICAP_RESPMOD); /* response mod */ @@ -262,7 +262,7 @@ proto_register_icap(void) { static hf_register_info hf[] = { { &hf_icap_response, - { "Response", "icap.response", + { "Response", "icap.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if ICAP response", HFILL }}, { &hf_icap_reqmod, @@ -287,7 +287,7 @@ proto_register_icap(void) }; proto_icap = proto_register_protocol( - "Internet Content Adaptation Protocol", + "Internet Content Adaptation Protocol", "ICAP", "icap"); proto_register_field_array(proto_icap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-icmpv6.c b/packet-icmpv6.c index 7474dad982..a003f2b82b 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.66 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-icmpv6.c,v 1.67 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -107,10 +107,10 @@ static const value_string names_rrenum_matchcode[] = { }; static const value_string names_router_pref[] = { - { ND_RA_FLAG_RTPREF_HIGH, "High" }, - { ND_RA_FLAG_RTPREF_MEDIUM, "Medium" }, - { ND_RA_FLAG_RTPREF_LOW, "Low" }, - { ND_RA_FLAG_RTPREF_RSV, "Reserved" }, + { ND_RA_FLAG_RTPREF_HIGH, "High" }, + { ND_RA_FLAG_RTPREF_MEDIUM, "Medium" }, + { ND_RA_FLAG_RTPREF_LOW, "Low" }, + { ND_RA_FLAG_RTPREF_RSV, "Reserved" }, }; static void @@ -689,7 +689,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree field_tree = proto_item_add_subtree(tf, ett_nodeinfo_subject4); p = offset + sizeof *ni; for (i = 0; i < n; i++) { - tvb_memcpy(tvb, ipaddr, p, 4); + tvb_memcpy(tvb, ipaddr, p, 4); proto_tree_add_text(field_tree, tvb, p, sizeof(guint32), "%s", ip_to_str(ipaddr)); p += sizeof(guint32); @@ -863,7 +863,7 @@ dissect_rrenum(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(opt_tree, tvb, off + offsetof(struct rr_pco_match, rpm_code), sizeof(match->rpm_code), "OpCode: %s (%u)", - val_to_str(match->rpm_code, names_rrenum_matchcode, "Unknown"), + val_to_str(match->rpm_code, names_rrenum_matchcode, "Unknown"), match->rpm_code); proto_tree_add_text(opt_tree, tvb, off + offsetof(struct rr_pco_match, rpm_len), @@ -1298,7 +1298,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(field_tree, tvb, flagoff, 1, "%s", decode_boolean_bitfield(ra_flags, ND_RA_FLAG_HOME_AGENT, 8, - "Home Agent", "Not Home Agent")); + "Home Agent", "Not Home Agent")); proto_tree_add_text(field_tree, tvb, flagoff, 1, "%s", decode_enumerated_bitfield(ra_flags, ND_RA_FLAG_RTPREF_MASK, 8, names_router_pref, "Router preference: %s")); diff --git a/packet-icp.c b/packet-icp.c index 835d59f090..2084732f86 100644 --- a/packet-icp.c +++ b/packet-icp.c @@ -4,7 +4,7 @@ * By Peter Torvals * Copyright 1999 Peter Torvals * - * $Id: packet-icp.c,v 1.22 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-icp.c,v 1.23 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -31,7 +31,7 @@ #endif #include <stdio.h> -#include <stdlib.h> +#include <stdlib.h> #include <string.h> #include <glib.h> #include <epan/packet.h> @@ -74,7 +74,7 @@ static value_string opcode_vals[] = { { CODE_ICP_OP_SENDA, "ICP_SENDA"}, { CODE_ICP_OP_DATABEG, "ICP_DATABEG"}, { CODE_ICP_OP_DATA, "ICP_DATA"}, -{ CODE_ICP_OP_DATAEND, "ICP_DATA_END"}, +{ CODE_ICP_OP_DATAEND, "ICP_DATA_END"}, { CODE_ICP_OP_SECHO , "ICP_SECHO"}, { CODE_ICP_OP_DECHO , "ICP_DECHO"}, { CODE_ICP_OP_MISS_NOFETCH , "ICP_MISS_NOFETCH"}, @@ -137,7 +137,7 @@ static void dissect_icp_payload(tvbuff_t *tvb, int offset, "Packet is fragmented, rest of object is in next udp packet"); } break; - default: + default: break; } } @@ -182,7 +182,7 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(icp_tree,hf_icp_request_nr, tvb, 4, 4, request_number); - + options=tvb_get_ntohl(tvb, 8); if ( (opcode == CODE_ICP_OP_QUERY) && ((options & 0x80000000 ) != 0) ) { @@ -201,8 +201,8 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "option: ICP_FLAG_SCR_RTT RTT=%u", option_data & 0x0000ffff); } - - proto_tree_add_text(icp_tree, tvb, 16, 4, + + proto_tree_add_text(icp_tree, tvb, 16, 4, "Sender Host IP address %s", ip_to_str(tvb_get_ptr(tvb, 16, 4))); diff --git a/packet-icq.c b/packet-icq.c index 5dde1651dc..1b5265537f 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.47 2002/08/03 19:47:50 guy Exp $ + * $Id: packet-icq.c,v 1.48 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -366,7 +366,7 @@ table_v5 [] = { 0x3B, 0x4D, 0x46, 0x68, 0x63, 0x39, 0x50, 0x5F, 0x5F, 0x3F, 0x6F, 0x67, 0x53, 0x41, 0x25, 0x41, 0x3C, 0x51, 0x54, 0x3D, 0x5E, 0x54, 0x5D, 0x4E, 0x4C, 0x39, 0x50, 0x5F, 0x5F, 0x5F, 0x3F, 0x6F, 0x47, 0x43, 0x69, 0x48, 0x33, 0x51, 0x54, 0x5D, 0x6E, 0x3C, 0x31, 0x64, 0x35, 0x5A, 0x00, 0x00 }; - + static char* findMsgType(int num) { @@ -552,7 +552,7 @@ proto_add_icq_attr(proto_tree* tree, /* The tree to add to */ char* descr) /* The description to use in the tree */ { guint16 len; - + len = tvb_get_letohs(tvb, offset); if (len > tvb_reported_length_remaining(tvb, offset)) return -1; /* length goes past end of packet */ @@ -607,7 +607,7 @@ icqv5_decode_msgType(proto_tree* tree, "Email address", }; #define N_USER_ADDED_FIELDS (sizeof user_added_field_descr / sizeof user_added_field_descr[0]) - + msgType = tvb_get_letohs(tvb, offset); ti = proto_tree_add_text(tree, tvb, offset, @@ -699,7 +699,7 @@ icqv5_decode_msgType(proto_tree* tree, left -= sz; } break; - + case MSG_AUTH: { /* Three bytes, first is a char signifying success */ @@ -816,7 +816,7 @@ icqv5_decode_msgType(proto_tree* tree, tvb_get_ptr(tvb, sep_offset_prev + 1, sz)); n += 2; } - + left -= (sz+1); offset = sep_offset + 1; } @@ -826,7 +826,7 @@ icqv5_decode_msgType(proto_tree* tree, } /********************************* - * + * * Client commands * *********************************/ @@ -876,7 +876,7 @@ icqv5_cmd_rand_search(proto_tree* tree, /* Tree to put the data in */ "Man want women", "Women want men" }; - + if (tree){ if (size < 4) { ti = proto_tree_add_text(tree, @@ -1473,7 +1473,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */ offset, sizeof(guint16), "Length: %u", pktLen); - + offset += sizeof(guint16); left -= sizeof(guint16); } case META_USER_FOUND: @@ -1585,7 +1585,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */ "UIN: %u", uin); offset+=sizeof(guint32);left-=sizeof(guint32); #endif - + /* * Get every field from the description */ @@ -1665,7 +1665,7 @@ icqv5_srv_recv_message(proto_tree* tree, /* Tree to put the data in */ guint8 day; guint8 hour; guint8 minute; - + if (tree) { ti = proto_tree_add_text(tree, tvb, @@ -1711,7 +1711,7 @@ icqv5_srv_rand_user(proto_tree* tree, /* Tree to put the data in */ guint8 commClass; guint32 status; guint16 tcpVer; - + if (tree) { ti = proto_tree_add_text(tree, tvb, @@ -1739,7 +1739,7 @@ icqv5_srv_rand_user(proto_tree* tree, /* Tree to put the data in */ offset + SRV_RAND_USER_UIN, sizeof(guint32), "Port: %u", port); - /* guint32 realIP */ + /* guint32 realIP */ realIP = tvb_get_ptr(tvb, offset + SRV_RAND_USER_REAL_IP, 4); proto_tree_add_text(subtree, tvb, offset + SRV_RAND_USER_REAL_IP, @@ -1786,7 +1786,7 @@ dissect_icqv5Client(tvbuff_t *tvb, guint16 cmd; guint8 *decr_pd; /* Decrypted content */ tvbuff_t *decr_tvb; - + pktsize = tvb_reported_length(tvb); capturedsize = tvb_length(tvb); @@ -1807,7 +1807,7 @@ dissect_icqv5Client(tvbuff_t *tvb, decr_pd = g_malloc(rounded_size); tvb_memcpy(tvb, decr_pd, 0, capturedsize); decrypt_v5(decr_pd, rounded_size, key); - + /* Allocate a new tvbuff, referring to the decrypted data. */ decr_tvb = tvb_new_real_data(decr_pd, capturedsize, pktsize); @@ -1827,7 +1827,7 @@ dissect_icqv5Client(tvbuff_t *tvb, if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "ICQv5 %s", findClientCmd(cmd)); - + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_icq, @@ -1846,7 +1846,7 @@ dissect_icqv5Client(tvbuff_t *tvb, ICQ5_client, "Header"); icq_header_tree = proto_item_add_subtree(ti, ett_icq_header); - + proto_tree_add_text(icq_header_tree, tvb, ICQ_VERSION, 2, @@ -1981,14 +1981,14 @@ dissect_icqv5Server(tvbuff_t *tvb, int changeCol = (pktsize==-1); guint16 cmd; - + cmd = tvb_get_letohs(tvb, offset + ICQ5_SRV_CMD); if (changeCol && check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "ICQv5 %s", findServerCmd(cmd)); if (pktsize == -1) pktsize = tvb_reported_length(tvb); - + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_icq, @@ -1998,7 +1998,7 @@ dissect_icqv5Server(tvbuff_t *tvb, "ICQv5 %s (len %u)", findServerCmd(cmd), pktsize); - + icq_tree = proto_item_add_subtree(ti, ett_icq); ti = proto_tree_add_uint_format(icq_tree, @@ -2009,7 +2009,7 @@ dissect_icqv5Server(tvbuff_t *tvb, ICQ5_server, "Header"); icq_header_tree = proto_item_add_subtree(ti, ett_icq_header); - + proto_tree_add_text(icq_header_tree, tvb, offset + ICQ_VERSION, 2, @@ -2129,7 +2129,7 @@ static void dissect_icqv5(tvbuff_t *tvb, proto_tree *tree) { guint32 unknown; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv5 (UDP)"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -2204,9 +2204,9 @@ proto_register_icq(void) &ett_icq_body, &ett_icq_body_parts, }; - + proto_icq = proto_register_protocol("ICQ Protocol", "ICQ", "icq"); - + proto_register_field_array(proto_icq, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 49a6be410d..6d2dcd3f9d 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -1,9 +1,9 @@ /* packet-ieee80211.c * Routines for Wireless LAN (IEEE 802.11) dissection - * Copyright 2000, Axis Communications AB + * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.73 2002/08/02 23:35:50 jmayer Exp $ + * $Id: packet-ieee80211.c,v 1.74 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -15,22 +15,22 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Credits: - * + * * The following people helped me by pointing out bugs etc. Thank you! * * Marco Molteni - * Lena-Marie Nilsson + * Lena-Marie Nilsson * Magnus Hultman-Persson */ @@ -84,12 +84,12 @@ static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len); static guint32 crc32(const unsigned char* buf, unsigned int len); /* #define USE_ENV */ -/* When this is set, an unlimited number of WEP keys can be set in the - environment: +/* When this is set, an unlimited number of WEP keys can be set in the + environment: ETHEREAL_WEPKEYNUM=## - ETHEREAL_WEPKEY1=aa:bb:cc:dd:... - ETHEREAL_WEPKEY2=aa:bab:cc:dd:ee:... + ETHEREAL_WEPKEY1=aa:bb:cc:dd:... + ETHEREAL_WEPKEY2=aa:bab:cc:dd:ee:... ... you get the idea. @@ -598,7 +598,7 @@ add_fixed_field (proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) case FIELD_CAP_INFO: capability = tvb_get_letohs (tvb, offset); - cap_item = proto_tree_add_uint_format (tree, ff_capture, + cap_item = proto_tree_add_uint_format (tree, ff_capture, tvb, offset, 2, capability, "Capability Information: 0x%04X", @@ -1209,10 +1209,10 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree_add_boolean (flag_tree, hf_fc_order, tvb, 1, 1, flags); - if (frame_type_subtype == CTRL_PS_POLL) + if (frame_type_subtype == CTRL_PS_POLL) proto_tree_add_uint(hdr_tree, hf_assoc_id,tvb,2,2, COOK_ASSOC_ID(tvb_get_letohs(tvb,2))); - + else proto_tree_add_uint (hdr_tree, hf_did_duration, tvb, 2, 2, tvb_get_letohs (tvb, 2)); @@ -1416,8 +1416,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 4, 6, dst); proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 10, 6, src); break; - - + + case DATA_ADDR_T2: proto_tree_add_ether (hdr_tree, hf_addr_da, tvb, 4, 6, dst); proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 10, 6, @@ -1432,7 +1432,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 4, 6, dst); proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 16, 6, src); break; - + case DATA_ADDR_T3: proto_tree_add_ether (hdr_tree, hf_addr_bssid, tvb, 4, 6, @@ -1449,7 +1449,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 10, 6, src); proto_tree_add_ether_hidden(hdr_tree, hf_addr, tvb, 16, 6, dst); break; - + case DATA_ADDR_T4: proto_tree_add_ether (hdr_tree, hf_addr_ra, tvb, 4, 6, @@ -1647,7 +1647,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, next_tvb = tvb_new_subset(tvb, hdr_len + 4, len, reported_len); call_dissector(data_handle, next_tvb, pinfo, tree); - return; + return; } else { add_new_data_source(pinfo, next_tvb, "Decrypted WEP data"); } @@ -1777,8 +1777,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, call_dissector(data_handle, next_tvb, pinfo, tree); pinfo->fragmented = save_fragmented; return; - } - + } + switch (COOK_FRAME_TYPE (fcf)) { @@ -2329,7 +2329,7 @@ proto_register_wlan (void) &wlan_ignore_wep); #ifndef USE_ENV - prefs_register_enum_preference(wlan_module, "wep_keys", + prefs_register_enum_preference(wlan_module, "wep_keys", "WEP key count", "How many WEP keys do we have to choose from? (0 to disable, up to 4)", &num_wepkeys, wep_keys_options, FALSE); @@ -2441,7 +2441,7 @@ static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len) { if ((tmp = g_malloc(len)) == NULL) return NULL; /* krap! */ - + /* try once with the key index in the packet, then look through our list. */ for (i = -1; i < (int) num_wepkeys; i++) { /* copy the encrypted data over to the tmp buffer */ @@ -2465,7 +2465,7 @@ static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len) { #if 0 printf("de-wep %p\n", decr_tvb); -#endif +#endif return decr_tvb; } @@ -2543,7 +2543,7 @@ static int wep_decrypt(guint8 *buf, guint32 len, int key_override) { c_crc[1] = crc >> 8; c_crc[2] = crc >> 16; c_crc[3] = crc >> 24; - + for (k = 0; k < 4; k++) { i = (i + 1) & 0xff; j = (j+s[i]) & 0xff; @@ -2625,7 +2625,7 @@ static void init_wepkeys(void) { j++; } } - + } return; diff --git a/packet-ieee80211.h b/packet-ieee80211.h index 639438af24..ec8b299f57 100644 --- a/packet-ieee80211.h +++ b/packet-ieee80211.h @@ -1,10 +1,10 @@ /* packet-ieee80211.h * Routines for Wireless LAN (IEEE 802.11) dissection * - * Copyright 2000, Axis Communications AB + * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.h,v 1.6 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ieee80211.h,v 1.7 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -16,12 +16,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ieee8023.c b/packet-ieee8023.c index dce8f4c7b1..02b71c9364 100644 --- a/packet-ieee8023.c +++ b/packet-ieee8023.c @@ -1,22 +1,22 @@ /* packet-ieee8023.c * Routine for dissecting 802.3 (as opposed to D/I/X Ethernet) packets. * - * $Id: packet-ieee8023.c,v 1.3 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ieee8023.c,v 1.4 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ieee8023.h b/packet-ieee8023.h index 615647511c..60ad4d329f 100644 --- a/packet-ieee8023.h +++ b/packet-ieee8023.h @@ -2,23 +2,23 @@ * Declaration of routine for dissecting 802.3 (as opposed to D/I/X Ethernet) * packets. * - * $Id: packet-ieee8023.h,v 1.1 2001/02/08 07:08:05 guy Exp $ + * $Id: packet-ieee8023.h,v 1.2 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-igmp.c b/packet-igmp.c index d289312241..45599d95ca 100644 --- a/packet-igmp.c +++ b/packet-igmp.c @@ -1,22 +1,22 @@ /* packet-igmp.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for IGMP packet disassembly * - * $Id: packet-igmp.c,v 1.20 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-igmp.c,v 1.21 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,12 +41,12 @@ 0x07 20 0x08 20 0x11 8* 8* >=12 - 0x12 8* 8* + 0x12 8* 8* 0x13 x 0x16 8 0x17 8 0x22 >=8 - 0x23 >=8b + 0x23 >=8b 0x24 >=8a 8b 0x25 4a >=8b 0x26 4a @@ -61,7 +61,7 @@ Size in bytes for each packet type draft-ietf-idmr-traceroute-ipm-07.ps 0x1e 24 + n*32 - 0x1f 24 + n*32 (n == 0 for Query) + 0x1f 24 + n*32 (n == 0 for Query) x DVMRP Protocol see packet-dvmrp.c @@ -69,7 +69,7 @@ RFC1075 Version 1 draft-ietf-idmr-dvmrp-v3-10.txt Version 3 - V1 and V3 can be distinguished by looking at bytes 6 and 7 in the + V1 and V3 can be distinguished by looking at bytes 6 and 7 in the IGMP header. If header[6]==0xff and header[7]==0x03 we have version 3. @@ -182,7 +182,7 @@ static int ett_mtrace_block = -1; #define IGMP_TYPE_0x24 0x24 #define IGMP_TYPE_0x25 0x25 #define IGMP_TYPE_0x26 0x26 - + #define IGMP_TRACEROUTE_HDR_LEN 24 #define IGMP_TRACEROUTE_RSP_LEN 32 @@ -389,7 +389,7 @@ dissect_v3_max_resp(tvbuff_t *tvb, proto_tree *parent_tree, int offset) tsecs = tsecs << ( ((bits&IGMP_MAX_RESP_EXP)>>4) + 3); } else { tsecs = bits; - } + } item = proto_tree_add_uint_format(parent_tree, hf_max_resp, tvb, offset, 1, tsecs, "Max Response Time: %.1f sec (0x%02x)",tsecs*0.1,bits); @@ -417,7 +417,7 @@ dissect_v3_sqrv_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset) bits = tvb_get_guint8(tvb, offset); - item = proto_tree_add_text(parent_tree, tvb, offset, 1, + item = proto_tree_add_text(parent_tree, tvb, offset, 1, "QRV=%d S=%s", bits&IGMP_V3_QRV_MASK, (bits&IGMP_V3_S)?tfs_s.true_string:tfs_s.false_string); tree = proto_item_add_subtree(item, ett_sqrv_bits); @@ -443,8 +443,8 @@ dissect_v3_group_record(tvbuff_t *tvb, proto_tree *parent_tree, int offset) tvb_memcpy(tvb, (guint8 *)&ip, offset+4, 4); item = proto_tree_add_text(parent_tree, tvb, offset, -1, - "Group Record : %s %s", - ip_to_str((gchar*)&ip), + "Group Record : %s %s", + ip_to_str((gchar*)&ip), val_to_str(tvb_get_guint8(tvb, offset), vs_record_type,"") ); tree = proto_item_add_subtree(item, ett_group_record); @@ -506,7 +506,7 @@ dissect_igmp_v3_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in num = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(tree, hf_num_grp_recs, tvb, offset, 2, num); offset += 2; - + while (num--) { offset = dissect_v3_group_record(tvb, tree, offset); } @@ -634,8 +634,8 @@ dissect_igmp_v0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int type, i proto_tree_add_item(tree, hf_access_key, tvb, offset, 8, FALSE); offset +=8; - return offset; -} + return offset; +} /* dissector for multicast traceroute, rfc???? */ static int @@ -763,7 +763,7 @@ dissect_igmp_mtrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int typ offset += 1; /* Forwarding information/error code */ - proto_tree_add_item(block_tree, hf_mtrace_q_fwd_code, tvb, offset, 1, FALSE); + proto_tree_add_item(block_tree, hf_mtrace_q_fwd_code, tvb, offset, 1, FALSE); offset += 1; } @@ -859,7 +859,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dst = g_htonl(MC_ALL_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); - } + } dst = g_htonl(MC_ALL_IGMPV3_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_msnip(tvb, pinfo, parent_tree, offset); diff --git a/packet-igmp.h b/packet-igmp.h index abb363c78b..de6f8655bb 100644 --- a/packet-igmp.h +++ b/packet-igmp.h @@ -1,22 +1,22 @@ /* packet-igmp.h 2001 Ronnie Sahlberg <See AUTHORS for email> * Declarations of routines for IGMP packet disassembly * - * $Id: packet-igmp.h,v 1.1 2002/02/01 11:01:57 guy Exp $ + * $Id: packet-igmp.h,v 1.2 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-igrp.c b/packet-igrp.c index bdde487766..bd2462900d 100644 --- a/packet-igrp.c +++ b/packet-igrp.c @@ -1,25 +1,25 @@ /* packet-igrp.c * Routines for IGRP dissection * Copyright 2000, Paul Ionescu <paul@acorp.ro> - * - * $Id: packet-igrp.c,v 1.12 2002/01/24 09:20:48 guy Exp $ + * + * $Id: packet-igrp.c,v 1.13 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-syslog.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -58,18 +58,18 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 as,net1,net2,net3; proto_item *ti; proto_tree *igrp_tree, *igrp_vektor_tree; - tvbuff_t *next_tvb; - - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + tvbuff_t *next_tvb; + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + ver_and_opcode = tvb_get_guint8(tvb,0); update = tvb_get_guint8(tvb,1); as = tvb_get_ntohs(tvb,2); - - + + if (check_col(pinfo->cinfo, COL_INFO)) { switch (ver_and_opcode) { case 0x11: @@ -78,23 +78,23 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x12: col_add_fstr(pinfo->cinfo, COL_INFO, "Request" ); break; - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown version or opcode"); + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown version or opcode"); } } - + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_igrp, tvb, 0, -1, "Cisco IGRP"); - + igrp_tree = proto_item_add_subtree(ti, ett_igrp); - + version = (ver_and_opcode&0xf0)>>4 ; /* version is the fist half of the byte */ opcode = ver_and_opcode&0x0f ; /* opcode is the last half of the byte */ - + proto_tree_add_text(igrp_tree, tvb, 0,1,"IGRP Version : %d %s",version,(version==1?" ":" - Unknown Version, The dissection may be innacurate")); proto_tree_add_text(igrp_tree, tvb, 0,1,"Command : %d %s",opcode,(opcode==1?"(Response)":"(Request)")); proto_tree_add_uint(igrp_tree, hf_igrp_update, tvb, 1,1, update); @@ -106,7 +106,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* this is a ugly hack to find the first byte of the IP source address */ network = pinfo->net_src.data[0]; - + ti = proto_tree_add_text(igrp_tree, tvb, 4,2,"Interior routes : %d",net1); for( ; net1>0 ; net1-- ) { @@ -155,21 +155,21 @@ static void dissect_vektor_igrp (tvbuff_t *tvb, proto_tree *igrp_vektor_tree, gu if (network==0) ptr_addr=&addr[1]; ti = proto_tree_add_text (igrp_vektor_tree, tvb, 0 ,14, - "Entry for network %s", ip_to_str(ptr_addr)) ; + "Entry for network %s", ip_to_str(ptr_addr)) ; igrp_vektor_tree = proto_item_add_subtree(ti,ett_igrp_net); - proto_tree_add_text (igrp_vektor_tree, tvb, 0 ,3,"Network = %s",ip_to_str(ptr_addr)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 3 ,3,"Delay = %d",tvb_get_ntoh24(tvb,3)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 6 ,3,"Bandwidth = %d",tvb_get_ntoh24(tvb,6)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 9 ,2,"MTU = %d bytes",tvb_get_ntohs(tvb,9)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 11,1,"Reliability = %d",tvb_get_guint8(tvb,11)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 12,1,"Load = %d",tvb_get_guint8(tvb,12)) ; - proto_tree_add_text (igrp_vektor_tree, tvb, 13,1,"Hop count = %d hops",tvb_get_guint8(tvb,13)) ; -} - - + proto_tree_add_text (igrp_vektor_tree, tvb, 0 ,3,"Network = %s",ip_to_str(ptr_addr)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 3 ,3,"Delay = %d",tvb_get_ntoh24(tvb,3)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 6 ,3,"Bandwidth = %d",tvb_get_ntoh24(tvb,6)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 9 ,2,"MTU = %d bytes",tvb_get_ntohs(tvb,9)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 11,1,"Reliability = %d",tvb_get_guint8(tvb,11)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 12,1,"Load = %d",tvb_get_guint8(tvb,12)) ; + proto_tree_add_text (igrp_vektor_tree, tvb, 13,1,"Hop count = %d hops",tvb_get_guint8(tvb,13)) ; +} + + /* Register the protocol with Ethereal */ void proto_register_igrp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { @@ -220,7 +220,7 @@ HEADER structure is 12 bytes as follows : 4 bits Version (only version 1 is defined) 4 bits Opcode (1=Replay, 2=Request) -8 bits Update Release +8 bits Update Release 16 bits Autonomous system number 16 bits Number of Interior routes 16 bits Number of System routes diff --git a/packet-imap.c b/packet-imap.c index 91510033db..02aafce60c 100644 --- a/packet-imap.c +++ b/packet-imap.c @@ -2,24 +2,24 @@ * Routines for imap packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-imap.c,v 1.21 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-imap.c,v 1.22 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -165,7 +165,7 @@ proto_register_imap(void) &ett_imap, }; - proto_imap = proto_register_protocol("Internet Message Access Protocol", + proto_imap = proto_register_protocol("Internet Message Access Protocol", "IMAP", "imap"); proto_register_field_array(proto_imap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-ip.c b/packet-ip.c index 62146c9d3f..06c70c1bed 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,22 +1,22 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.172 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ip.c,v 1.173 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -193,7 +193,7 @@ static gint ett_icmp_mip_flags = -1; /* IP structs and definitions */ -typedef struct _e_ip +typedef struct _e_ip { guint8 ip_v_hl; /* combines ip_v and ip_hl */ guint8 ip_tos; @@ -557,11 +557,11 @@ dissect_ipopt_ra(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, { /* Router-Alert, as defined by RFC2113 */ int opt = tvb_get_ntohs(tvb, offset + 2); - static const value_string ra_opts[] = { + static const value_string ra_opts[] = { {0, "Every router examines packet"}, {0, NULL} }; - + proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s: %s", optp->name, val_to_str(opt, ra_opts, "Unknown (%d)")); return; @@ -857,7 +857,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) set_actual_length(tvb, len); hlen = lo_nibble(iph.ip_v_hl) * 4; /* IP header length, in bytes */ - + if (tree) { if (ip_summary_in_tree && hlen >= IPH_MIN_LEN) { ti = proto_tree_add_protocol_format(tree, proto_ip, tvb, offset, hlen, @@ -1094,7 +1094,7 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) /* Not much to do if we're not parsing everything */ if (!tree) return; - + while (tvb_reported_length_remaining(tvb, offset) > 0) { type = tvb_get_guint8(tvb, offset + 0); @@ -1109,14 +1109,14 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) val_to_str(type, mip_extensions, "Unknown ext %u")); mip_tree = proto_item_add_subtree(ti, ett_icmp_mip); - + switch (type) { case ICMP_MIP_EXTENSION_PAD: /* One byte padding extension */ /* Add our fields */ /* type */ - proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, 1, FALSE); offset++; break; @@ -1124,19 +1124,19 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) /* Mobility Agent Advertisement Extension (RFC 2002)*/ /* Add our fields */ /* type */ - proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, 1, FALSE); offset++; /* length */ - proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, 1, FALSE); offset++; /* sequence number */ - proto_tree_add_item(mip_tree, hf_icmp_mip_seq, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_seq, tvb, offset, 2, FALSE); offset+=2; /* Registration Lifetime */ - proto_tree_add_item(mip_tree, hf_icmp_mip_life, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_life, tvb, offset, 2, FALSE); offset+=2; /* flags */ @@ -1153,16 +1153,16 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) proto_tree_add_boolean(flags_tree, hf_icmp_mip_v, tvb, offset, 1, flags); proto_tree_add_boolean(flags_tree, hf_icmp_mip_res, tvb, offset, 1, flags); offset++; - + /* Reserved */ - proto_tree_add_item(mip_tree, hf_icmp_mip_reserved, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_reserved, tvb, offset, 1, FALSE); offset++; - + /* COAs */ numCOAs = (length - 6) / 4; for (i=0; i<numCOAs; i++) { - proto_tree_add_item(mip_tree, hf_icmp_mip_coa, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_coa, tvb, offset, 4, FALSE); offset+=4; } @@ -1171,11 +1171,11 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) /* Prefix-Lengths Extension (RFC 2002)*/ /* Add our fields */ /* type */ - proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, 1, FALSE); offset++; /* length */ - proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, 1, FALSE); offset++; @@ -1189,18 +1189,18 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) case ICMP_MIP_CHALLENGE: /* Challenge Extension (RFC 3012)*/ /* type */ - proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset, 1, FALSE); offset++; /* length */ - proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset, 1, FALSE); offset++; /* challenge */ - proto_tree_add_item(mip_tree, hf_icmp_mip_challenge, tvb, offset, + proto_tree_add_item(mip_tree, hf_icmp_mip_challenge, tvb, offset, length, FALSE); offset+=length; - + break; default: g_warning("Unknown type(%u)! I hope the length is right (%u)", @@ -1209,7 +1209,7 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree) break; } /* switch type */ } /* end while */ - + } /* dissect_mip_extensions */ static const gchar *unreach_str[] = {"Network unreachable", @@ -1228,7 +1228,7 @@ static const gchar *unreach_str[] = {"Network unreachable", "Communication administratively filtered", "Host precedence violation", "Precedence cutoff in effect"}; - + #define N_UNREACH (sizeof unreach_str / sizeof unreach_str[0]) static const gchar *redir_str[] = {"Redirect for network", @@ -1240,7 +1240,7 @@ static const gchar *redir_str[] = {"Redirect for network", static const gchar *ttl_str[] = {"TTL equals 0 during transit", "TTL equals 0 during reassembly"}; - + #define N_TIMXCEED (sizeof ttl_str / sizeof ttl_str[0]) static const gchar *par_str[] = {"IP header bad", "Required option missing"}; @@ -1371,11 +1371,11 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reported_length = tvb_reported_length(tvb); ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, FALSE); icmp_tree = proto_item_add_subtree(ti, ett_icmp); - proto_tree_add_uint_format(icmp_tree, hf_icmp_type, tvb, 0, 1, + proto_tree_add_uint_format(icmp_tree, hf_icmp_type, tvb, 0, 1, icmp_type, "Type: %u (%s)", icmp_type, type_str); - proto_tree_add_uint_format(icmp_tree, hf_icmp_code, tvb, 1, 1, + proto_tree_add_uint_format(icmp_tree, hf_icmp_code, tvb, 1, 1, icmp_code, "Code: %u %s", icmp_code, code_str); @@ -1759,14 +1759,14 @@ void proto_register_icmp(void) { static hf_register_info hf[] = { - + { &hf_icmp_type, { "Type", "icmp.type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_icmp_code, { "Code", "icmp.code", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + "", HFILL }}, { &hf_icmp_checksum, { "Checksum", "icmp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -1849,8 +1849,8 @@ proto_register_icmp(void) &ett_icmp_mip, &ett_icmp_mip_flags }; - - proto_icmp = proto_register_protocol("Internet Control Message Protocol", + + proto_icmp = proto_register_protocol("Internet Control Message Protocol", "ICMP", "icmp"); proto_register_field_array(proto_icmp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-ip.h b/packet-ip.h index 8779b11033..48acf97f48 100644 --- a/packet-ip.h +++ b/packet-ip.h @@ -1,22 +1,22 @@ /* packet-ip.h * Definitions for IP packet disassembly structures and routines * - * $Id: packet-ip.h,v 1.24 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ip.h,v 1.25 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ipp.c b/packet-ipp.c index c075bc6feb..7264e6aba7 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,22 +3,22 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-ipp.c,v 1.32 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ipp.c,v 1.33 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ipsec.c b/packet-ipsec.c index f919bb334d..9b4b76071d 100644 --- a/packet-ipsec.c +++ b/packet-ipsec.c @@ -1,22 +1,22 @@ /* packet-ipsec.c - * Routines for IPsec/IPComp packet disassembly + * Routines for IPsec/IPComp packet disassembly * - * $Id: packet-ipsec.c,v 1.41 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ipsec.c,v 1.42 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -134,7 +134,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah)); + tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah)); advance = sizeof(ah) + ((ah.ah_len - 1) << 2); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -201,7 +201,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp)); + tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp)); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "ESP (SPI=0x%08x)", @@ -215,7 +215,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { ti = proto_tree_add_item(tree, proto_esp, tvb, 0, -1, FALSE); esp_tree = proto_item_add_subtree(ti, ett_esp); - proto_tree_add_uint(esp_tree, hf_esp_spi, tvb, + proto_tree_add_uint(esp_tree, hf_esp_spi, tvb, offsetof(struct newesp, esp_spi), 4, (guint32)g_ntohl(esp.esp_spi)); proto_tree_add_uint(esp_tree, hf_esp_sequence, tvb, @@ -244,7 +244,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp)); + tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp)); if (check_col(pinfo->cinfo, COL_INFO)) { p = match_strval(g_ntohs(ipcomp.comp_cpi), cpi2val); @@ -270,7 +270,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(ipcomp_tree, hf_ipcomp_flags, tvb, offsetof(struct ipcomp, comp_flags), 1, ipcomp.comp_flags); - proto_tree_add_uint(ipcomp_tree, hf_ipcomp_cpi, tvb, + proto_tree_add_uint(ipcomp_tree, hf_ipcomp_cpi, tvb, offsetof(struct ipcomp, comp_cpi), 2, g_ntohs(ipcomp.comp_cpi)); call_dissector(data_handle, @@ -306,7 +306,7 @@ proto_register_ipsec(void) { "Flags", "ipcomp.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_ipcomp_cpi, - { "CPI", "ipcomp.cpi", FT_UINT16, BASE_HEX, + { "CPI", "ipcomp.cpi", FT_UINT16, BASE_HEX, VALS(cpi2val), 0x0, "", HFILL }}, }; static gint *ett[] = { diff --git a/packet-ipsec.h b/packet-ipsec.h index 36100ac6ba..b0ebaa7494 100644 --- a/packet-ipsec.h +++ b/packet-ipsec.h @@ -1,22 +1,22 @@ /* packet-ipsec.h * - * $Id: packet-ipsec.h,v 1.6 2001/04/23 03:37:31 guy Exp $ + * $Id: packet-ipsec.h,v 1.7 2002/08/28 21:00:17 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ipv6.c b/packet-ipv6.c index d301b47913..0565b93654 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.86 2002/08/03 20:06:46 guy Exp $ + * $Id: packet-ipv6.c,v 1.87 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -463,7 +463,7 @@ static int dissect_mipv6_sub_u(tvbuff_t *tvb, proto_tree *dstopt_tree, int offset) { int len = 0; - + proto_tree_add_uint_format(dstopt_tree, hf_ipv6_mipv6_sub_length, tvb, offset + len, IP6_MIPv6_SUB_TYPE_LENGTH, tvb_get_guint8(tvb, offset + len), diff --git a/packet-ipv6.h b/packet-ipv6.h index 0638123fb8..8066d64fd2 100644 --- a/packet-ipv6.h +++ b/packet-ipv6.h @@ -1,7 +1,7 @@ /* packet-ipv6.h - * Definitions for IPv6 packet disassembly + * Definitions for IPv6 packet disassembly * - * $Id: packet-ipv6.h,v 1.27 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ipv6.h,v 1.28 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,17 +11,17 @@ * MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr> * * HMIPv6 support added by Martti Kuparinen <martti.kuparinen@iki.fi> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ipx.c b/packet-ipx.c index 437ac0dcdf..f6a5e59802 100644 --- a/packet-ipx.c +++ b/packet-ipx.c @@ -2,22 +2,22 @@ * Routines for NetWare's IPX * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-ipx.c,v 1.108 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-ipx.c,v 1.109 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -48,7 +48,7 @@ And from the ncpfs source code by Volker Lendecke */ - + static int proto_ipx = -1; static int hf_ipx_checksum = -1; static int hf_ipx_len = -1; @@ -415,8 +415,8 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sig_char = tvb_get_guint8(tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "%s, Connection %d", + col_add_fstr(pinfo->cinfo, COL_INFO, + "%s, Connection %d", val_to_str(sig_char, ipxmsg_sigchar_vals, "Unknown Signature Char"), conn_number); } @@ -466,12 +466,12 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "RIP packet type: %s", rip_type[operation]); if (operation == 0) { - proto_tree_add_boolean_hidden(rip_tree, - hf_ipxrip_request, + proto_tree_add_boolean_hidden(rip_tree, + hf_ipxrip_request, tvb, 0, 2, 1); } else { - proto_tree_add_boolean_hidden(rip_tree, - hf_ipxrip_response, + proto_tree_add_boolean_hidden(rip_tree, + hf_ipxrip_response, tvb, 0, 2, 1); } @@ -796,12 +796,12 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (query.query_type >= 1 && query.query_type <= 4) { proto_tree_add_text(sap_tree, tvb, 0, 2, sap_type[query.query_type - 1]); if ((query.query_type - 1) % 2) { - proto_tree_add_boolean_hidden(sap_tree, - hf_sap_response, + proto_tree_add_boolean_hidden(sap_tree, + hf_sap_response, tvb, 0, 2, 1); } else { - proto_tree_add_boolean_hidden(sap_tree, - hf_sap_request, + proto_tree_add_boolean_hidden(sap_tree, + hf_sap_request, tvb, 0, 2, 1); } } @@ -899,73 +899,73 @@ proto_register_ipx(void) static hf_register_info hf_spx[] = { { &hf_spx_connection_control, - { "Connection Control", "spx.ctl", + { "Connection Control", "spx.ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_spx_datastream_type, - { "Datastream type", "spx.type", + { "Datastream type", "spx.type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_spx_src_id, - { "Source Connection ID", "spx.src", + { "Source Connection ID", "spx.src", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_spx_dst_id, - { "Destination Connection ID", "spx.dst", + { "Destination Connection ID", "spx.dst", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_spx_seq_nr, - { "Sequence Number", "spx.seq", + { "Sequence Number", "spx.seq", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_spx_ack_nr, - { "Acknowledgment Number", "spx.ack", + { "Acknowledgment Number", "spx.ack", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_spx_all_nr, - { "Allocation Number", "spx.alloc", + { "Allocation Number", "spx.alloc", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }} }; static hf_register_info hf_ipxrip[] = { { &hf_ipxrip_request, - { "Request", "ipxrip.request", + { "Request", "ipxrip.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if IPX RIP request", HFILL }}, { &hf_ipxrip_response, - { "Response", "ipxrip.response", + { "Response", "ipxrip.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if IPX RIP response", HFILL }} }; static hf_register_info hf_sap[] = { { &hf_sap_request, - { "Request", "ipxsap.request", + { "Request", "ipxsap.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if SAP request", HFILL }}, { &hf_sap_response, - { "Response", "ipxsap.response", + { "Response", "ipxsap.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if SAP response", HFILL }} }; static hf_register_info hf_ipxmsg[] = { { &hf_msg_conn, - { "Connection Number", "ipxmsg.conn", + { "Connection Number", "ipxmsg.conn", FT_UINT8, BASE_DEC, NULL, 0x0, "Connection Number", HFILL }}, { &hf_msg_sigchar, - { "Signature Char", "ipxmsg.sigchar", + { "Signature Char", "ipxmsg.sigchar", FT_UINT8, BASE_DEC, VALS(ipxmsg_sigchar_vals), 0x0, "Signature Char", HFILL }} }; diff --git a/packet-ipx.h b/packet-ipx.h index 94b1376dad..1202f6167d 100644 --- a/packet-ipx.h +++ b/packet-ipx.h @@ -2,22 +2,22 @@ * Routines for NetWare's IPX * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-ipx.h,v 1.16 2002/04/24 06:03:34 guy Exp $ + * $Id: packet-ipx.h,v 1.17 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@etheeal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-irc.c b/packet-irc.c index cc1c476a1f..d8a9885814 100644 --- a/packet-irc.c +++ b/packet-irc.c @@ -1,24 +1,24 @@ /* packet-irc.c * Routines for IRC packet dissection * - * $Id: packet-irc.c,v 1.20 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-irc.c,v 1.21 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -132,7 +132,7 @@ proto_register_irc(void) { "Response", "irc.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if IRC response", HFILL }}, - + { &hf_irc_request, { "Request", "irc.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, diff --git a/packet-isakmp.c b/packet-isakmp.c index 1f784fafa9..2eecb2adba 100644 --- a/packet-isakmp.c +++ b/packet-isakmp.c @@ -4,22 +4,22 @@ * for ISAKMP (RFC 2407) * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-isakmp.c,v 1.58 2002/08/20 18:20:11 guy Exp $ + * $Id: packet-isakmp.c,v 1.59 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -357,21 +357,21 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); hdr.length = tvb_get_ntohl(tvb, offset + sizeof(hdr) - sizeof(hdr.length)); - + if (tree) { ti = proto_tree_add_item(tree, proto_isakmp, tvb, offset, hdr.length, FALSE); isakmp_tree = proto_item_add_subtree(ti, ett_isakmp); } - + tvb_memcpy(tvb, (guint8 *)&encap_hdr, 0, sizeof(encap_hdr)); - + if (encap_hdr.non_esp_marker[0] == 0xFF) { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, "UDP encapsulated IPSec - NAT Keepalive"); return; } if (memcmp(encap_hdr.non_esp_marker,non_esp_marker,4) == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, "UDP encapsulated IPSec - ESP"); if (tree) proto_tree_add_text(isakmp_tree, tvb, offset, @@ -385,18 +385,18 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr.exch_type = tvb_get_guint8(tvb, sizeof(hdr.icookie) + sizeof(hdr.rcookie) + sizeof(hdr.next_payload) + sizeof(hdr.version)); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, exchtype2str(hdr.exch_type)); - + if (tree) { tvb_memcpy(tvb, (guint8 *)&hdr.icookie, offset, sizeof(hdr.icookie)); proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.icookie), "Initiator cookie: 0x%s", tvb_bytes_to_str(tvb, offset, sizeof(hdr.icookie))); offset += sizeof(hdr.icookie); - - tvb_memcpy(tvb, (guint8 *)&hdr.rcookie, offset, sizeof(hdr.rcookie)); + + tvb_memcpy(tvb, (guint8 *)&hdr.rcookie, offset, sizeof(hdr.rcookie)); proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.rcookie), "Responder cookie: 0x%s", tvb_bytes_to_str(tvb, offset, sizeof(hdr.rcookie))); offset += sizeof(hdr.rcookie); - + hdr.next_payload = tvb_get_guint8(tvb, offset); proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.next_payload), "Next payload: %s (%u)", @@ -408,21 +408,21 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Version: %u.%u", hi_nibble(hdr.version), lo_nibble(hdr.version)); offset += sizeof(hdr.version); - - hdr.exch_type = tvb_get_guint8(tvb, offset); + + hdr.exch_type = tvb_get_guint8(tvb, offset); proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.exch_type), "Exchange type: %s (%u)", exchtype2str(hdr.exch_type), hdr.exch_type); offset += sizeof(hdr.exch_type); - + { proto_item * fti; proto_tree * ftree; - - hdr.flags = tvb_get_guint8(tvb, offset); + + hdr.flags = tvb_get_guint8(tvb, offset); fti = proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.flags), "Flags"); ftree = proto_item_add_subtree(fti, ett_isakmp_flags); - + proto_tree_add_text(ftree, tvb, offset, 1, "%s", decode_boolean_bitfield(hdr.flags, E_FLAG, sizeof(hdr.flags)*8, "Encryption", "No encryption")); @@ -438,11 +438,11 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.message_id), "Message ID: 0x%s", tvb_bytes_to_str(tvb, offset, sizeof(hdr.message_id))); offset += sizeof(hdr.message_id); - + proto_tree_add_text(isakmp_tree, tvb, offset, sizeof(hdr.length), "Length: %u", hdr.length); offset += sizeof(hdr.length); - + len = hdr.length - sizeof(hdr); if (hdr.flags & E_FLAG) { @@ -506,7 +506,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, doitype2str(doi), doi); offset += 4; length -= 4; - + if (doi == 1) { /* IPSEC */ if (length < 4) { @@ -521,7 +521,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, situation2str(situation), situation); offset += 4; length -= 4; - + dissect_payloads(tvb, tree, LOAD_TYPE_PROPOSAL, offset, length); } else { /* Unknown */ @@ -544,20 +544,20 @@ dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, guint8 proposal_num; proposal_num = tvb_get_guint8(tvb, offset); - + proto_item_append_text(tree, " # %d",proposal_num); proto_tree_add_text(tree, tvb, offset, 1, "Proposal number: %u", proposal_num); offset += 1; length -= 1; - + protocol_id = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Protocol ID: %s (%u)", proto2str(protocol_id), protocol_id); offset += 1; length -= 1; - + spi_size = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "SPI size: %u", spi_size); @@ -603,7 +603,7 @@ dissect_transform(tvbuff_t *tvb, int offset, int length, proto_tree *tree, { guint8 transform_id; guint8 transform_num; - + transform_num = tvb_get_guint8(tvb, offset); proto_item_append_text(tree," # %d",transform_num); proto_tree_add_text(tree, tvb, offset, 1, @@ -640,7 +640,7 @@ dissect_transform(tvbuff_t *tvb, int offset, int length, proto_tree *tree, } offset += 3; length -= 3; - + while (length>0) { const char *str; int ike_phase1 = 0; @@ -726,7 +726,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, proto_tree_add_text(tree, tvb, offset, 2, "Port: %u", port); offset += 2; length -= 2; - + switch (id_type) { case 1: proto_tree_add_text(tree, tvb, offset, length, @@ -826,13 +826,13 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, proto2str(protocol_id), protocol_id); offset += 1; length -= 1; - + spi_size = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "SPI size: %u", spi_size); offset += 1; length -= 1; - + msgtype = tvb_get_ntohs(tvb, offset); proto_tree_add_text(tree, tvb, offset, 2, "Message type: %s (%u)", msgtype2str(msgtype), msgtype); @@ -858,7 +858,7 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, guint8 spi_size; guint16 num_spis; guint16 i; - + doi = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Domain of Interpretation: %s (%u)", @@ -872,7 +872,7 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, proto2str(protocol_id), protocol_id); offset += 1; length -= 1; - + spi_size = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "SPI size: %u", spi_size); @@ -884,7 +884,7 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, "Number of SPIs: %u", num_spis); offset += 2; length -= 2; - + for (i = 0; i < num_spis; ++i) { if (length < spi_size) { proto_tree_add_text(tree, tvb, offset, length, @@ -947,7 +947,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree, default: proto_item_append_text(pt, " Uknown CP version!"); break; } - } + } else if (memcmp(pVID, VID_CYBERGUARD, isakmp_min(VID_LEN, length)) == 0) proto_item_append_text(pt, "Cyber Guard"); @@ -970,15 +970,15 @@ dissect_config(tvbuff_t *tvb, int offset, int length, proto_tree *tree, type = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Type %s (%u)",attrtype2str(type),type); - + offset += 2; length -= 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Identifier: %u", tvb_get_ntohs(tvb, offset)); offset += 2; length -= 2; - + while(length>0) { guint16 aft = tvb_get_ntohs(tvb, offset); guint16 type = aft & 0x7fff; @@ -1034,7 +1034,7 @@ exchtype2str(guint8 type) { "Informational", "Transaction (Config Mode)" }; - + if (type < NUM_EXCHSTRS) return exchstrs[type]; if (type < 32) return "ISAKMP Future Use"; switch (type) { @@ -1045,7 +1045,7 @@ exchtype2str(guint8 type) { } if (type < 240) return "DOI Specific Use"; if (type < 256) return "Private Use"; - + return "Huh? You should never see this! Shame on you!"; } @@ -1120,7 +1120,7 @@ situation2str(guint32 type) { int n = 0; char * sep = ""; int ret; - + if (type & SIT_IDENTITY) { ret = snprintf(msg, SIT_MSG_NUM-n, "%sIDENTITY", sep); if (ret == -1) { @@ -1162,9 +1162,9 @@ situation2str(guint32 type) { static const char * value2str(int ike_p1, guint16 att_type, guint16 value) { - + if (value == 0) return "RESERVED"; - + if (!ike_p1) { switch (att_type) { case 1: @@ -1261,7 +1261,7 @@ value2str(int ike_p1, guint16 att_type, guint16 value) { default: return "UNKNOWN-AUTH-METHOD"; } case 4: return grpdesc2str(value); - case 6: + case 6: case 7: case 8: case 9: @@ -1294,7 +1294,7 @@ value2str(int ike_p1, guint16 att_type, guint16 value) { } } -static const char * +static const char * attrtype2str(guint8 type) { switch (type) { case 0: return "Reserved"; @@ -1308,7 +1308,7 @@ attrtype2str(guint8 type) { return "Private use"; } -static const char * +static const char * cfgattrident2str(guint16 ident) { #define NUM_ATTR_DEFINED 12 static const char *msgs[NUM_PREDEFINED] = { @@ -1325,7 +1325,7 @@ cfgattrident2str(guint16 ident) { "INTERNAL_IP6_DNS", "INTERNAL_IP6_NBNS", "INTERNAL_IP6_DHCP", - }; + }; if(ident < NUM_ATTR_DEFINED) return msgs[ident]; if(ident < 16383) diff --git a/packet-iscsi.c b/packet-iscsi.c index d46f1cfd70..50e5e59a29 100644 --- a/packet-iscsi.c +++ b/packet-iscsi.c @@ -2,7 +2,7 @@ * Routines for iSCSI dissection * Copyright 2001, Eurologic and Mark Burton <markb@ordern.com> * - * $Id: packet-iscsi.c,v 1.37 2002/08/20 22:33:16 guy Exp $ + * $Id: packet-iscsi.c,v 1.38 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -771,7 +771,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if (conversation) { ckey.conv_idx = conversation->index; ckey.itt = tvb_get_ntohl (tvb, offset+16); - + cdata = (iscsi_conv_data_t *)g_hash_table_lookup (iscsi_req_hash, &ckey); @@ -782,7 +782,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off /* no conversation, meaning we didn't see the request */ pinfo->private_data = NULL; } - + if (cdata) { del_usecs = (pinfo->fd->abs_secs - cdata->abs_secs)* 1000000 + (pinfo->fd->abs_usecs - cdata->abs_usecs); @@ -797,16 +797,16 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - + ckey.conv_idx = conversation->index; ckey.itt = tvb_get_ntohl (tvb, offset+16); - + cdata = (iscsi_conv_data_t *)g_hash_table_lookup (iscsi_req_hash, &ckey); if (cdata) { /* Since we never free the memory used by an exchange, this maybe a * case of another request using the same exchange as a previous - * req. + * req. */ cdata->abs_usecs = pinfo->fd->abs_usecs; cdata->abs_secs = pinfo->fd->abs_secs; @@ -815,11 +815,11 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off req_key = g_mem_chunk_alloc (iscsi_req_keys); req_key->conv_idx = conversation->index; req_key->itt = tvb_get_ntohl (tvb, offset+16); - + cdata = g_mem_chunk_alloc (iscsi_req_vals); cdata->abs_usecs = pinfo->fd->abs_usecs; cdata->abs_secs = pinfo->fd->abs_secs; - + g_hash_table_insert (iscsi_req_hash, req_key, cdata); } @@ -832,7 +832,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off else { pinfo->private_data = NULL; } - + if (check_col(pinfo->cinfo, COL_INFO)) { if (opcode != ISCSI_OPCODE_SCSI_COMMAND) { @@ -949,7 +949,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off gint b = tvb_get_guint8(tvb, offset + 1); proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); - + proto_tree_add_boolean(tt, hf_iscsi_SCSICommand_F, tvb, offset + 1, 1, b); proto_tree_add_boolean(tt, hf_iscsi_SCSICommand_R, tvb, offset + 1, 1, b); proto_tree_add_boolean(tt, hf_iscsi_SCSICommand_W, tvb, offset + 1, 1, b); @@ -990,7 +990,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off gint b = tvb_get_guint8(tvb, offset + 1); proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); - + proto_tree_add_boolean(tt, hf_iscsi_SCSIResponse_o, tvb, offset + 1, 1, b); proto_tree_add_boolean(tt, hf_iscsi_SCSIResponse_u, tvb, offset + 1, 1, b); proto_tree_add_boolean(tt, hf_iscsi_SCSIResponse_O, tvb, offset + 1, 1, b); @@ -1066,7 +1066,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); #endif - + proto_tree_add_boolean(ti, hf_iscsi_Login_T, tvb, offset + 1, 1, b); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT08) { proto_tree_add_boolean(ti, hf_iscsi_Login_X, tvb, offset + 1, 1, b); @@ -1131,7 +1131,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); #endif - + proto_tree_add_boolean(ti, hf_iscsi_Login_T, tvb, offset + 1, 1, b); proto_tree_add_item(ti, hf_iscsi_Login_CSG, tvb, offset + 1, 1, FALSE); proto_tree_add_item(ti, hf_iscsi_Login_NSG, tvb, offset + 1, 1, FALSE); @@ -1185,7 +1185,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off gint b = tvb_get_guint8(tvb, offset + 1); proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); - + proto_tree_add_boolean(tt, hf_iscsi_Text_F, tvb, offset + 1, 1, b); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { @@ -1208,7 +1208,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off gint b = tvb_get_guint8(tvb, offset + 1); proto_item *tf = proto_tree_add_uint(ti, hf_iscsi_Flags, tvb, offset + 1, 1, b); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags); - + proto_tree_add_boolean(tt, hf_iscsi_Text_F, tvb, offset + 1, 1, b); } if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { @@ -1456,16 +1456,16 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } if (cdata && tree) { /* destroy the data structures for this SCSI task */ -#if 0 +#if 0 g_mem_chunk_free (iscsi_req_vals, cdata); g_hash_table_remove (iscsi_req_hash, &ckey); pinfo->private_data = NULL; -#endif +#endif } } else if ((opcode == ISCSI_OPCODE_SCSI_DATA_IN) || (opcode == ISCSI_OPCODE_SCSI_DATA_OUT)) { - /* offset is setup correctly by the iscsi code for response above */ + /* offset is setup correctly by the iscsi code for response above */ dissect_scsi_payload (tvb, pinfo, tree, offset, FALSE, iscsi_min (data_segment_len, end_offset-offset)); } @@ -1567,7 +1567,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pduLen += data_segment_len; if((pduLen & 3) != 0) pduLen += 4 - (pduLen & 3); - + if(digestsActive && enableHeaderDigests) { if(headerDigestIsCRC32) pduLen += 4; @@ -1581,7 +1581,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { else pduLen += dataDigestSize; } - + /* * Desegmentation check. */ @@ -1630,7 +1630,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { void proto_register_iscsi(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { @@ -1701,49 +1701,49 @@ proto_register_iscsi(void) }, { &hf_iscsi_Opcode, { "Opcode", "iscsi.opcode", - FT_UINT8, BASE_HEX, VALS(iscsi_opcodes), 0, + FT_UINT8, BASE_HEX, VALS(iscsi_opcodes), 0, "Opcode", HFILL } }, /* #ifdef DRAFT08 */ { &hf_iscsi_X, { "X", "iscsi.X", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_X), 0x80, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_X), 0x80, "Command Retry", HFILL } }, /* #endif */ { &hf_iscsi_I, { "I", "iscsi.I", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_I), 0x40, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_I), 0x40, "Immediate delivery", HFILL } }, { &hf_iscsi_Flags, { "Flags", "iscsi.flags", - FT_UINT8, BASE_HEX, NULL, 0, + FT_UINT8, BASE_HEX, NULL, 0, "Opcode specific flags", HFILL } }, { &hf_iscsi_SCSICommand_F, { "F", "iscsi.scsicommand.F", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_F), 0x80, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_F), 0x80, "PDU completes command", HFILL } }, { &hf_iscsi_SCSICommand_R, { "R", "iscsi.scsicommand.R", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_R), 0x40, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_R), 0x40, "Command reads from SCSI target", HFILL } }, { &hf_iscsi_SCSICommand_W, { "W", "iscsi.scsicommand.W", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_W), 0x20, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_W), 0x20, "Command writes to SCSI target", HFILL } }, { &hf_iscsi_SCSICommand_Attr, { "Attr", "iscsi.scsicommand.attr", - FT_UINT8, BASE_HEX, VALS(iscsi_scsicommand_taskattrs), 0x07, + FT_UINT8, BASE_HEX, VALS(iscsi_scsicommand_taskattrs), 0x07, "SCSI task attributes", HFILL } }, { &hf_iscsi_SCSICommand_CRN, { "CRN", "iscsi.scsicommand.crn", - FT_UINT8, BASE_HEX, NULL, 0, + FT_UINT8, BASE_HEX, NULL, 0, "SCSI command reference number", HFILL } }, { &hf_iscsi_SCSICommand_AddCDB, @@ -1808,22 +1808,22 @@ proto_register_iscsi(void) }, { &hf_iscsi_SCSIResponse_o, { "o", "iscsi.scsiresponse.o", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_o), 0x10, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_o), 0x10, "Bi-directional read residual overflow", HFILL } }, { &hf_iscsi_SCSIResponse_u, { "u", "iscsi.scsiresponse.u", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_u), 0x08, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_u), 0x08, "Bi-directional read residual underflow", HFILL } }, { &hf_iscsi_SCSIResponse_O, { "O", "iscsi.scsiresponse.O", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_O), 0x04, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_O), 0x04, "Residual overflow", HFILL } }, { &hf_iscsi_SCSIResponse_U, { "U", "iscsi.scsiresponse.U", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_U), 0x02, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_U), 0x02, "Residual underflow", HFILL } }, { &hf_iscsi_SCSIResponse_Status, @@ -1989,7 +1989,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_Login_T, { "T", "iscsi.login.T", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_T), 0x80, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_T), 0x80, "Transit to next login stage", HFILL } }, /* #ifdef DRAFT09 */ @@ -2001,12 +2001,12 @@ proto_register_iscsi(void) /* #endif */ { &hf_iscsi_Login_CSG, { "CSG", "iscsi.login.csg", - FT_UINT8, BASE_HEX, VALS(iscsi_login_stage), CSG_MASK, + FT_UINT8, BASE_HEX, VALS(iscsi_login_stage), CSG_MASK, "Current stage", HFILL } }, { &hf_iscsi_Login_NSG, { "NSG", "iscsi.login.nsg", - FT_UINT8, BASE_HEX, VALS(iscsi_login_stage), NSG_MASK, + FT_UINT8, BASE_HEX, VALS(iscsi_login_stage), NSG_MASK, "Next stage", HFILL } }, { &hf_iscsi_Login_Status, @@ -2021,7 +2021,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_Text_F, { "F", "iscsi.text.F", - FT_BOOLEAN, 8, TFS(&iscsi_meaning_F), 0x80, + FT_BOOLEAN, 8, TFS(&iscsi_meaning_F), 0x80, "Final PDU in text sequence", HFILL } }, { &hf_iscsi_ExpDataSN, @@ -2111,7 +2111,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_snack_type, { "S", "iscsi.snack.type", - FT_UINT8, BASE_DEC, VALS(iscsi_snack_types), 0x0f, + FT_UINT8, BASE_DEC, VALS(iscsi_snack_types), 0x0f, "Type of SNACK requested", HFILL } }, { &hf_iscsi_BegRun, @@ -2145,7 +2145,7 @@ proto_register_iscsi(void) proto_register_field_array(proto_iscsi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); register_init_routine (&iscsi_init_protocol); - + { module_t *iscsi_module = prefs_register_protocol(proto_iscsi, NULL); @@ -2164,61 +2164,61 @@ proto_register_iscsi(void) &iscsi_desegment); prefs_register_bool_preference(iscsi_module, - "bogus_pdu_filter", + "bogus_pdu_filter", "Enable bogus pdu filter", "When enabled, packets that appear bogus are ignored", &enable_bogosity_filter); prefs_register_bool_preference(iscsi_module, - "demand_good_f_bit", + "demand_good_f_bit", "Ignore packets with bad F bit", "Ignore packets that haven't set the F bit when they should have", &demand_good_f_bit); prefs_register_uint_preference(iscsi_module, - "bogus_pdu_max_data_len", + "bogus_pdu_max_data_len", "Bogus pdu max data length threshold", "Treat packets whose data segment length is greater than this value as bogus", 10, &bogus_pdu_data_length_threshold); prefs_register_uint_preference(iscsi_module, - "iscsi_port", + "iscsi_port", "Target port", "Port number of iSCSI target", 10, &iscsi_port); prefs_register_bool_preference(iscsi_module, - "enable_header_digests", + "enable_header_digests", "Enable header digests", "When enabled, pdus are assumed to contain a header digest", &enableHeaderDigests); prefs_register_bool_preference(iscsi_module, - "enable_data_digests", + "enable_data_digests", "Enable data digests", "When enabled, pdus are assumed to contain a data digest", &enableDataDigests); prefs_register_bool_preference(iscsi_module, - "header_digest_is_crc32c", + "header_digest_is_crc32c", "Header digest is CRC32C", "When enabled, header digests are assumed to be CRC32C", &headerDigestIsCRC32); prefs_register_bool_preference(iscsi_module, - "data_digest_is_crc32c", + "data_digest_is_crc32c", "Data digest is CRC32C", "When enabled, data digests are assumed to be CRC32C", &dataDigestIsCRC32); prefs_register_uint_preference(iscsi_module, - "header_digest_size", + "header_digest_size", "Header digest size", "The size of a header digest (bytes)", 10, &headerDigestSize); prefs_register_uint_preference(iscsi_module, - "data_digest_size", + "data_digest_size", "Data digest size", "The size of a data digest (bytes)", 10, diff --git a/packet-isis-clv.c b/packet-isis-clv.c index 973fed8353..a9adade013 100644 --- a/packet-isis-clv.c +++ b/packet-isis-clv.c @@ -1,23 +1,23 @@ /* packet-isis-clv.c * Common CLV decode routines. * - * $Id: packet-isis-clv.c,v 1.22 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-isis-clv.c,v 1.23 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,7 +49,7 @@ free_g_string(void *arg) /* * Name: isis_dissect_area_address_clv() - * + * * Description: * Take an area address CLV and display it pieces. An area address * CLV is n, x byte hex strings. @@ -59,14 +59,14 @@ free_g_string(void *arg) * proto_tree * : protocol display tree to fill out. May be NULL * int : offset into packet data where we are. * int : length of clv we are decoding - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) -{ +{ int arealen,area_idx; GString *gstr; @@ -86,7 +86,7 @@ isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, } if ( tree ) { - /* + /* * Lets turn the area address into "standard" * xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx format string. * this is a private routine as the print_nsap_net in @@ -112,7 +112,7 @@ isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, } /* and spit it out */ - proto_tree_add_text ( tree, tvb, offset, arealen + 1, + proto_tree_add_text ( tree, tvb, offset, arealen + 1, "Area address (%d): %s", arealen, gstr->str ); /* @@ -129,14 +129,14 @@ isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: isis_dissect_authentication_clv() - * + * * Description: * Take apart the CLV that hold authentication information. This * is currently 1 octet auth type (which must be 1) and then * the clear text password. - * + * * An ISIS password has different meaning depending where it - * is found. Thus we support a passed in prefix string to + * is found. Thus we support a passed in prefix string to * use to name this. * * Input: @@ -145,14 +145,14 @@ isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * int : offset into packet data where we are. * int : length of clv we are decoding * char * : Password meaning - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, char *meaning) -{ +{ guchar pw_type; char sbuf[300]; /* 255 + header info area */ char *s = sbuf; @@ -207,8 +207,8 @@ isis_dissect_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, if ( auth_unsupported ) { isis_dissect_unknown(tvb, tree, offset, "Unknown authentication type" ); - } -} + } +} /* * Name: isis_dissect_hostname_clv() @@ -231,7 +231,7 @@ isis_dissect_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, void isis_dissect_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) -{ +{ if ( !tree ) return; /* nothing to do! */ if ( length == 0 ) { @@ -247,15 +247,15 @@ isis_dissect_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, -void +void isis_dissect_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, int tree_id) -{ +{ guint16 mt_block; char mt_desc[60]; while (length>0) { - /* length can only be a multiple of 2, otherwise there is + /* length can only be a multiple of 2, otherwise there is something broken -> so decode down until length is 1 */ if (length!=1) { /* fetch two bytes */ @@ -302,7 +302,7 @@ isis_dissect_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, /* * Name: isis_dissect_ip_int_clv() - * + * * Description: * Take apart the CLV that lists all the IP interfaces. The * meaning of which is slightly different for the different base packet @@ -315,11 +315,11 @@ isis_dissect_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, * int : offset into packet data where we are. * int : length of clv we are decoding * int : tree id to use for proto tree. - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_ip_int_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, int tree_id) { @@ -344,7 +344,7 @@ isis_dissect_ip_int_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: isis_dissect_ipv6_int_clv() - * + * * Description: * Take apart the CLV that lists all the IPv6 interfaces. The * meaning of which is slightly different for the different base packet @@ -357,11 +357,11 @@ isis_dissect_ip_int_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * int : offset into packet data where we are. * int : length of clv we are decoding * int : tree id to use for proto tree. - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_ipv6_int_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length, int tree_id) { @@ -425,7 +425,7 @@ isis_dissect_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: isis_dissect_nlpid_clv() - * + * * Description: * Take apart a NLPID packet and display it. The NLPID (for intergrated * ISIS, contains n network layer protocol IDs that the box supports. @@ -437,11 +437,11 @@ isis_dissect_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * proto_tree * : protocol display tree to fill out. May be NULL * int : offset into packet data where we are. * int : length of clv we are decoding - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) { char sbuf[256*6]; @@ -453,12 +453,12 @@ isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) while ( length-- > 0 ) { if (s != sbuf ) { - s += sprintf ( s, ", " ); + s += sprintf ( s, ", " ); } s += sprintf ( s, "%s (0x%02x)", - val_to_str(tvb_get_guint8(tvb, offset), nlpid_vals, + val_to_str(tvb_get_guint8(tvb, offset), nlpid_vals, "Unknown"), tvb_get_guint8(tvb, offset)); - offset++; + offset++; } if ( hlen == 0 ) { @@ -471,7 +471,7 @@ isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) /* * Name: isis_dissect_clvs() - * + * * Description: * Dispatch routine to shred all the CLVs in a packet. We just * walk through the clv entries in the packet. For each one, we @@ -489,11 +489,11 @@ isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) * int : length of CLV area. * int : length of IDs in packet. * int : unknown clv tree id - * + * * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset, const isis_clv_handle_t *opts, int len, int id_length, int unknown_tree_id) @@ -528,11 +528,11 @@ isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset, if ( opts[q].dissect ) { if (tree) { /* adjust by 2 for code/len octets */ - snprintf ( sbuf, sizeof(sbuf), "%s (%d)", - opts[q].tree_text, length ); - ti = proto_tree_add_text(tree, tvb, offset - 2, + snprintf ( sbuf, sizeof(sbuf), "%s (%d)", + opts[q].tree_text, length ); + ti = proto_tree_add_text(tree, tvb, offset - 2, length + 2, sbuf); - clv_tree = proto_item_add_subtree(ti, + clv_tree = proto_item_add_subtree(ti, *opts[q].tree_id ); } else { clv_tree = NULL; @@ -540,14 +540,14 @@ isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset, opts[q].dissect(tvb, clv_tree, offset, id_length, length); } else { - if (tree) { - snprintf ( sbuf, sizeof(sbuf), - "Unknown code (%d:%d)", code, length ); - ti = proto_tree_add_text(tree, tvb, offset - 2, + if (tree) { + snprintf ( sbuf, sizeof(sbuf), + "Unknown code (%d:%d)", code, length ); + ti = proto_tree_add_text(tree, tvb, offset - 2, length + 2, sbuf); - clv_tree = proto_item_add_subtree(ti, + clv_tree = proto_item_add_subtree(ti, unknown_tree_id ); - } else { + } else { clv_tree = NULL; } } diff --git a/packet-isis-clv.h b/packet-isis-clv.h index 399566cef6..10d4c27011 100644 --- a/packet-isis-clv.h +++ b/packet-isis-clv.h @@ -1,23 +1,23 @@ /* packet-isis-clv.h * Declares for common clv decoding functions. * - * $Id: packet-isis-clv.h,v 1.8 2002/04/07 22:36:55 guy Exp $ + * $Id: packet-isis-clv.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,7 +41,7 @@ typedef struct { * Published API functions. NOTE, this are "local" API functions and * are only valid from with isis decodes. */ -extern void isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset, +extern void isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset, const isis_clv_handle_t *opts, int len, int id_length, int unknown_tree_id); diff --git a/packet-isis-hello.c b/packet-isis-hello.c index cd9b0d3335..d407a80337 100644 --- a/packet-isis-hello.c +++ b/packet-isis-hello.c @@ -1,23 +1,23 @@ /* packet-isis-hello.c * Routines for decoding isis hello packets and their CLVs * - * $Id: packet-isis-hello.c,v 1.31 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-isis-hello.c,v 1.32 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -70,28 +70,28 @@ static const value_string isis_hello_circuit_type_vals[] = { { ISIS_HELLO_TYPE_LEVEL_12, "Level 1 and 2"}, { 0, NULL} }; -/* +/* * Predclare dissectors for use in clv dissection. */ -static void dissect_hello_padding_clv(tvbuff_t *tvb, +static void dissect_hello_padding_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_is_neighbors_clv(tvbuff_t *tvb, +static void dissect_hello_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_ptp_adj_clv(tvbuff_t *tvb, +static void dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_area_address_clv(tvbuff_t *tvb, +static void dissect_hello_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_auth_clv(tvbuff_t *tvb, +static void dissect_hello_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, +static void dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, +static void dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_mt_clv(tvbuff_t *tvb, +static void dissect_hello_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_nlpid_clv(tvbuff_t *tvb, +static void dissect_hello_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_hello_restart_clv(tvbuff_t *tvb, +static void dissect_hello_restart_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); @@ -312,8 +312,8 @@ static const isis_clv_handle_t clv_ptp_hello_opts[] = { * */ -static void -dissect_hello_restart_clv(tvbuff_t *tvb, +static void +dissect_hello_restart_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { int restart_options; @@ -327,12 +327,12 @@ dissect_hello_restart_clv(tvbuff_t *tvb, restart_options = tvb_get_guint8(tvb, offset); - proto_tree_add_text ( tree, tvb, offset, 1, + proto_tree_add_text ( tree, tvb, offset, 1, "Restart Request bit %s, " "Restart Acknowledgement bit %s", ISIS_MASK_RESTART_RR(restart_options) ? "set" : "clear", - ISIS_MASK_RESTART_RA(restart_options) ? "set" : "clear"); - proto_tree_add_text ( tree, tvb, offset+1, 2, + ISIS_MASK_RESTART_RA(restart_options) ? "set" : "clear"); + proto_tree_add_text ( tree, tvb, offset+1, 2, "Remaining holding time: %us", tvb_get_ntohs(tvb, offset+1) ); } @@ -354,8 +354,8 @@ dissect_hello_restart_clv(tvbuff_t *tvb, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_hello_nlpid_clv(tvbuff_t *tvb, +static void +dissect_hello_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_nlpid_clv(tvb, tree, offset, length); @@ -379,8 +379,8 @@ dissect_hello_nlpid_clv(tvbuff_t *tvb, * void, will modify proto_tree if not null. */ -static void -dissect_hello_mt_clv(tvbuff_t *tvb, +static void +dissect_hello_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_mt_clv(tvb, tree, offset, length, @@ -404,8 +404,8 @@ dissect_hello_mt_clv(tvbuff_t *tvb, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, +static void +dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_ip_int_clv(tvb, tree, offset, length, @@ -429,8 +429,8 @@ dissect_hello_ip_int_addr_clv(tvbuff_t *tvb, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, +static void +dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_ipv6_int_clv(tvb, tree, offset, length, @@ -455,8 +455,8 @@ dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_hello_auth_clv(tvbuff_t *tvb, +static void +dissect_hello_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_authentication_clv(tvb, tree, offset, @@ -480,8 +480,8 @@ dissect_hello_auth_clv(tvbuff_t *tvb, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_hello_area_address_clv(tvbuff_t *tvb, +static void +dissect_hello_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_area_address_clv(tvb, tree, offset, length); @@ -489,8 +489,8 @@ dissect_hello_area_address_clv(tvbuff_t *tvb, -static void -dissect_hello_ptp_adj_clv(tvbuff_t *tvb, +static void +dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { static const value_string adj_state_vals[] = { @@ -511,9 +511,9 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, break; case 5: proto_tree_add_text ( tree, tvb, offset, 1, - "Adjacency State: %s", adj_state_str ); - proto_tree_add_text ( tree, tvb, offset+1, 4, - "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); + "Adjacency State: %s", adj_state_str ); + proto_tree_add_text ( tree, tvb, offset+1, 4, + "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); break; case 11: proto_tree_add_text ( tree, tvb, offset, 1, @@ -529,7 +529,7 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree_add_text ( tree, tvb, offset+1, 4, "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); proto_tree_add_text ( tree, tvb, offset+5, 6, - "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); + "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); proto_tree_add_text ( tree, tvb, offset+11, 4, "Neighbor Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+11) ); break; @@ -542,7 +542,7 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, /* * Name: isis_dissect_is_neighbors_clv() - * + * * Description: * Take apart a IS neighbor packet. A neighbor is n 6 byte packets. * (they tend to be an 802.3 MAC address, but its not required). @@ -553,11 +553,11 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, * int : offset into packet data where we are. * int : length of IDs in packet. * int : length of clv we are decoding - * + * * Output: * void, but we will add to proto tree if !NULL. */ -static void +static void dissect_hello_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { @@ -567,12 +567,12 @@ dissect_hello_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, "short is neighbor (%d vs 6)", length ); return; } - /* + /* * Lets turn the area address into "standard" 0000.0000.etc - * format string. + * format string. */ if ( tree ) { - proto_tree_add_text ( tree, tvb, offset, 6, + proto_tree_add_text ( tree, tvb, offset, 6, "IS Neighbor: %s", get_ether_name( tvb_get_ptr(tvb, offset, 6)) ); } offset += 6; @@ -597,7 +597,7 @@ dissect_hello_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void */ -static void +static void dissect_hello_padding_clv(tvbuff_t *tvb _U_, proto_tree *tree _U_, int offset _U_, int id_length _U_, int length _U_) { @@ -607,7 +607,7 @@ dissect_hello_padding_clv(tvbuff_t *tvb _U_, proto_tree *tree _U_, int offset _U /* * Name: isis_dissect_isis_hello() - * + * * Description: * This procedure rips apart the various types of ISIS hellos. L1H and * L2H's are identical for the most part, while the PTP hello has @@ -623,8 +623,8 @@ dissect_hello_padding_clv(tvbuff_t *tvb _U_, proto_tree *tree _U_, int offset _U * * Output: * void, will modify proto_tree if not NULL. - */ -void + */ +void isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, int hello_type, int header_length, int id_length) { @@ -656,7 +656,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, source_id = tvb_get_ptr(tvb, offset, id_length); proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, tvb, offset, id_length, source_id, - "SystemID{ Sender of PDU } : %s", + "SystemID{ Sender of PDU } : %s", print_system_id( source_id, id_length ) ); } offset += id_length; @@ -680,7 +680,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, offset, 1, FALSE ); } offset += 1; - } else { + } else { if (tree) { octet = tvb_get_guint8(tvb, offset); @@ -694,7 +694,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, if (tree) { lan_id = tvb_get_ptr(tvb, offset, id_length+1); - proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, tvb, + proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, tvb, offset, id_length + 1, lan_id, "SystemID{ Designated IS } : %s", print_system_id( lan_id, id_length + 1 ) ); @@ -706,7 +706,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, len -= header_length; if (len < 0) { isis_dissect_unknown(tvb, tree, offset, - "Packet header length %d went beyond packet", + "Packet header length %d went beyond packet", header_length ); return; } @@ -735,7 +735,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, proto_tree *tree, int offset, * Description: * Register our protocol sub-sets with protocol manager. * - * Input: + * Input: * int : protocol index for the ISIS protocol * * Output: @@ -753,7 +753,7 @@ isis_register_hello(int proto_isis) { FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_isis_hello_holding_timer, - { "Holding timer ", "isis.hello.holding_timer", + { "Holding timer ", "isis.hello.holding_timer", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_hello_pdu_length, diff --git a/packet-isis-hello.h b/packet-isis-hello.h index bfd24e57bd..725a1adbc7 100644 --- a/packet-isis-hello.h +++ b/packet-isis-hello.h @@ -1,23 +1,23 @@ /* packet-isis-hello.h * Declares for hello handling inside isis. * - * $Id: packet-isis-hello.h,v 1.8 2002/04/07 22:36:55 guy Exp $ + * $Id: packet-isis-hello.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ #define _PACKET_ISIS_HELLO_H /* - * Declarations for L1/L2 hello base header. + * Declarations for L1/L2 hello base header. */ #define ISIS_HELLO_CTYPE_MASK 0x03 #define ISIS_HELLO_CT_RESERVED_MASK 0xfc diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c index be7f2f2af2..5336de2d9d 100644 --- a/packet-isis-lsp.c +++ b/packet-isis-lsp.c @@ -1,23 +1,23 @@ /* packet-isis-lsp.c * Routines for decoding isis lsp packets and their CLVs * - * $Id: packet-isis-lsp.c,v 1.33 2002/08/04 09:08:03 jmayer Exp $ + * $Id: packet-isis-lsp.c,v 1.34 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -85,46 +85,46 @@ static const value_string isis_lsp_istype_vals[] = { { ISIS_LSP_TYPE_LEVEL_2, "Level 1 and Level 2 IS"}, { 0, NULL } }; -/* +/* * Predclare dissectors for use in clv dissection. */ -static void dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, +static void dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_partition_dis_clv(tvbuff_t *tvb, +static void dissect_lsp_partition_dis_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, +static void dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, +static void dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_l2_is_neighbors_clv(tvbuff_t *tvb, +static void dissect_lsp_l2_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_l1_es_neighbors_clv(tvbuff_t *tvb, +static void dissect_lsp_l1_es_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_l1_is_neighbors_clv(tvbuff_t *tvb, +static void dissect_lsp_l1_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_area_address_clv(tvbuff_t *tvb, +static void dissect_lsp_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_l2_auth_clv(tvbuff_t *tvb, +static void dissect_lsp_l2_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_l1_auth_clv(tvbuff_t *tvb, +static void dissect_lsp_l1_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, +static void dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, +static void dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_te_router_id_clv(tvbuff_t *tvb, +static void dissect_lsp_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_hostname_clv(tvbuff_t *tvb, +static void dissect_lsp_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_mt_clv(tvbuff_t *tvb, +static void dissect_lsp_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_nlpid_clv(tvbuff_t *tvb, +static void dissect_lsp_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, +static void dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, +static void dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); -static void dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, +static void dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length); @@ -361,12 +361,12 @@ static const isis_clv_handle_t clv_l2_lsp_opts[] = { /* * Name: dissect_metric() - * + * * Description: * Display a metric prefix portion. ISIS has the concept of multple * metric per prefix (default, delay, expense, and error). This * routine assists other dissectors by adding a single one of - * these to the display tree.. + * these to the display tree.. * * The 8th(msbit) bit in the metric octet is the "supported" bit. The * "default" support is required, so we support a "force_supported" @@ -383,27 +383,27 @@ static const isis_clv_handle_t clv_l2_lsp_opts[] = { * guint8 : value of the metric. * char * : string giving type of the metric. * int : force supported. True is the supported bit MUST be zero. - * + * * Output: * void, but we will add to proto tree if !NULL. */ -static void +static void dissect_metric(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 value, - char *pstr, int force_supported ) + char *pstr, int force_supported ) { int s; if ( !tree ) return; s = ISIS_LSP_CLV_METRIC_SUPPORTED(value); - proto_tree_add_text(tree, tvb, offset, 1, + proto_tree_add_text(tree, tvb, offset, 1, "%s Metric: %s%s %s%d:%d", pstr, s ? "Not supported" : "Supported", (s && force_supported) ? "(but is required to be)":"", ISIS_LSP_CLV_METRIC_RESERVED(value) ? "(reserved bit != 0)":"", ISIS_LSP_CLV_METRIC_VALUE(value), value ); } - + /* * Name: dissect_lsp_ip_reachability_clv() * @@ -423,8 +423,8 @@ dissect_metric(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 value, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { proto_item *ti; @@ -443,14 +443,14 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, 0xf8ffffff, 0xfcffffff, 0xfeffffff, 0xffffffff }; - + while ( length > 0 ) { if (length<12) { isis_dissect_unknown(tvb, tree, offset, "short IP reachability (%d vs 12)", length ); return; } - /* + /* * Gotta build a sub-tree for all our pieces */ if ( tree ) { @@ -467,7 +467,7 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, break; } } - + /* 34 indicates no match -> must be a discontiguous netmask lets dump the mask, otherwise print the prefix_len */ @@ -477,13 +477,13 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, ip_to_str((guint8*)&src), ip_to_str((guint8*)&mask)); } else { - ti = proto_tree_add_text ( tree, tvb, offset, 12, + ti = proto_tree_add_text ( tree, tvb, offset, 12, "IPv4 prefix: %s/%d", ip_to_str((guint8*)&src), prefix_len ); }; - ntree = proto_item_add_subtree(ti, + ntree = proto_item_add_subtree(ti, ett_isis_lsp_clv_ip_reachability); proto_tree_add_text (ntree, tvb, offset, 1, @@ -528,8 +528,8 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Description: Decode an Extended IP Reachability CLV - code 135. * * The extended IP reachability TLV is an extended version - * of the IP reachability TLVs (codes 128 and 130). It encodes - * the metric as a 32-bit unsigned interger and allows to add + * of the IP reachability TLVs (codes 128 and 130). It encodes + * the metric as a 32-bit unsigned interger and allows to add * sub-CLV(s). * * Input: @@ -542,7 +542,7 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void +static void dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { @@ -562,10 +562,10 @@ dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, byte_length = (bit_length + 7) / 8; tvb_memcpy (tvb, prefix, offset+5, byte_length); pi = proto_tree_add_text (tree, tvb, offset, -1, - "IPv4 prefix: %s/%d", + "IPv4 prefix: %s/%d", ip_to_str (prefix), bit_length ); - subtree = proto_item_add_subtree (pi, + subtree = proto_item_add_subtree (pi, ett_isis_lsp_part_of_clv_ext_ip_reachability); proto_tree_add_text (subtree, tvb, offset, 4, @@ -599,8 +599,8 @@ dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { proto_item *ti; @@ -612,7 +612,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 len; if (!tree) return; - + memset (prefix.s6_addr, 0, 16); while (length > 0) { @@ -620,7 +620,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, byte_length = (bit_length + 7) / 8; tvb_memcpy (tvb, prefix.s6_addr, offset+6, byte_length); ti = proto_tree_add_text (tree, tvb, offset, -1, - "IP prefix: %s /%d", + "IP prefix: %s /%d", ip6_to_str (&prefix), bit_length ); ntree = proto_item_add_subtree (ti, ett_isis_lsp_part_of_clv_ipv6_reachability); @@ -668,8 +668,8 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_nlpid_clv(tvb, tree, offset, length); @@ -692,8 +692,8 @@ dissect_lsp_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_mt_clv(tvb, tree, offset, length, hf_isis_lsp_clv_mt ); @@ -716,8 +716,8 @@ dissect_lsp_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_hostname_clv(tvb, tree, offset, length); @@ -741,8 +741,8 @@ dissect_lsp_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_te_router_id_clv(tvb, tree, offset, length, @@ -767,8 +767,8 @@ dissect_lsp_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_ip_int_clv(tvb, tree, offset, length, @@ -792,8 +792,8 @@ dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_ipv6_int_clv(tvb, tree, offset, length, @@ -817,8 +817,8 @@ dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_l1_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_l1_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_authentication_clv(tvb, tree, offset, length, @@ -842,8 +842,8 @@ dissect_lsp_l1_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void -dissect_lsp_l2_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_l2_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_authentication_clv(tvb, tree, offset, length, @@ -867,8 +867,8 @@ dissect_lsp_l2_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { isis_dissect_area_address_clv(tvb, tree, offset, length); @@ -898,7 +898,7 @@ dissect_lsp_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void +static void dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, int offset, int length, int id_length, int show_virtual, int is_eis) { @@ -911,10 +911,10 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, if ( tree ) { if ( show_virtual ) { /* virtual path flag */ - proto_tree_add_text ( tree, tvb, offset, 1, + proto_tree_add_text ( tree, tvb, offset, 1, tvb_get_guint8(tvb, offset) ? "IsVirtual" : "IsNotVirtual" ); } else { - proto_tree_add_text ( tree, tvb, offset, 1, + proto_tree_add_text ( tree, tvb, offset, 1, "Reserved value 0x%02x, must == 0", tvb_get_guint8(tvb, offset) ); } @@ -931,20 +931,20 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, tlen ); return; } - /* + /* * Gotta build a sub-tree for all our pieces */ if ( tree ) { if ( is_eis ) { - ti = proto_tree_add_text(tree, tvb, offset, tlen, + ti = proto_tree_add_text(tree, tvb, offset, tlen, "ES Neighbor: %s", print_system_id( tvb_get_ptr(tvb, offset+4, id_length), id_length ) ); } else { - ti = proto_tree_add_text(tree, tvb, offset, tlen, + ti = proto_tree_add_text(tree, tvb, offset, tlen, "IS Neighbor: %s", print_system_id(tvb_get_ptr(tvb, offset+4, id_length), id_length ) ); } - ntree = proto_item_add_subtree(ti, + ntree = proto_item_add_subtree(ti, ett_isis_lsp_clv_is_neighbors); @@ -953,7 +953,7 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, "Default Metric: %d, %s", ISIS_LSP_CLV_METRIC_VALUE(tvb_get_guint8(tvb, offset)), ISIS_LSP_CLV_METRIC_IE(tvb_get_guint8(tvb, offset)) ? "External" : "Internal"); - + if (ISIS_LSP_CLV_METRIC_SUPPORTED(tvb_get_guint8(tvb, offset+1))) { proto_tree_add_text (ntree, tvb, offset+1, 1, "Delay Metric: Not supported"); } else { @@ -978,7 +978,7 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, ISIS_LSP_CLV_METRIC_VALUE(tvb_get_guint8(tvb, offset+3)), ISIS_LSP_CLV_METRIC_IE(tvb_get_guint8(tvb, offset+3)) ? "External" : "Internal"); } - + } offset += tlen; length -= tlen; @@ -1002,8 +1002,8 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, proto_tree *tree, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_l1_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_l1_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length) { dissect_lsp_eis_neighbors_clv_inner(tvb, tree, offset, @@ -1027,8 +1027,8 @@ dissect_lsp_l1_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_l1_es_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_l1_es_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length) { dissect_lsp_eis_neighbors_clv_inner(tvb, tree, offset, @@ -1053,8 +1053,8 @@ dissect_lsp_l1_es_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_l2_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_l2_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length) { dissect_lsp_eis_neighbors_clv_inner(tvb, tree, offset, @@ -1204,7 +1204,7 @@ dissect_subclv_unrsv_bw(tvbuff_t *tvb, proto_tree *tree, int offset) * Output: * void, but we will add to proto tree if !NULL. */ -static void +static void dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { @@ -1220,9 +1220,9 @@ dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, ti = proto_tree_add_text (tree, tvb, offset, -1, "IS neighbor: %s", print_system_id (tvb_get_ptr(tvb, offset, 7), 7) ); - ntree = proto_item_add_subtree (ti, + ntree = proto_item_add_subtree (ti, ett_isis_lsp_part_of_clv_ext_is_reachability ); - + proto_tree_add_text (ntree, tvb, offset+7, 3, "Metric: %d", tvb_get_ntoh24(tvb, offset+7) ); @@ -1258,7 +1258,7 @@ dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, break; case 18: proto_tree_add_text (ntree, tvb, offset+11+i, 5, - "Traffic engineering default metric: %d", + "Traffic engineering default metric: %d", tvb_get_ntoh24(tvb, offset+13+i) ); break; case 250: @@ -1292,7 +1292,7 @@ dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, static void -dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { proto_item *ti; @@ -1301,7 +1301,7 @@ dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 len; int mt_block; - char mt_desc[60]; + char mt_desc[60]; if (!tree) return; @@ -1309,7 +1309,7 @@ dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* fetch two bytes */ mt_block = tvb_get_ntohs(tvb, offset); - + /* mask out the lower 12 bits */ switch(mt_block&0x0fff) { case 0: @@ -1334,15 +1334,15 @@ dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, proto_tree_add_text ( tree, tvb, offset, 2 , "%s Topology (0x%x)", mt_desc, - mt_block&0xfff ); + mt_block&0xfff ); ti = proto_tree_add_text (tree, tvb, offset+2, -1, "IS neighbor: %s", print_system_id(tvb_get_ptr(tvb, offset+2, 7), 7) ); - - ntree = proto_item_add_subtree (ti, + + ntree = proto_item_add_subtree (ti, ett_isis_lsp_part_of_clv_mt_is ); - + proto_tree_add_text (ntree, tvb, offset+9, 3, "Metric: %d", tvb_get_ntoh24(tvb, offset+9) ); @@ -1352,12 +1352,12 @@ dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, } else { proto_tree_add_text (ntree, tvb, offset+12, 1, "sub-TLVs present"); } - + len = 13 + subclvs_len; proto_item_set_len (ti, len); offset += len; - length -= len; - + length -= len; + } } @@ -1379,8 +1379,8 @@ dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_partition_dis_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_partition_dis_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length) { if ( length < id_length ) { @@ -1389,11 +1389,11 @@ dissect_lsp_partition_dis_clv(tvbuff_t *tvb, proto_tree *tree, int offset, id_length ); return; } - /* + /* * Gotta build a sub-tree for all our pieces */ if ( tree ) { - proto_tree_add_text ( tree, tvb, offset, id_length, + proto_tree_add_text ( tree, tvb, offset, id_length, "Partition designated L2 IS: %s", print_system_id( tvb_get_ptr(tvb, offset, id_length), id_length ) ); } @@ -1424,8 +1424,8 @@ dissect_lsp_partition_dis_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -static void -dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, +static void +dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { char *sbuf; @@ -1458,19 +1458,19 @@ dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, } if ( mylen > length) { isis_dissect_unknown(tvb, tree, offset, - "Interal length of prefix neighbor too long (%d vs %d)", + "Interal length of prefix neighbor too long (%d vs %d)", mylen, length ); return; } - /* + /* * Lets turn the area address into "standard" 0000.0000.etc - * format string. + * format string. */ sbuf = print_area( tvb_get_ptr(tvb, offset+1, mylen), mylen ); /* and spit it out */ if ( tree ) { - proto_tree_add_text ( tree, tvb, offset, mylen + 1, + proto_tree_add_text ( tree, tvb, offset, mylen + 1, "Area address (%d): %s", mylen, sbuf ); } offset += mylen + 1; @@ -1481,7 +1481,7 @@ dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: isis_lsp_decode_lsp_id() * - * Description: + * Description: * Display a LSP id into the display tree. * * Input: @@ -1523,7 +1523,7 @@ isis_lsp_decode_lsp_id(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, int lsp_type, int header_length, int id_length) { @@ -1553,14 +1553,14 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, offset += 2; if (tree) { - isis_lsp_decode_lsp_id(tvb, lsp_tree, offset, + isis_lsp_decode_lsp_id(tvb, lsp_tree, offset, "LSP ID", id_length); } offset += id_length + 2; if (tree) { proto_tree_add_uint(lsp_tree, hf_isis_lsp_sequence_number, tvb, - offset, 4, + offset, 4, tvb_get_ntohl(tvb, offset)); } offset += 4; @@ -1574,14 +1574,14 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, if (tree) { /* - * We need to build our type block values. + * We need to build our type block values. */ sbuf[0] = 0; some = 0; value = ISIS_LSP_ATT(tvb_get_guint8(tvb, offset)); inx = 0; for ( q = (1<<ISIS_LSP_ATT_SHIFT); q > 0; q = q >> 1 ){ - if (q & value) { + if (q & value) { if (some++) { strcat(sbuf, ", "); } @@ -1589,10 +1589,10 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, } inx++; } - if (!some) { + if (!some) { strcat ( sbuf, "default-only" ); } - proto_tree_add_text(lsp_tree, tvb, offset + 18, 1, + proto_tree_add_text(lsp_tree, tvb, offset + 18, 1, "Type block(0x%02x): P:%d, Supported metric(s): %s, OL:%d, istype:%s", tvb_get_guint8(tvb, offset), ISIS_LSP_PARTITION(tvb_get_guint8(tvb, offset)) ? 1 : 0, @@ -1617,43 +1617,43 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, */ if (lsp_type == ISIS_TYPE_L1_LSP){ isis_dissect_clvs(tvb, lsp_tree, offset, - clv_l1_lsp_opts, len, id_length, + clv_l1_lsp_opts, len, id_length, ett_isis_lsp_clv_unknown ); } else { isis_dissect_clvs(tvb, lsp_tree, offset, - clv_l2_lsp_opts, len, id_length, + clv_l2_lsp_opts, len, id_length, ett_isis_lsp_clv_unknown ); } } /* * Name: isis_register_lsp() * - * Description: + * Description: * Register our protocol sub-sets with protocol manager. * - * Input: + * Input: * int : protocol index for the ISIS protocol * * Output: * void */ -void +void isis_register_lsp(int proto_isis) { static hf_register_info hf[] = { { &hf_isis_lsp_pdu_length, - { "PDU length", "isis.lsp.pdu_length", FT_UINT16, + { "PDU length", "isis.lsp.pdu_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_lsp_remaining_life, - { "Remaining lifetime", "isis.lsp.remaining_life", FT_UINT16, + { "Remaining lifetime", "isis.lsp.remaining_life", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_lsp_sequence_number, - { "Sequence number", "isis.lsp.sequence_number", + { "Sequence number", "isis.lsp.sequence_number", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_isis_lsp_checksum, - { "Checksum", "isis.lsp.checksum",FT_UINT16, + { "Checksum", "isis.lsp.checksum",FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_isis_lsp_clv_ipv4_int_addr, diff --git a/packet-isis-lsp.h b/packet-isis-lsp.h index c0f5ee5fd0..08d65348c8 100644 --- a/packet-isis-lsp.h +++ b/packet-isis-lsp.h @@ -1,23 +1,23 @@ /* packet-isis-lsp.h * Defines and such for LSP and their CLV decodes * - * $Id: packet-isis-lsp.h,v 1.12 2002/04/07 22:36:55 guy Exp $ + * $Id: packet-isis-lsp.h,v 1.13 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ #define _PACKET_ISIS_LSP_H /* - * Declarations for L1/L2 LSP base header. + * Declarations for L1/L2 LSP base header. */ #define ISIS_LSP_PARTITION_MASK 0x80 @@ -63,14 +63,14 @@ #define ISIS_CLV_L1_LSP_NLPID 129 #define ISIS_CLV_L1_LSP_IP_EXT_REACHABLE 130 #define ISIS_CLV_L1_LSP_IP_INTERFACE_ADDR 132 -#define ISIS_CLV_L1_LSP_TE_ROUTER_ID 134 +#define ISIS_CLV_L1_LSP_TE_ROUTER_ID 134 #define ISIS_CLV_L1_LSP_EXT_IP_REACHABLE 135 #define ISIS_CLV_L1_LSP_HOSTNAME 137 #define ISIS_CLV_L1_LSP_MT_IS_REACHABLE 222 #define ISIS_CLV_L1_LSP_MT 229 #define ISIS_CLV_L1_LSP_IPv6_INTERFACE_ADDR 232 #define ISIS_CLV_L1_LSP_IPv6_REACHABLE 236 -/* +/* * Note, the spec say 133, but everyone seems to use 10. Any clue on why * this is would be appreciated! */ @@ -90,14 +90,14 @@ #define ISIS_CLV_L2_LSP_IP_EXT_REACHABLE 130 #define ISIS_CLV_L2_LSP_IDRP_INFO 131 #define ISIS_CLV_L2_LSP_IP_INTERFACE_ADDR 132 -#define ISIS_CLV_L2_LSP_TE_ROUTER_ID 134 +#define ISIS_CLV_L2_LSP_TE_ROUTER_ID 134 #define ISIS_CLV_L2_LSP_EXT_IP_REACHABLE 135 #define ISIS_CLV_L2_LSP_HOSTNAME 137 #define ISIS_CLV_L2_LSP_MT_IS_REACHABLE 222 #define ISIS_CLV_L2_LSP_MT 229 #define ISIS_CLV_L2_LSP_IPv6_INTERFACE_ADDR 232 #define ISIS_CLV_L2_LSP_IPv6_REACHABLE 236 -/* +/* * Note, the spec say 133, but everyone seems to use 10. Any clue on why * this is would be appreciated! */ diff --git a/packet-isis-snp.c b/packet-isis-snp.c index 4c22b36214..4c77050bad 100644 --- a/packet-isis-snp.c +++ b/packet-isis-snp.c @@ -1,23 +1,23 @@ /* packet-isis-snp.c * Routines for decoding isis complete & partial SNP and their payload * - * $Id: packet-isis-snp.c,v 1.17 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-isis-snp.c,v 1.18 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -78,7 +78,7 @@ static const isis_clv_handle_t clv_l1_csnp_opts[] = { dissect_l1_snp_authentication_clv }, { - 0, "", NULL, NULL + 0, "", NULL, NULL } }; @@ -102,7 +102,7 @@ static const isis_clv_handle_t clv_l2_csnp_opts[] = { dissect_l2_snp_authentication_clv }, { - 0, "", NULL, NULL + 0, "", NULL, NULL } }; @@ -126,7 +126,7 @@ static const isis_clv_handle_t clv_l1_psnp_opts[] = { dissect_l1_snp_authentication_clv }, { - 0, "", NULL, NULL + 0, "", NULL, NULL } }; @@ -150,7 +150,7 @@ static const isis_clv_handle_t clv_l2_psnp_opts[] = { dissect_l2_snp_authentication_clv }, { - 0, "", NULL, NULL + 0, "", NULL, NULL } }; /* @@ -174,7 +174,7 @@ static const isis_clv_handle_t clv_l2_psnp_opts[] = { * Output: * void, but we will add to proto tree if !NULL. */ -static void +static void dissect_snp_lsp_entries(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length, int length) { @@ -185,7 +185,7 @@ dissect_snp_lsp_entries(tvbuff_t *tvb, proto_tree *tree, int offset, 2+id_length+2+4+2 ); return; } - + proto_tree_add_text(tree, tvb, offset, 2, "Remaining life : %d", tvb_get_ntohs(tvb, offset)); length -= 2; @@ -196,13 +196,13 @@ dissect_snp_lsp_entries(tvbuff_t *tvb, proto_tree *tree, int offset, length -= id_length + 2; offset += id_length + 2; - proto_tree_add_text(tree, tvb, offset, 4, + proto_tree_add_text(tree, tvb, offset, 4, "LSP Sequence Number : 0x%04x", tvb_get_ntohl(tvb, offset)); length -= 4; offset += 4; - proto_tree_add_text(tree, tvb, offset, 2, + proto_tree_add_text(tree, tvb, offset, 2, "LSP checksum : 0x%02x", tvb_get_ntohs(tvb, offset)); length -= 2; @@ -229,7 +229,7 @@ dissect_snp_lsp_entries(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_isis_csnp(tvbuff_t *tvb, proto_tree *tree, int offset, int type, int header_length, int id_length) { @@ -252,7 +252,7 @@ isis_dissect_isis_csnp(tvbuff_t *tvb, proto_tree *tree, int offset, offset += 2; if (tree) { - proto_tree_add_text(csnp_tree, tvb, offset, id_length + 1, + proto_tree_add_text(csnp_tree, tvb, offset, id_length + 1, "Source id : %s", print_system_id( tvb_get_ptr(tvb, offset, id_length+1), id_length+1 ) ); } @@ -304,7 +304,7 @@ isis_dissect_isis_csnp(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, but we will add to proto tree if !NULL. */ -void +void isis_dissect_isis_psnp(tvbuff_t *tvb, proto_tree *tree, int offset, int type, int header_length, int id_length) { @@ -369,7 +369,7 @@ isis_dissect_isis_psnp(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void +static void dissect_l1_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { @@ -394,7 +394,7 @@ dissect_l1_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, * Output: * void, will modify proto_tree if not null. */ -static void +static void dissect_l2_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int id_length _U_, int length) { @@ -405,20 +405,20 @@ dissect_l2_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: isis_register_csnp() * - * Description: + * Description: * Register our protocol sub-sets with protocol manager. * - * Input: + * Input: * int : protocol index for the ISIS protocol * * Output: * void */ -void +void isis_register_csnp(int proto_isis) { static hf_register_info hf[] = { { &hf_isis_csnp_pdu_length, - { "PDU length", "isis.csnp.pdu_length", FT_UINT16, + { "PDU length", "isis.csnp.pdu_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, }; static gint *ett[] = { @@ -436,20 +436,20 @@ isis_register_csnp(int proto_isis) { /* * Name: isis_register_psnp() * - * Description: + * Description: * Register our protocol sub-sets with protocol manager. * - * Input: + * Input: * int : protocol index for the ISIS protocol * * Output: * void */ -void +void isis_register_psnp(int proto_isis) { static hf_register_info hf[] = { { &hf_isis_psnp_pdu_length, - { "PDU length", "isis.psnp.pdu_length", FT_UINT16, + { "PDU length", "isis.psnp.pdu_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, }; static gint *ett[] = { diff --git a/packet-isis-snp.h b/packet-isis-snp.h index fec39b847d..bc3bf93501 100644 --- a/packet-isis-snp.h +++ b/packet-isis-snp.h @@ -1,23 +1,23 @@ /* packet-isis-snp.h * Defines and such for CSNP, PSNP, and their payloads * - * $Id: packet-isis-snp.h,v 1.5 2002/04/07 22:36:55 guy Exp $ + * $Id: packet-isis-snp.h,v 1.6 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ #define _PACKET_ISIS_SNP_H /* - * Note, the spec say 133 for authentication, but everyone seems to use 10. + * Note, the spec say 133 for authentication, but everyone seems to use 10. * Any clue on why this is would be appreciated! */ diff --git a/packet-isis.c b/packet-isis.c index fed99e7fe9..19c3aed766 100644 --- a/packet-isis.c +++ b/packet-isis.c @@ -2,23 +2,23 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * bits. * - * $Id: packet-isis.c,v 1.32 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-isis.c,v 1.33 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -97,7 +97,7 @@ isis_dissect_unknown(tvbuff_t *tvb, proto_tree *tree, int offset, /* * Name: dissect_isis() - * + * * Description: * Main entry area for isis de-mangling. This will build the * main isis tree data and call the sub-protocols as needed. @@ -139,7 +139,7 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) isis_version, ISIS_REQUIRED_VERSION); return; } - + isis_header_length = tvb_get_guint8(tvb, 1); if (tree) { ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, FALSE); @@ -256,44 +256,44 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * NOTE: this procedure to autolinked by the makefile process that * builds register.c * - * Input: + * Input: * void * * Output: * void */ -void +void proto_register_isis(void) { static hf_register_info hf[] = { { &hf_isis_irpd, - { "Intra Domain Routing Protocol Discriminator", "isis.irpd", + { "Intra Domain Routing Protocol Discriminator", "isis.irpd", FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }}, { &hf_isis_header_length, { "PDU Header Length ", "isis.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_version, - { "Version (==1) ", "isis.version", FT_UINT8, + { "Version (==1) ", "isis.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_system_id_length, - { "System ID Length ", "isis.sysid_len", + { "System ID Length ", "isis.sysid_len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - { &hf_isis_type, - { "PDU Type ", "isis.type", FT_UINT8, BASE_DEC, + { &hf_isis_type, + { "PDU Type ", "isis.type", FT_UINT8, BASE_DEC, VALS(isis_vals), 0xff, "", HFILL }}, - { &hf_isis_version2, - { "Version2 (==1) ", "isis.version2", FT_UINT8, BASE_DEC, NULL, + { &hf_isis_version2, + { "Version2 (==1) ", "isis.version2", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_reserved, - { "Reserved (==0) ", "isis.reserved", FT_UINT8, BASE_DEC, NULL, + { "Reserved (==0) ", "isis.reserved", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_isis_max_area_adr, - { "Max.AREAs: (0==3) ", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL, + { "Max.AREAs: (0==3) ", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, }; diff --git a/packet-isis.h b/packet-isis.h index 59018c8ddf..2ae8db4980 100644 --- a/packet-isis.h +++ b/packet-isis.h @@ -1,23 +1,23 @@ /* packet-isis.h * Defines and such for core isis protcol decode. * - * $Id: packet-isis.h,v 1.8 2002/04/07 22:36:55 guy Exp $ + * $Id: packet-isis.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-isl.c b/packet-isl.c index d53551c2c6..97a11bef7d 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,22 +1,22 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c,v 1.31 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-isl.c,v 1.32 2002/08/28 21:00:18 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -256,7 +256,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } } - + void proto_register_isl(void) { diff --git a/packet-isl.h b/packet-isl.h index 2d81c3835a..dd0d06062d 100644 --- a/packet-isl.h +++ b/packet-isl.h @@ -1,21 +1,21 @@ /* packet-isl.h * - * $Id: packet-isl.h,v 1.5 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-isl.h,v 1.6 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-isup.c b/packet-isup.c index c27c4cab4d..c5acdb7360 100644 --- a/packet-isup.c +++ b/packet-isup.c @@ -2,24 +2,24 @@ * Routines for ISUP dissection * Copyright 2001, Martina Obermeier <martina.obermeier@icn.siemens.de> * - * $Id: packet-isup.c,v 1.14 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-isup.c,v 1.15 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -54,9 +54,9 @@ #define MESSAGE_TYPE_CONNECT 7 #define MESSAGE_TYPE_FORW_TRANS 8 #define MESSAGE_TYPE_ANSWER 9 -#define MESSAGE_TYPE_RELEASE 12 +#define MESSAGE_TYPE_RELEASE 12 #define MESSAGE_TYPE_SUSPEND 13 -#define MESSAGE_TYPE_RESUME 14 +#define MESSAGE_TYPE_RESUME 14 #define MESSAGE_TYPE_REL_CMPL 16 #define MESSAGE_TYPE_CONT_CHECK_REQ 17 #define MESSAGE_TYPE_RESET_CIRCUIT 18 @@ -68,7 +68,7 @@ #define MESSAGE_TYPE_CIRC_GRP_BLCK 24 #define MESSAGE_TYPE_CIRC_GRP_UNBL 25 #define MESSAGE_TYPE_CIRC_GRP_BL_ACK 26 -#define MESSAGE_TYPE_CIRC_GRP_UNBL_ACK 27 +#define MESSAGE_TYPE_CIRC_GRP_UNBL_ACK 27 #define MESSAGE_TYPE_FACILITY_REQ 31 #define MESSAGE_TYPE_FACILITY_ACC 32 #define MESSAGE_TYPE_FACILITY_REJ 33 @@ -88,7 +88,7 @@ #define MESSAGE_TYPE_USER_PART_TEST 52 #define MESSAGE_TYPE_USER_PART_AVAIL 53 #define MESSAGE_TYPE_IDENT_REQ 54 -#define MESSAGE_TYPE_IDENT_RSP 55 +#define MESSAGE_TYPE_IDENT_RSP 55 #define MESSAGE_TYPE_SEGMENTATION 56 #define MESSAGE_TYPE_LOOP_PREVENTION 64 @@ -181,7 +181,7 @@ static const value_string isup_message_type_value[] = { #define PARAM_TYPE_USER_TO_USER_IND 42 #define PARAM_TYPE_ORIG_ISC_POINT_CODE 43 #define PARAM_TYPE_GENERIC_NOTIF_IND 44 -#define PARAM_TYPE_CALL_HIST_INFO 45 +#define PARAM_TYPE_CALL_HIST_INFO 45 #define PARAM_TYPE_ACC_DELIV_INFO 46 #define PARAM_TYPE_NETW_SPECIFIC_FACLTY 47 #define PARAM_TYPE_USER_SERVICE_INFO_PR 48 @@ -194,7 +194,7 @@ static const value_string isup_message_type_value[] = { #define PARAM_TYPE_ECHO_CTRL_INFO 55 #define PARAM_TYPE_MSG_COMPAT_INFO 56 #define PARAM_TYPE_PARAM_COMPAT_INFO 57 -#define PARAM_TYPE_MLPP_PRECEDENCE 58 +#define PARAM_TYPE_MLPP_PRECEDENCE 58 #define PARAM_TYPE_MCID_REQ_IND 59 #define PARAM_TYPE_MCID_RSP_IND 60 #define PARAM_TYPE_HOP_COUNTER 61 @@ -314,14 +314,14 @@ static const value_string isup_parameter_type_value[] = { #define COMMON_HEADER_LENGTH (CIC_LENGTH + MESSAGE_TYPE_LENGTH) #define MAXLENGTH 0xFF /* since length field is 8 Bit long - used in number dissectors; - max. number of address digits is 15 digits, but MAXLENGTH used + max. number of address digits is 15 digits, but MAXLENGTH used to avoid runtime errors */ #define PARAMETER_TYPE_LENGTH 1 #define PARAMETER_POINTER_LENGTH 1 #define PARAMETER_LENGTH_IND_LENGTH 1 -/* All following parameter length definitions are WITHOUT the parameter type byte and length indicator for optional parameters*/ +/* All following parameter length definitions are WITHOUT the parameter type byte and length indicator for optional parameters*/ #define PARAMETER_NAME_LENGTH 1 #define PARAMETER_LENGTH_IND_LENGTH 1 #define ACCESS_DELIVERY_INFO_LENGTH 1 @@ -389,7 +389,7 @@ static const value_string isup_parameter_type_value[] = { #define TWO_SATELLITE_CIRCUIT_IN_CONNECTION 2 static const value_string isup_satellite_ind_value[] = { { NO_SATELLITE_CIRCUIT_IN_CONNECTION, "No Satellite circuit in connection"}, - { ONE_SATELLITE_CIRCUIT_IN_CONNECTION, "One Satellite circuit in connection"}, + { ONE_SATELLITE_CIRCUIT_IN_CONNECTION, "One Satellite circuit in connection"}, { TWO_SATELLITE_CIRCUIT_IN_CONNECTION, "Two Satellite circuits in connection"}, { 0, NULL}}; @@ -398,7 +398,7 @@ static const value_string isup_satellite_ind_value[] = { #define CONTINUITY_CHECK_ON_A_PREVIOUS_CIRCUIT 2 static const value_string isup_continuity_check_ind_value[] = { { CONTINUITY_CHECK_NOT_REQUIRED, "Continuity check not required"}, - { CONTINUITY_CHECK_REQUIRED, "Continuity check required on this circuit"}, + { CONTINUITY_CHECK_REQUIRED, "Continuity check required on this circuit"}, { CONTINUITY_CHECK_ON_A_PREVIOUS_CIRCUIT , "Continuity check performed on a previous circuit"}, { 0, NULL}}; @@ -418,7 +418,7 @@ static const true_false_string isup_natnl_inatnl_call_ind_value = { #define PASS_ALONG_AND_SCCP_METHOD_AVAILABLE 3 static const value_string isup_end_to_end_method_ind_value[] = { { NO_END_TO_END_METHOD_AVAILABLE, "No End-to-end method available (only link-by-link method available)"}, - { PASS_ALONG_METHOD_AVAILABLE, "Pass-along method available (national use)"}, + { PASS_ALONG_METHOD_AVAILABLE, "Pass-along method available (national use)"}, { SCCP_METHOD_AVAILABLE, "SCCP method available"}, { PASS_ALONG_AND_SCCP_METHOD_AVAILABLE, "pass-along and SCCP method available (national use)"}, { 0, NULL}}; @@ -444,7 +444,7 @@ static const true_false_string isup_ISDN_user_part_ind_value = { #define ISUP_ISDN_USER_PART_IND_SPARE 3 static const value_string isup_preferences_ind_value[] = { { ISUP_PREFERED_ALL_THE_WAY, "ISDN user part prefered all the way"}, - { ISUP_NOT_REQUIRED_ALL_THE_WAY, "ISDN user part not required all the way"}, + { ISUP_NOT_REQUIRED_ALL_THE_WAY, "ISDN user part not required all the way"}, { ISUP_REQUIRED_ALL_WAY, "ISDN user part required all the way"}, { ISUP_ISDN_USER_PART_IND_SPARE, "spare"}, { 0, NULL}}; @@ -460,7 +460,7 @@ static const true_false_string isup_ISDN_originating_access_ind_value = { #define CONNECTIONLESS_AND_ORIENTED_METHOD_AVAILABLE 3 static const value_string isup_SCCP_method_ind_value[] = { { NO_INDICATION, "No indication"}, - { CONNECTIONLESS_METHOD_AVAILABLE, "Connectionless method available (national use)"}, + { CONNECTIONLESS_METHOD_AVAILABLE, "Connectionless method available (national use)"}, { CONNECITON_ORIENTED_METHOD_AVAILABLE, "Connection oriented method available"}, { CONNECTIONLESS_AND_ORIENTED_METHOD_AVAILABLE, "Connectionless and -oriented method available (national use)"}, { 0, NULL}}; @@ -478,11 +478,11 @@ static const value_string isup_SCCP_method_ind_value[] = { #define PAYPHONE 15 static const value_string isup_calling_partys_category_value[] = { { UNKNOWN_AT_THIS_TIME, "Category unknown at this time (national use)"}, - { OPERATOR_FRENCH, "operator, language French"}, - { OPERATOR_ENGLISH, "operator, language English"}, - { OPERATOR_GERMAN, "operator, language German"}, - { OPERATOR_RUSSIAN, "operator, language Russian"}, - { OPERATOR_SPANISH, "operator, language Spanish"}, + { OPERATOR_FRENCH, "operator, language French"}, + { OPERATOR_ENGLISH, "operator, language English"}, + { OPERATOR_GERMAN, "operator, language German"}, + { OPERATOR_RUSSIAN, "operator, language Russian"}, + { OPERATOR_SPANISH, "operator, language Spanish"}, { ORDINARY_CALLING_SUBSCRIBER, "ordinary calling subscriber"}, { CALLING_SUBSCRIBER_WITH_PRIORITY, "calling subscriber with priority"}, { DATA_CALL, "data call (voice band data)"}, @@ -599,7 +599,7 @@ static const true_false_string isup_odd_even_ind_value = { #define ISUP_CALLED_PARTY_NATURE_NETW_SPEC_NR 5 static const value_string isup_called_party_nature_of_address_ind_value[] = { { ISUP_CALLED_PARTY_NATURE_SUBSCRIBER_NR, "subscriber number (national use)"}, - { ISUP_CALLED_PARTY_NATURE_UNKNOWN, "unknown (national use)"}, + { ISUP_CALLED_PARTY_NATURE_UNKNOWN, "unknown (national use)"}, { ISUP_CALLED_PARTY_NATURE_NATIONAL_NR, "national (significant) number"}, { ISUP_CALLED_PARTY_NATURE_INTERNATNL_NR, "international number"}, { ISUP_CALLED_PARTY_NATURE_NETW_SPEC_NR, "network-specific number (national use)"}, @@ -607,7 +607,7 @@ static const value_string isup_called_party_nature_of_address_ind_value[] = { static const value_string isup_calling_party_nature_of_address_ind_value[] = { { ISUP_CALLED_PARTY_NATURE_SUBSCRIBER_NR, "subscriber number (national use)"}, - { ISUP_CALLED_PARTY_NATURE_UNKNOWN, "unknown (national use)"}, + { ISUP_CALLED_PARTY_NATURE_UNKNOWN, "unknown (national use)"}, { ISUP_CALLED_PARTY_NATURE_NATIONAL_NR, "national (significant) number"}, { ISUP_CALLED_PARTY_NATURE_INTERNATNL_NR, "international number"}, { 0, NULL}}; @@ -758,7 +758,7 @@ static const value_string isup_charge_ind_value[] = { #define CALLED_PARTYS_STATUS_NO_IND 0 #define CALLED_PARTYS_STATUS_SUBSCR_FREE 1 -#define CALLED_PARTYS_STATUS_CONNECT_WHEN_FREE 2 +#define CALLED_PARTYS_STATUS_CONNECT_WHEN_FREE 2 static const value_string isup_called_partys_status_ind_value[] = { { CALLED_PARTYS_STATUS_NO_IND, "No indication"}, { CALLED_PARTYS_STATUS_SUBSCR_FREE, "Subscriber free"}, @@ -768,7 +768,7 @@ static const value_string isup_called_partys_status_ind_value[] = { #define CALLED_PARTYS_CATEGORY_NO_IND 0 #define CALLED_PARTYS_CATEGORY_ORDINARY_SUBSCR 1 -#define CALLED_PARTYS_CATEGORY_PAYPHONE 2 +#define CALLED_PARTYS_CATEGORY_PAYPHONE 2 static const value_string isup_called_partys_category_ind_value[] = { { CALLED_PARTYS_CATEGORY_NO_IND, "No indication"}, { CALLED_PARTYS_CATEGORY_ORDINARY_SUBSCR, "Ordinary subscriber"}, @@ -787,7 +787,7 @@ static const true_false_string isup_suspend_resume_ind_value = { }; #define MAINTENANCE 0 #define HARDWARE_FAILURE 1 -#define RES_FOR_NATNL_USE 2 +#define RES_FOR_NATNL_USE 2 static const value_string isup_cgs_message_type_value[] = { { MAINTENANCE, "maintenance oriented"}, { HARDWARE_FAILURE, "hardware failure oriented"}, @@ -795,7 +795,7 @@ static const value_string isup_cgs_message_type_value[] = { { 3, "spare"}, { 0, NULL}}; -#define USER_TO_USER_SERVICE 2 +#define USER_TO_USER_SERVICE 2 static const value_string isup_facility_ind_value[] = { { USER_TO_USER_SERVICE, "user-to-user service"}, { 0, NULL}}; @@ -1044,7 +1044,7 @@ static const value_string isup_conference_acceptance_ind_value[] = { #define O_16BIT_MASK 0x0040 #define P_16BIT_MASK 0x0080 -#define BA_16BIT_MASK 0x0300 +#define BA_16BIT_MASK 0x0300 #define CB_16BIT_MASK 0x0600 #define DC_16BIT_MASK 0x0C00 #define FE_16BIT_MASK 0x3000 @@ -1111,7 +1111,7 @@ static int hf_isup_solicited_indicator = -1; static int hf_isup_continuity_indicator = -1; -static int hf_isup_backw_call_charge_ind = -1 ; +static int hf_isup_backw_call_charge_ind = -1 ; static int hf_isup_backw_call_called_partys_status_ind = -1; static int hf_isup_backw_call_called_partys_category_ind = -1; static int hf_isup_backw_call_end_to_end_method_ind = -1; @@ -1122,7 +1122,7 @@ static int hf_isup_backw_call_holding_ind = -1; static int hf_isup_backw_call_isdn_access_ind = -1; static int hf_isup_backw_call_echo_control_device_ind = -1; static int hf_isup_backw_call_sccp_method_ind = -1; - + static int hf_isup_suspend_resume_indicator = -1; static int hf_isup_range_indicator = -1; @@ -1179,8 +1179,8 @@ static gint ett_isup_pass_along_message = -1; static gint ett_isup_circuit_state_ind = -1; -/* ------------------------------------------------------------------ - Mapping number to ASCII-character +/* ------------------------------------------------------------------ + Mapping number to ASCII-character ------------------------------------------------------------------ */ char number_to_char(int number) { @@ -1192,15 +1192,15 @@ char number_to_char(int number) /* ------------------------------------------------------------------ */ -/* Dissectors for all used parameter types */ +/* Dissectors for all used parameter types */ /* ------------------------------------------------------------------ */ /* argument tvbuff_t contains only parameter-specific length */ /* length indicator is already dissected in dissect_isup_message() or */ /* dissect_isup_optional_parameter() */ /* ------------------------------------------------------------------ */ -/* ------------------------------------------------------------------ - Dissector Parameter nature of connection flags +/* ------------------------------------------------------------------ + Dissector Parameter nature of connection flags */ static void dissect_isup_nature_of_connection_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) @@ -1215,7 +1215,7 @@ dissect_isup_nature_of_connection_indicators_parameter(tvbuff_t *parameter_tvb, proto_item_set_text(parameter_item, "Nature of Connection Indicators: 0x%x", nature_of_connection_ind); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Dissector Parameter Forward Call Indicators */ static void @@ -1232,18 +1232,18 @@ dissect_isup_forward_call_indicators_parameter(tvbuff_t *parameter_tvb,proto_tre proto_tree_add_uint(parameter_tree, hf_isup_forw_call_preferences_indicator, parameter_tvb, 0, FORWARD_CALL_IND_LENGTH, forward_call_ind); proto_tree_add_boolean(parameter_tree, hf_isup_forw_call_isdn_access_indicator, parameter_tvb, 0, FORWARD_CALL_IND_LENGTH, forward_call_ind); proto_tree_add_uint(parameter_tree, hf_isup_forw_call_sccp_method_indicator, parameter_tvb, 0, FORWARD_CALL_IND_LENGTH, forward_call_ind); - - proto_item_set_text(parameter_item, "Forward Call Indicators: 0x%x", forward_call_ind ); + + proto_item_set_text(parameter_item, "Forward Call Indicators: 0x%x", forward_call_ind ); } -/* ------------------------------------------------------------------ - Dissector Parameter Calling Party's Category +/* ------------------------------------------------------------------ + Dissector Parameter Calling Party's Category */ static void dissect_isup_calling_partys_category_parameter(tvbuff_t *parameter_tvb,proto_tree *parameter_tree, proto_item *parameter_item) { guint8 calling_partys_category; - + calling_partys_category = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_calling_partys_category, parameter_tvb, 0, CALLING_PRTYS_CATEGORY_LENGTH, calling_partys_category); @@ -1252,13 +1252,13 @@ dissect_isup_calling_partys_category_parameter(tvbuff_t *parameter_tvb,proto_tre /* ------------------------------------------------------------------ - Dissector Parameter Transmission medium requirement + Dissector Parameter Transmission medium requirement */ static void dissect_isup_transmission_medium_requirement_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 transmission_medium_requirement; - + transmission_medium_requirement = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_transmission_medium_requirement, parameter_tvb, 0, TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH,transmission_medium_requirement); @@ -1274,7 +1274,7 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree * proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char called_number[MAXLENGTH]=""; @@ -1297,12 +1297,12 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree * address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_called_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1311,9 +1311,9 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree * } called_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Called Party Number: %s", called_number); + proto_item_set_text(address_digits_item, "Called Party Number: %s", called_number); proto_item_set_text(parameter_item, "Called Party Number: %s", called_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Subsequent number @@ -1325,7 +1325,7 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tree *pa proto_tree *address_digits_tree; guint8 indicators1; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char called_number[MAXLENGTH]=""; @@ -1344,12 +1344,12 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tree *pa address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_called_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1358,25 +1358,25 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tree *pa } called_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Subsequent Number: %s", called_number); + proto_item_set_text(address_digits_item, "Subsequent Number: %s", called_number); proto_item_set_text(parameter_item, "Subsequent Number: %s", called_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Information Request Indicators */ static void dissect_isup_information_request_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 information_request_indicators; - + information_request_indicators = tvb_get_ntohs(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_calling_party_address_request_indicator, parameter_tvb, 0, INFO_REQUEST_IND_LENGTH, information_request_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_info_req_holding_indicator, parameter_tvb, 0, INFO_REQUEST_IND_LENGTH, information_request_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_calling_partys_category_request_indicator, parameter_tvb, 0, INFO_REQUEST_IND_LENGTH, information_request_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_charge_information_request_indicator, parameter_tvb, 0, INFO_REQUEST_IND_LENGTH, information_request_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_malicious_call_identification_request_indicator, parameter_tvb, 0, INFO_REQUEST_IND_LENGTH, information_request_indicators); - + proto_item_set_text(parameter_item, "Information request indicators: 0x%x", information_request_indicators); } @@ -1385,34 +1385,34 @@ dissect_isup_information_request_indicators_parameter(tvbuff_t *parameter_tvb, p */ static void dissect_isup_information_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 information_indicators; - + information_indicators = tvb_get_ntohs(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_calling_party_address_response_indicator, parameter_tvb, 0, INFO_IND_LENGTH, information_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_hold_provided_indicator, parameter_tvb, 0, INFO_IND_LENGTH, information_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_calling_partys_category_response_indicator, parameter_tvb, 0, INFO_IND_LENGTH, information_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_charge_information_response_indicator, parameter_tvb, 0, INFO_IND_LENGTH, information_indicators); proto_tree_add_boolean(parameter_tree, hf_isup_solicited_indicator, parameter_tvb, 0, INFO_IND_LENGTH, information_indicators); - + proto_item_set_text(parameter_item, "Information indicators: 0x%x", information_indicators); } /* ------------------------------------------------------------------ - Dissector Parameter Continuity Indicators + Dissector Parameter Continuity Indicators */ static void dissect_isup_continuity_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 continuity_indicators; - + continuity_indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_continuity_indicator, parameter_tvb, 0, CONTINUITY_IND_LENGTH, continuity_indicators); proto_item_set_text(parameter_item, "Continuity indicators: 0x%x", continuity_indicators); } -/* ------------------------------------------------------------------ - Dissector Parameter Backward Call Indicators +/* ------------------------------------------------------------------ + Dissector Parameter Backward Call Indicators */ static void dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb,proto_tree *parameter_tree, proto_item *parameter_item) @@ -1420,7 +1420,7 @@ dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb,proto_tr guint16 backward_call_ind; backward_call_ind = tvb_get_ntohs(parameter_tvb, 0); - + proto_tree_add_uint(parameter_tree, hf_isup_backw_call_charge_ind, parameter_tvb, 0, BACKWARD_CALL_IND_LENGTH, backward_call_ind); proto_tree_add_uint(parameter_tree, hf_isup_backw_call_called_partys_status_ind, parameter_tvb, 0, BACKWARD_CALL_IND_LENGTH, backward_call_ind); @@ -1433,8 +1433,8 @@ dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb,proto_tr proto_tree_add_boolean(parameter_tree, hf_isup_backw_call_isdn_access_ind, parameter_tvb, 0, BACKWARD_CALL_IND_LENGTH, backward_call_ind); proto_tree_add_boolean(parameter_tree, hf_isup_backw_call_echo_control_device_ind, parameter_tvb, 0, BACKWARD_CALL_IND_LENGTH, backward_call_ind); proto_tree_add_uint(parameter_tree, hf_isup_backw_call_sccp_method_ind, parameter_tvb, 0, BACKWARD_CALL_IND_LENGTH, backward_call_ind); - - proto_item_set_text(parameter_item, "Backward Call Indicators: 0x%x", backward_call_ind); + + proto_item_set_text(parameter_item, "Backward Call Indicators: 0x%x", backward_call_ind); } /* ------------------------------------------------------------------ Dissector Parameter Cause Indicators - no detailed dissection since defined in Rec. Q.850 @@ -1442,29 +1442,29 @@ dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb,proto_tr static void dissect_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb,0, length, "Cause indicators (-> Q.850)"); + proto_tree_add_text(parameter_tree, parameter_tvb,0, length, "Cause indicators (-> Q.850)"); proto_item_set_text(parameter_item, "Cause indicators, see Q.850 (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ - Dissector Parameter Suspend/Resume Indicators + Dissector Parameter Suspend/Resume Indicators */ static void dissect_isup_suspend_resume_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_suspend_resume_indicator, parameter_tvb, 0, SUSPEND_RESUME_IND_LENGTH, indicators); proto_item_set_text(parameter_item, "Suspend/Resume indicator: 0x%x", indicators); } /* ------------------------------------------------------------------ - Dissector Parameter Range and Status Indicators + Dissector Parameter Range and Status Indicators */ static void dissect_isup_range_and_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 range, actual_status_length; range = tvb_get_guint8(parameter_tvb, 0); @@ -1483,28 +1483,28 @@ dissect_isup_range_and_status_parameter(tvbuff_t *parameter_tvb, proto_tree *par */ static void dissect_isup_circuit_group_supervision_message_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 cgs_message_type; - + cgs_message_type = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_cgs_message_type, parameter_tvb, 0, CIRC_GRP_SV_MSG_TYPE_LENGTH, cgs_message_type); proto_item_set_text(parameter_item, "Circuit group supervision message type: %s (%u)" ,val_to_str(cgs_message_type, isup_cgs_message_type_value,"unknown"), cgs_message_type); } /* ------------------------------------------------------------------ - Dissector Parameter Facility indicator parameter + Dissector Parameter Facility indicator parameter */ static void dissect_isup_facility_ind_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item) -{ +{ guint8 indicator; - + indicator = tvb_get_guint8(parameter_tvb, 0); proto_item_set_text(parameter_item, "Facility indicator: %s (%u)" ,val_to_str(indicator, isup_facility_ind_value,"spare"), indicator); } /* ------------------------------------------------------------------ - Dissector Parameter Circuit state indicator + Dissector Parameter Circuit state indicator */ static void dissect_isup_circuit_state_ind_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) @@ -1512,7 +1512,7 @@ dissect_isup_circuit_state_ind_parameter(tvbuff_t *parameter_tvb, proto_tree *pa proto_item *circuit_state_item; proto_tree *circuit_state_tree; guint8 circuit_state; - gint offset=0; + gint offset=0; gint i=0; gint length; @@ -1524,29 +1524,29 @@ dissect_isup_circuit_state_ind_parameter(tvbuff_t *parameter_tvb, proto_tree *pa "Circuit# CIC+%u state", i); circuit_state_tree = proto_item_add_subtree(circuit_state_item, ett_isup_circuit_state_ind); circuit_state = tvb_get_guint8(parameter_tvb, offset); - if ((circuit_state & DC_8BIT_MASK) == 0){ + if ((circuit_state & DC_8BIT_MASK) == 0){ proto_tree_add_uint(circuit_state_tree, hf_isup_mtc_blocking_state1, parameter_tvb, offset, 1, circuit_state); - proto_item_set_text(circuit_state_item, "Circuit# CIC+%u state: %s", i++, val_to_str(circuit_state&BA_8BIT_MASK, isup_mtc_blocking_state_DC00_value, "unknown")); - } - else { + proto_item_set_text(circuit_state_item, "Circuit# CIC+%u state: %s", i++, val_to_str(circuit_state&BA_8BIT_MASK, isup_mtc_blocking_state_DC00_value, "unknown")); + } + else { proto_tree_add_uint(circuit_state_tree, hf_isup_mtc_blocking_state2, parameter_tvb, offset, 1, circuit_state); proto_tree_add_uint(circuit_state_tree, hf_isup_call_proc_state, parameter_tvb, offset, 1, circuit_state); proto_tree_add_uint(circuit_state_tree, hf_isup_hw_blocking_state, parameter_tvb, offset, 1, circuit_state); - proto_item_set_text(circuit_state_item, "Circuit# CIC+%u state: %s", i++, val_to_str(circuit_state&BA_8BIT_MASK, isup_mtc_blocking_state_DCnot00_value, "unknown")); - } + proto_item_set_text(circuit_state_item, "Circuit# CIC+%u state: %s", i++, val_to_str(circuit_state&BA_8BIT_MASK, isup_mtc_blocking_state_DCnot00_value, "unknown")); + } offset++; length = tvb_length_remaining(parameter_tvb, offset); } proto_item_set_text(parameter_item, "Circuit state indicator (national use)"); } /* ------------------------------------------------------------------ - Dissector Parameter Event information + Dissector Parameter Event information */ static void dissect_isup_event_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint_format(parameter_tree, hf_isup_event_ind, parameter_tvb, 0, EVENT_INFO_LENGTH, indicators, "Event indicator: %s (%u)", val_to_str(indicators & GFEDCBA_8BIT_MASK, isup_event_ind_value, "spare"), indicators & GFEDCBA_8BIT_MASK); proto_tree_add_boolean(parameter_tree, hf_isup_event_presentation_restricted_ind, parameter_tvb, 0, EVENT_INFO_LENGTH, indicators); @@ -1559,22 +1559,22 @@ dissect_isup_event_information_parameter(tvbuff_t *parameter_tvb, proto_tree *pa static void dissect_isup_user_to_user_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User-to-user info (-> Q.931)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User-to-user info (-> Q.931)"); proto_item_set_text(parameter_item, "User-to-user information, see Q.931 (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ - Dissector Parameter Call Reference + Dissector Parameter Call Reference */ static void dissect_isup_call_reference_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint32 call_id; guint16 spc; - + call_id = tvb_get_ntoh24(parameter_tvb, 0); spc = tvb_get_letohs(parameter_tvb, CALL_ID_LENGTH) & 0x3FFF; /*since 1st 2 bits spare */ - proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_ID_LENGTH, "Call identity: %u", call_id); - proto_tree_add_text(parameter_tree, parameter_tvb, CALL_ID_LENGTH, SPC_LENGTH, "Signalling Point Code: %u", spc); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_ID_LENGTH, "Call identity: %u", call_id); + proto_tree_add_text(parameter_tree, parameter_tvb, CALL_ID_LENGTH, SPC_LENGTH, "Signalling Point Code: %u", spc); proto_item_set_text(parameter_item, "Call Reference: Call ID = %u, SPC = %u", call_id, spc); } @@ -1584,7 +1584,7 @@ dissect_isup_call_reference_parameter(tvbuff_t *parameter_tvb, proto_tree *param static void dissect_isup_access_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Access transport parameter field (-> Q.931)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Access transport parameter field (-> Q.931)"); proto_item_set_text(parameter_item, "Access transport, see Q.931 (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -1592,9 +1592,9 @@ dissect_isup_access_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *par */ static void dissect_isup_optional_forward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_cug_call_ind, parameter_tvb, 0, OPTIONAL_FORWARD_CALL_IND_LENGTH, indicators); proto_tree_add_boolean(parameter_tree, hf_isup_simple_segmentation_ind, parameter_tvb, 0, OPTIONAL_FORWARD_CALL_IND_LENGTH, indicators); @@ -1613,7 +1613,7 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -1638,12 +1638,12 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1652,9 +1652,9 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Calling Party Number: %s", calling_number); + proto_item_set_text(address_digits_item, "Calling Party Number: %s", calling_number); proto_item_set_text(parameter_item, "Calling Party Number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Original called number @@ -1666,7 +1666,7 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, proto_tre proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -1689,12 +1689,12 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, proto_tre address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1703,9 +1703,9 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, proto_tre } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Original Called Number: %s", calling_number); + proto_item_set_text(address_digits_item, "Original Called Number: %s", calling_number); proto_item_set_text(parameter_item, "Original Called Number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Redirecting number @@ -1717,7 +1717,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -1740,12 +1740,12 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1754,12 +1754,12 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Redirecting Number: %s", calling_number); + proto_item_set_text(address_digits_item, "Redirecting Number: %s", calling_number); proto_item_set_text(parameter_item, "Redirecting Number: %s", calling_number); - + } /* ------------------------------------------------------------------ - Dissector Parameter Redirection number + Dissector Parameter Redirection number */ static void dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) @@ -1768,7 +1768,7 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char called_number[MAXLENGTH]=""; @@ -1791,12 +1791,12 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_called_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1805,30 +1805,30 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p } called_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Redirection Number: %s", called_number); - proto_item_set_text(parameter_item, "Redirection Number: %s", called_number); + proto_item_set_text(address_digits_item, "Redirection Number: %s", called_number); + proto_item_set_text(parameter_item, "Redirection Number: %s", called_number); } /* ------------------------------------------------------------------ - Dissector Parameter Connection request + Dissector Parameter Connection request */ static void dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint32 local_ref; guint16 spc; - guint8 protocol_class, credit, offset=0; - + guint8 protocol_class, credit, offset=0; + local_ref = tvb_get_ntoh24(parameter_tvb, 0); - proto_tree_add_text(parameter_tree, parameter_tvb, offset, LOCAL_REF_LENGTH, "Local Reference: %u", local_ref); + proto_tree_add_text(parameter_tree, parameter_tvb, offset, LOCAL_REF_LENGTH, "Local Reference: %u", local_ref); offset = LOCAL_REF_LENGTH; spc = tvb_get_letohs(parameter_tvb,offset) & 0x3FFF; /*since 1st 2 bits spare */ - proto_tree_add_text(parameter_tree, parameter_tvb, offset, SPC_LENGTH, "Signalling Point Code: %u", spc); + proto_tree_add_text(parameter_tree, parameter_tvb, offset, SPC_LENGTH, "Signalling Point Code: %u", spc); offset += SPC_LENGTH; protocol_class = tvb_get_guint8(parameter_tvb, offset); - proto_tree_add_text(parameter_tree, parameter_tvb, offset, PROTOCOL_CLASS_LENGTH, "Protocol Class: %u", protocol_class); + proto_tree_add_text(parameter_tree, parameter_tvb, offset, PROTOCOL_CLASS_LENGTH, "Protocol Class: %u", protocol_class); offset += PROTOCOL_CLASS_LENGTH; credit = tvb_get_guint8(parameter_tvb, offset); - proto_tree_add_text(parameter_tree, parameter_tvb, offset, CREDIT_LENGTH, "Credit: %u", credit); + proto_tree_add_text(parameter_tree, parameter_tvb, offset, CREDIT_LENGTH, "Credit: %u", credit); offset += CREDIT_LENGTH; proto_item_set_text(parameter_item, "Connection request: Local Reference = %u, SPC = %u, Protocol Class = %u, Credit = %u", local_ref, spc, protocol_class, credit); @@ -1838,8 +1838,8 @@ dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_tree *p */ static void dissect_isup_redirection_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - if (tvb_length(parameter_tvb) == 2){ +{ + if (tvb_length(parameter_tvb) == 2){ guint16 indicators; indicators = tvb_get_ntohs(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_redirecting_ind, parameter_tvb,0 , REDIRECTION_INFO_LENGTH, indicators); @@ -1850,7 +1850,7 @@ dissect_isup_redirection_information_parameter(tvbuff_t *parameter_tvb, proto_tr } else { /* ISUP'88 (blue book) */ guint16 indicators; - indicators = tvb_get_guint8(parameter_tvb, 0) * 0x100; /*since 2nd octet isn't present*/ + indicators = tvb_get_guint8(parameter_tvb, 0) * 0x100; /*since 2nd octet isn't present*/ proto_tree_add_uint(parameter_tree, hf_isup_redirecting_ind, parameter_tvb, 0, 1, indicators); proto_tree_add_uint(parameter_tree, hf_isup_original_redirection_reason, parameter_tvb,0 , 1, indicators); proto_item_set_text(parameter_item, "Redirection Information (2nd octet not present since ISUP '88)"); @@ -1873,10 +1873,10 @@ dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb, NI_digits[2] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10); NI_digits[3] = number_to_char(digit_pair & DCBA_8BIT_MASK); NI_digits[4] = '\0'; - proto_tree_add_text(parameter_tree, parameter_tvb, 0, 2, "Network Identity: %s", NI_digits); - bin_code = tvb_get_ntohs(parameter_tvb, 2); - proto_tree_add_text(parameter_tree, parameter_tvb, 3, 2, "Binary Code: 0x%x", bin_code); - proto_item_set_text(parameter_item, "Closed user group interlock code: NI = %s, Binary code = 0x%x", NI_digits, bin_code); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, 2, "Network Identity: %s", NI_digits); + bin_code = tvb_get_ntohs(parameter_tvb, 2); + proto_tree_add_text(parameter_tree, parameter_tvb, 3, 2, "Binary Code: 0x%x", bin_code); + proto_item_set_text(parameter_item, "Closed user group interlock code: NI = %s, Binary code = 0x%x", NI_digits, bin_code); } /* ------------------------------------------------------------------ Dissector Parameter User service information- no detailed dissection since defined in Rec. Q.931 @@ -1884,19 +1884,19 @@ dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb, static void dissect_isup_user_service_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User service information (-> Q.931)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User service information (-> Q.931)"); proto_item_set_text(parameter_item, "User service information, see Q.931 (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ - Dissector Parameter Signalling point code + Dissector Parameter Signalling point code */ static void dissect_isup_signalling_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 spc; - + spc = tvb_get_letohs(parameter_tvb, 0) & 0x3FFF; /*since 1st 2 bits spare */ - proto_tree_add_text(parameter_tree, parameter_tvb, 0, SIGNALLING_POINT_CODE_LENGTH, "Signalling Point Code: %u", spc); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, SIGNALLING_POINT_CODE_LENGTH, "Signalling Point Code: %u", spc); proto_item_set_text(parameter_item, "Signalling point code: %u", spc); } @@ -1910,7 +1910,7 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -1934,12 +1934,12 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1948,9 +1948,9 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Connected Number: %s", calling_number); + proto_item_set_text(address_digits_item, "Connected Number: %s", calling_number); proto_item_set_text(parameter_item, "Connected Number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Transit network selection @@ -1962,7 +1962,7 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_ proto_tree *address_digits_tree; guint8 indicators; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char network_id[MAXLENGTH]=""; @@ -1983,12 +1983,12 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_ address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); network_id[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); network_id[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -1997,9 +1997,9 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_ } network_id[i++] = '\0'; - proto_item_set_text(address_digits_item, "Network identification: %s", network_id); + proto_item_set_text(address_digits_item, "Network identification: %s", network_id); proto_item_set_text(parameter_item, "Transit network selection: %s", network_id); - + } /* ------------------------------------------------------------------ Dissector Parameter Circuit assignment map @@ -2009,8 +2009,8 @@ dissect_isup_circuit_assignment_map_parameter(tvbuff_t *parameter_tvb, proto_tre { guint8 map_type; map_type = tvb_get_guint8(parameter_tvb, 0); - proto_tree_add_uint(parameter_tree, hf_isup_map_type, parameter_tvb, 0, 1, map_type); - proto_tree_add_text(parameter_tree, parameter_tvb, 1, 5, "Circuit assignment map (bit position indicates usage of corresponding circuit->3.69/Q.763)"); + proto_tree_add_uint(parameter_tree, hf_isup_map_type, parameter_tvb, 0, 1, map_type); + proto_tree_add_text(parameter_tree, parameter_tvb, 1, 5, "Circuit assignment map (bit position indicates usage of corresponding circuit->3.69/Q.763)"); proto_item_set_text(parameter_item, "Circuit assignment map"); } /* ------------------------------------------------------------------ @@ -2021,7 +2021,7 @@ dissect_isup_automatic_congestion_level_parameter(tvbuff_t *parameter_tvb, proto { guint8 congestion_level; congestion_level = tvb_get_guint8(parameter_tvb, 0); - proto_tree_add_uint(parameter_tree, hf_isup_automatic_congestion_level, parameter_tvb, 0, AUTO_CONGEST_LEVEL_LENGTH, congestion_level); + proto_tree_add_uint(parameter_tree, hf_isup_automatic_congestion_level, parameter_tvb, 0, AUTO_CONGEST_LEVEL_LENGTH, congestion_level); proto_item_set_text(parameter_item, "Automatic congestion level: %s (%u)", val_to_str(congestion_level, isup_auto_congestion_level_value, "spare"), congestion_level); } /* ------------------------------------------------------------------ @@ -2029,9 +2029,9 @@ dissect_isup_automatic_congestion_level_parameter(tvbuff_t *parameter_tvb, proto */ static void dissect_isup_optional_backward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_inband_information_ind, parameter_tvb, 0, OPTIONAL_BACKWARD_CALL_IND_LENGTH, indicators); proto_tree_add_boolean(parameter_tree, hf_isup_call_diversion_may_occur_ind, parameter_tvb, 0, OPTIONAL_BACKWARD_CALL_IND_LENGTH, indicators); @@ -2046,23 +2046,23 @@ dissect_isup_optional_backward_call_indicators_parameter(tvbuff_t *parameter_tvb */ static void dissect_isup_user_to_user_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, USER_TO_USER_IND_LENGTH, "User-to-user indicators: 0x%x (refer to 3.60/Q.763 for detailed decoding)", indicators ); proto_item_set_text(parameter_item,"User-to-user indicators: 0x%x", indicators ); } /* ------------------------------------------------------------------ - Dissector Parameter Original ISC point code + Dissector Parameter Original ISC point code */ static void dissect_isup_original_isc_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 spc; - + spc = tvb_get_letohs(parameter_tvb, 0) & 0x3FFF; /*since 1st 2 bits spare */ - proto_tree_add_text(parameter_tree, parameter_tvb, 0, ORIGINAL_ISC_POINT_CODE_LENGTH, "Origination ISC Point Code: %u", spc); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, ORIGINAL_ISC_POINT_CODE_LENGTH, "Origination ISC Point Code: %u", spc); proto_item_set_text(parameter_item, "Origination ISC point code: %u", spc); } @@ -2071,9 +2071,9 @@ dissect_isup_original_isc_point_code_parameter(tvbuff_t *parameter_tvb, proto_tr */ static void dissect_isup_generic_notification_indicator_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicators; - + indicators = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, GENERIC_NOTIFICATION_IND_LENGTH, "Generic notification indicator: 0x%x (refer to 3.25/Q.763 for detailed decoding)", indicators ); proto_item_set_text(parameter_item,"Generic notification indicator: 0x%x", indicators ); @@ -2083,9 +2083,9 @@ dissect_isup_generic_notification_indicator_parameter(tvbuff_t *parameter_tvb, p */ static void dissect_isup_call_history_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 info; - + info = tvb_get_ntohs(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_HISTORY_INFO_LENGTH, "Call history info: propagation delay = %u ms", info); proto_item_set_text(parameter_item,"Call history info: propagation delay = %u ms", info); @@ -2098,7 +2098,7 @@ dissect_isup_access_delivery_information_parameter(tvbuff_t *parameter_tvb, prot { guint8 indicator; indicator = tvb_get_guint8(parameter_tvb, 0); - proto_tree_add_boolean(parameter_tree, hf_isup_access_delivery_ind, parameter_tvb, 0, ACCESS_DELIVERY_INFO_LENGTH, indicator); + proto_tree_add_boolean(parameter_tree, hf_isup_access_delivery_ind, parameter_tvb, 0, ACCESS_DELIVERY_INFO_LENGTH, indicator); proto_item_set_text(parameter_item, "Access delivery information: 0x%x", indicator); } /* ------------------------------------------------------------------ @@ -2107,16 +2107,16 @@ dissect_isup_access_delivery_information_parameter(tvbuff_t *parameter_tvb, prot static void dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Network specific facility (refer to 3.36/Q.763 for detailed decoding)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Network specific facility (refer to 3.36/Q.763 for detailed decoding)"); proto_item_set_text(parameter_item, "Network specific facility (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ - Dissector Parameter User service information prime + Dissector Parameter User service information prime */ static void dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User service information prime (-> Q.931)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "User service information prime (-> Q.931)"); proto_item_set_text(parameter_item, "User service information prime, see Q.931 (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2124,9 +2124,9 @@ dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb, p */ static void dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint16 info; - + info = tvb_get_ntohs(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, PROPAGATION_DELAY_COUNT_LENGTH, "Propagation delay counter = %u ms", info); proto_item_set_text(parameter_item,"Propagation delay counter = %u ms", info); @@ -2137,7 +2137,7 @@ dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_ static void dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Remote operations"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Remote operations"); proto_item_set_text(parameter_item, "Remote operations (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2145,13 +2145,13 @@ dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_tree *pa */ static void dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint i; guint8 feature_code; guint length = tvb_length(parameter_tvb); for (i=0; i< length; i++){ feature_code = tvb_get_guint8(parameter_tvb, i); - proto_tree_add_text(parameter_tree, parameter_tvb, i, 1, "Feature Code %u: %u", i+1, feature_code); + proto_tree_add_text(parameter_tree, parameter_tvb, i, 1, "Feature Code %u: %u", i+1, feature_code); } proto_item_set_text(parameter_item, "Service Activation (%u byte%s length)", length , plurality(length, "", "s")); } @@ -2160,8 +2160,8 @@ dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *p */ static void dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - proto_tree_add_text(parameter_tree, parameter_tvb, 0, USER_TELESERVICE_INFO_LENGTH, "User teleservice information (-> Q.931)"); +{ + proto_tree_add_text(parameter_tree, parameter_tvb, 0, USER_TELESERVICE_INFO_LENGTH, "User teleservice information (-> Q.931)"); proto_item_set_text(parameter_item, "User teleservice information, see Q.931"); } /* ------------------------------------------------------------------ @@ -2169,9 +2169,9 @@ dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb, pro */ static void dissect_isup_transmission_medium_used_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 transmission_medium_requirement; - + transmission_medium_requirement = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_transmission_medium_requirement_prime, parameter_tvb, 0, TRANSMISSION_MEDIUM_RQMT_PRIME_LENGTH,transmission_medium_requirement); @@ -2184,7 +2184,7 @@ static void dissect_isup_call_diversion_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_DIV_INFO_LENGTH, "Call diversion information: 0x%x (refer to 3.6/Q.763 for detailed decoding)", indicator); proto_item_set_text(parameter_item, "Call diversion information: 0x%x", indicator); } @@ -2195,7 +2195,7 @@ static void dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, ECHO_CONTROL_INFO_LENGTH, "Echo control information: 0x%x (refer to 3.19/Q.763 for detailed decoding)", indicator); proto_item_set_text(parameter_item, "Echo control information: 0x%x", indicator); } @@ -2205,7 +2205,7 @@ dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_t static void dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Message compatibility information (refer to 3.33/Q.763 for detailed decoding)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Message compatibility information (refer to 3.33/Q.763 for detailed decoding)"); proto_item_set_text(parameter_item, "Message compatibility information (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2213,9 +2213,9 @@ dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb */ static void dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Parameter compatibility information (refer to 3.41/Q.763 for detailed decoding)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Parameter compatibility information (refer to 3.41/Q.763 for detailed decoding)"); proto_item_set_text(parameter_item, "Parameter compatibility information (%u byte%s length)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2229,7 +2229,7 @@ dissect_isup_mlpp_precedence_parameter(tvbuff_t *parameter_tvb, proto_tree *para guint32 bin_code; indicators = tvb_get_guint8(parameter_tvb, 0); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, 1, "LFB (Bits 6+7) and precedence level (Bits 1-4): 0x%x",indicators); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, 1, "LFB (Bits 6+7) and precedence level (Bits 1-4): 0x%x",indicators); digit_pair = tvb_get_guint8(parameter_tvb, 1); NI_digits[0] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10); NI_digits[1] = number_to_char(digit_pair & DCBA_8BIT_MASK); @@ -2237,10 +2237,10 @@ dissect_isup_mlpp_precedence_parameter(tvbuff_t *parameter_tvb, proto_tree *para NI_digits[2] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10); NI_digits[3] = number_to_char(digit_pair & DCBA_8BIT_MASK); NI_digits[4] = '\0'; - proto_tree_add_text(parameter_tree, parameter_tvb, 1, 2, "Network Identity: %s", NI_digits); - bin_code = tvb_get_ntoh24(parameter_tvb, 3); - proto_tree_add_text(parameter_tree, parameter_tvb, 3, 3, "MLPP service domain: 0x%x", bin_code); - proto_item_set_text(parameter_item, "MLPP precedence: NI = %s, MLPP service domain = 0x%x", NI_digits, bin_code); + proto_tree_add_text(parameter_tree, parameter_tvb, 1, 2, "Network Identity: %s", NI_digits); + bin_code = tvb_get_ntoh24(parameter_tvb, 3); + proto_tree_add_text(parameter_tree, parameter_tvb, 3, 3, "MLPP service domain: 0x%x", bin_code); + proto_item_set_text(parameter_item, "MLPP precedence: NI = %s, MLPP service domain = 0x%x", NI_digits, bin_code); } /* ------------------------------------------------------------------ Dissector Parameter MCID request indicators @@ -2249,7 +2249,7 @@ static void dissect_isup_mcid_request_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0,MCID_REQUEST_IND_LENGTH, "MCID request indicators: 0x%x (MCID requested by Bit1=1, Holding requested by Bit2=1 see 3.31/Q.763)", indicator); proto_item_set_text(parameter_item, "MCID request indicators: 0x%x", indicator); } @@ -2260,7 +2260,7 @@ static void dissect_isup_mcid_response_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0,MCID_RESPONSE_IND_LENGTH, "MCID response indicators: 0x%x (MCID included if Bit1=1, Holding provided if Bit2=1 see 3.32/Q.763)", indicator); proto_item_set_text(parameter_item, "MCID response indicators: 0x%x", indicator); } @@ -2271,7 +2271,7 @@ static void dissect_isup_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 counter; - counter = tvb_get_guint8(parameter_tvb, 0) & EDCBA_8BIT_MASK; /* since bits H,G and F are spare */ + counter = tvb_get_guint8(parameter_tvb, 0) & EDCBA_8BIT_MASK; /* since bits H,G and F are spare */ proto_tree_add_text(parameter_tree, parameter_tvb, 0, HOP_COUNTER_LENGTH, "Hop counter: %u", counter); proto_item_set_text(parameter_item, "Hop counter: %u", counter); } @@ -2280,9 +2280,9 @@ dissect_isup_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete */ static void dissect_isup_transmission_medium_requirement_prime_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 transmission_medium_requirement; - + transmission_medium_requirement = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_transmission_medium_requirement_prime, parameter_tvb, 0, TRANSMISSION_MEDIUM_RQMT_PRIME_LENGTH,transmission_medium_requirement); @@ -2299,7 +2299,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -2326,12 +2326,12 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -2340,18 +2340,18 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Location number: %s", calling_number); + proto_item_set_text(address_digits_item, "Location number: %s", calling_number); proto_item_set_text(parameter_item, "Location number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Redirection number restiriction */ static void dissect_isup_redirection_number_restriction_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicator; - + indicator = tvb_get_guint8(parameter_tvb, 0); switch (indicator & BA_8BIT_MASK) { case 0: @@ -2364,7 +2364,7 @@ dissect_isup_redirection_number_restriction_parameter(tvbuff_t *parameter_tvb, p proto_tree_add_text(parameter_tree, parameter_tvb, 0, REDIRECTION_NUMBER_RESTRICTION_LENGTH, "Presentation indicator: spare"); break; } - proto_item_set_text(parameter_item, "Redirection number restriction: 0x%x ", indicator); + proto_item_set_text(parameter_item, "Redirection number restriction: 0x%x ", indicator); } /* ------------------------------------------------------------------ Dissector Parameter Call transfer identity @@ -2382,18 +2382,18 @@ dissect_isup_call_transfer_reference_parameter(tvbuff_t *parameter_tvb, proto_tr */ static void dissect_isup_loop_prevention_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicator; - + indicator = tvb_get_guint8(parameter_tvb, 0); if ((indicator & A_8BIT_MASK)==0) { proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "Type: Request"); - proto_item_set_text(parameter_item, "Loop prevention indicators: Request (%u)", indicator); + proto_item_set_text(parameter_item, "Loop prevention indicators: Request (%u)", indicator); } else { proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "Type: Response"); proto_tree_add_uint(parameter_tree, hf_isup_loop_prevention_response_ind, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, indicator); - proto_item_set_text(parameter_item, "Loop prevention indicators: Response (%u)", indicator); + proto_item_set_text(parameter_item, "Loop prevention indicators: Response (%u)", indicator); } } /* ------------------------------------------------------------------ @@ -2406,7 +2406,7 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -2432,12 +2432,12 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -2446,30 +2446,30 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Call transfer number: %s", calling_number); + proto_item_set_text(address_digits_item, "Call transfer number: %s", calling_number); proto_item_set_text(parameter_item, "Call transfer number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Parameter CCSS */ static void dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ guint8 indicator; - + indicator = tvb_get_guint8(parameter_tvb, 0); if ((indicator & A_8BIT_MASK)==0) { proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "CCSS call indicator: no indication"); - proto_item_set_text(parameter_item, "CCSS call indicator: no indication (%u)", indicator); + proto_item_set_text(parameter_item, "CCSS call indicator: no indication (%u)", indicator); } else { proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "CCSS call indicator: CCSS call"); - proto_item_set_text(parameter_item, "CCSS call indicator: CCSS call (%u)", indicator); + proto_item_set_text(parameter_item, "CCSS call indicator: CCSS call (%u)", indicator); } } -/* ------------------------------------------------------------------ - Parameter Forward GVNS +/* ------------------------------------------------------------------ + Parameter Forward GVNS */ static void dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) @@ -2477,7 +2477,7 @@ dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Forward GVNS (refer to 3.66/Q.763 for detailed decoding)"); proto_item_set_text(parameter_item, "Forward GVNS (%u Byte%s)", length , plurality(length, "", "s")); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Parameter Redirect capability */ static void @@ -2493,7 +2493,7 @@ static void dissect_isup_backward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0, BACKWARD_GVNS_LENGTH, "Backward GVNS: 0x%x (refer to 3.62/Q.763 for detailed decoding)", indicator); proto_item_set_text(parameter_item, "Backward GVNS: 0x%x", indicator); } @@ -2504,7 +2504,7 @@ static void dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_temporary_alternative_routing_ind, parameter_tvb, 0,NETWORK_MANAGEMENT_CONTROLS_LENGTH, indicator); proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0,NETWORK_MANAGEMENT_CONTROLS_LENGTH, indicator); proto_item_set_text(parameter_item, "Network management controls: 0x%x", indicator); @@ -2515,7 +2515,7 @@ dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb, prot static void dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Correlation ID (-> Q.1281)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Correlation ID (-> Q.1281)"); proto_item_set_text(parameter_item, "Correlation ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2524,7 +2524,7 @@ dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *param static void dissect_isup_scf_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint length = tvb_length(parameter_tvb); - proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "SCF ID (-> Q.1281)"); + proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "SCF ID (-> Q.1281)"); proto_item_set_text(parameter_item, "SCF ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s")); } /* ------------------------------------------------------------------ @@ -2534,7 +2534,7 @@ static void dissect_isup_call_diversion_treatment_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_call_to_be_diverted_ind, parameter_tvb, 0,CALL_DIV_TREATMENT_IND_LENGTH, indicator); proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0, CALL_DIV_TREATMENT_IND_LENGTH, indicator); proto_item_set_text(parameter_item, "Call diversion treatment indicators: 0x%x", indicator); @@ -2549,7 +2549,7 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par proto_tree *address_digits_tree; guint8 indicators1, indicators2; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -2572,12 +2572,12 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -2586,9 +2586,9 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Called IN Number: %s", calling_number); + proto_item_set_text(address_digits_item, "Called IN Number: %s", calling_number); proto_item_set_text(parameter_item, "Called IN Number: %s", calling_number); - + } /* ------------------------------------------------------------------ Dissector Parameter Call offering treatment indicators @@ -2597,12 +2597,12 @@ static void dissect_isup_call_offering_treatment_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_call_to_be_offered_ind, parameter_tvb, 0,CALL_OFFERING_TREATMENT_IND_LENGTH, indicator); proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0, CALL_OFFERING_TREATMENT_IND_LENGTH, indicator); proto_item_set_text(parameter_item, "Call offering treatment indicators: 0x%x", indicator); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Parameter Charged party identification */ static void @@ -2618,7 +2618,7 @@ static void dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_uint(parameter_tree, hf_isup_conference_acceptance_ind, parameter_tvb, 0,CONFERENCE_TREATMENT_IND_LENGTH, indicator); proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0, CONFERENCE_TREATMENT_IND_LENGTH, indicator); proto_item_set_text(parameter_item, "Conference treatment indicators: 0x%x", indicator); @@ -2632,29 +2632,29 @@ dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_tree * proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Display information (-> Q.931)"); proto_item_set_text(parameter_item, "Display information (%u Byte%s)", length , plurality(length, "", "s")); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Parameter UID action indicators */ static void dissect_isup_uid_action_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0,UID_ACTION_IND_LENGTH, "UID action indicators: 0x%x (refer to 3.78/Q.763 for detailed decoding)", indicator); proto_item_set_text(parameter_item, "UID action indicators: 0x%x", indicator); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Parameter UID capability indicators */ static void dissect_isup_uid_capability_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_text(parameter_tree, parameter_tvb, 0,UID_CAPABILITY_IND_LENGTH, "UID capability indicators: 0x%x (refer to 3.79/Q.763 for detailed decoding)", indicator); proto_item_set_text(parameter_item, "UID capability indicators: 0x%x", indicator); } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Parameter Redirect counter */ static void @@ -2670,7 +2670,7 @@ static void dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - indicator = tvb_get_guint8(parameter_tvb, 0); + indicator = tvb_get_guint8(parameter_tvb, 0); if ((indicator & A_8BIT_MASK) == 0) { proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: no indication"); proto_item_set_text(parameter_item, "Collect call reqeust: no indication (0x%x)", indicator); @@ -2690,7 +2690,7 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, proto_tree *param proto_tree *address_digits_tree; guint8 indicators1, indicators2, nr_qualifier_ind; guint8 address_digit_pair=0; - gint offset=0; + gint offset=0; gint i=0; gint length; char calling_number[MAXLENGTH]=""; @@ -2719,12 +2719,12 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, proto_tree *param address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char(address_digit_pair & ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK); - if ((length - 1) > 0 ){ + if ((length - 1) > 0 ){ proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); - } + } offset++; - length = tvb_length_remaining(parameter_tvb, offset); + length = tvb_length_remaining(parameter_tvb, offset); } if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)){ /* Even Indicator set -> last even digit is valid & has be displayed */ @@ -2733,11 +2733,11 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, proto_tree *param } calling_number[i++] = '\0'; - proto_item_set_text(address_digits_item, "Generic number: %s", calling_number); + proto_item_set_text(address_digits_item, "Generic number: %s", calling_number); proto_item_set_text(parameter_item, "Generic number: %s", calling_number); - + } -/* ------------------------------------------------------------------ +/* ------------------------------------------------------------------ Dissector Parameter Generic digits */ static void @@ -2767,25 +2767,25 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, proto_tree *i /* Dissect all optional parameters while end of message isn't reached */ parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */ - + while ((tvb_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)){ parameter_type = tvb_get_guint8(optional_parameters_tvb, offset); - + if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS){ parameter_length = tvb_get_guint8(optional_parameters_tvb, offset + PARAMETER_TYPE_LENGTH); - + parameter_item = proto_tree_add_text(isup_tree, optional_parameters_tvb, offset, parameter_length + PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH, "Parameter: type %u", parameter_type); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH, parameter_type, "Optional Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH, parameter_type, "Optional Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); offset += PARAMETER_TYPE_LENGTH; - + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, optional_parameters_tvb, offset, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); offset += PARAMETER_LENGTH_IND_LENGTH; - + actual_length = tvb_length_remaining(optional_parameters_tvb, offset); if (actual_length > 0){ parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset, MIN(parameter_length, actual_length), parameter_length); @@ -2863,7 +2863,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, proto_tree *i dissect_isup_user_service_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_SIGNALLING_POINT_CODE: - dissect_isup_signalling_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_signalling_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_USER_TO_USER_INFO: dissect_isup_user_to_user_information_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -2899,144 +2899,144 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, proto_tree *i dissect_isup_user_to_user_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_ORIG_ISC_POINT_CODE: - dissect_isup_original_isc_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_original_isc_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_GENERIC_NOTIF_IND: - dissect_isup_generic_notification_indicator_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_generic_notification_indicator_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_HIST_INFO : - dissect_isup_call_history_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_history_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_ACC_DELIV_INFO: - dissect_isup_access_delivery_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_access_delivery_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_NETW_SPECIFIC_FACLTY: - dissect_isup_network_specific_facility_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_network_specific_facility_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_USER_SERVICE_INFO_PR: - dissect_isup_user_service_information_prime_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_user_service_information_prime_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_PROPAG_DELAY_COUNTER: - dissect_isup_propagation_delay_counter_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_propagation_delay_counter_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_REMOTE_OPERATIONS: - dissect_isup_remote_operations_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_remote_operations_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_SERVICE_ACTIVATION: - dissect_isup_service_activation_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_service_activation_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_USER_TELESERV_INFO: - dissect_isup_user_teleservice_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_user_teleservice_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_TRANSM_MEDIUM_USED: - dissect_isup_transmission_medium_used_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_transmission_medium_used_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_DIV_INFO: - dissect_isup_call_diversion_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_diversion_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_ECHO_CTRL_INFO: - dissect_isup_echo_control_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_echo_control_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_MSG_COMPAT_INFO: - dissect_isup_message_compatibility_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_message_compatibility_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_PARAM_COMPAT_INFO: - dissect_isup_parameter_compatibility_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_parameter_compatibility_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_MLPP_PRECEDENCE: - dissect_isup_mlpp_precedence_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_mlpp_precedence_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_MCID_REQ_IND: - dissect_isup_mcid_request_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_mcid_request_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_MCID_RSP_IND: - dissect_isup_mcid_response_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_mcid_response_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_HOP_COUNTER: - dissect_isup_hop_counter_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_hop_counter_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_TRANSM_MEDIUM_RQUR_PR: - dissect_isup_transmission_medium_requirement_prime_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_transmission_medium_requirement_prime_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_LOCATION_NR: - dissect_isup_location_number_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_location_number_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_REDIR_NR_RSTRCT: - dissect_isup_redirection_number_restriction_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_redirection_number_restriction_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_TRANS_REF: - dissect_isup_call_transfer_reference_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_transfer_reference_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_LOOP_PREV_IND: - dissect_isup_loop_prevention_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_loop_prevention_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_TRANS_NR: - dissect_isup_call_transfer_number_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_transfer_number_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CCSS: - dissect_isup_ccss_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_ccss_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_FORW_GVNS: - dissect_isup_forward_gvns_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_forward_gvns_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_BACKW_GVNS: - dissect_isup_backward_gvns_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_backward_gvns_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_REDIRECT_CAPAB: - dissect_isup_redirect_capability_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_redirect_capability_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_NETW_MGMT_CTRL: - dissect_isup_network_management_controls_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_network_management_controls_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CORRELATION_ID: - dissect_isup_correlation_id_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_correlation_id_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_SCF_ID: - dissect_isup_scf_id_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_scf_id_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_DIV_TREAT_IND: - dissect_isup_call_diversion_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_diversion_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALLED_IN_NR: - dissect_isup_called_in_number_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_called_in_number_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CALL_OFF_TREAT_IND: - dissect_isup_call_offering_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_call_offering_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CHARGED_PARTY_IDENT: - dissect_isup_charged_party_identification_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_charged_party_identification_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_CONF_TREAT_IND: - dissect_isup_conference_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_conference_treatment_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_DISPLAY_INFO: - dissect_isup_display_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_display_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_UID_ACTION_IND: - dissect_isup_uid_action_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_uid_action_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_UID_CAPAB_IND: - dissect_isup_uid_capability_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_uid_capability_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_REDIRECT_COUNTER: - dissect_isup_redirect_counter_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_redirect_counter_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_COLLECT_CALL_REQ: - dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_GENERIC_NR: - dissect_isup_generic_number_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_isup_generic_number_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PARAM_TYPE_GENERIC_DIGITS: - dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree, parameter_item); - break; + dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree, parameter_item); + break; default: dissect_isup_unknown_parameter(parameter_tvb, parameter_item); break; } offset += MIN(parameter_length, actual_length); } - + } else { /* End of optional parameters is reached */ @@ -3047,11 +3047,11 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, proto_tree *i /* ------------------------------------------------------------------ */ /* Dissectors for all used message types */ -/* Called by dissect_isup_message(), */ +/* Called by dissect_isup_message(), */ /* call parameter dissectors in order of mandatory parameters */ /* (since not labeled) */ /* ------------------------------------------------------------------ - Dissector Message Type Initial address message + Dissector Message Type Initial address message */ gint dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tree) @@ -3060,14 +3060,14 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for first mandatory fixed parameter: Nature of Connection Indicators */ parameter_type = PARAM_TYPE_NATURE_OF_CONN_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, NATURE_OF_CONNECTION_IND_LENGTH, "Nature of Connection Indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(NATURE_OF_CONNECTION_IND_LENGTH, actual_length), NATURE_OF_CONNECTION_IND_LENGTH); dissect_isup_nature_of_connection_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3079,8 +3079,8 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre FORWARD_CALL_IND_LENGTH, "Forward Call Indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FORWARD_CALL_IND_LENGTH, actual_length), FORWARD_CALL_IND_LENGTH ); dissect_isup_forward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += FORWARD_CALL_IND_LENGTH; @@ -3091,8 +3091,8 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre CALLING_PRTYS_CATEGORY_LENGTH, "Calling Party's category"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CALLING_PRTYS_CATEGORY_LENGTH, actual_length),CALLING_PRTYS_CATEGORY_LENGTH ); dissect_isup_calling_partys_category_parameter(parameter_tvb, parameter_tree, parameter_item); offset += CALLING_PRTYS_CATEGORY_LENGTH; @@ -3103,8 +3103,8 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH, "Transmission medium requirement"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH, actual_length), TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH); dissect_isup_transmission_medium_requirement_parameter(parameter_tvb, parameter_tree, parameter_item); offset += TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH; @@ -3120,10 +3120,10 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Called Party Number"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_called_party_number_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3131,7 +3131,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre return offset; } /* ------------------------------------------------------------------ - Dissector Message Type subsequent address message + Dissector Message Type subsequent address message */ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; @@ -3139,7 +3139,7 @@ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree * tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter Subsequent number */ parameter_type = PARAM_TYPE_SUBSQT_NR; @@ -3151,10 +3151,10 @@ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree * parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Subsequent Number"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_subsequent_number_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3163,7 +3163,7 @@ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree * } /* ------------------------------------------------------------------ - Dissector Message Type Information request message + Dissector Message Type Information request message */ gint dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup_tree) @@ -3172,14 +3172,14 @@ dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: Information request indicators*/ + + /* Do stuff for first mandatory fixed parameter: Information request indicators*/ parameter_type = PARAM_TYPE_INFO_REQ_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, INFO_REQUEST_IND_LENGTH, "Information request indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_REQUEST_IND_LENGTH, actual_length), INFO_REQUEST_IND_LENGTH); dissect_isup_information_request_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3187,7 +3187,7 @@ dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup return offset; } /* ------------------------------------------------------------------ - Dissector Message Type Information + Dissector Message Type Information */ gint dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) @@ -3196,14 +3196,14 @@ dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: Information indicators*/ + + /* Do stuff for first mandatory fixed parameter: Information indicators*/ parameter_type = PARAM_TYPE_INFO_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, INFO_IND_LENGTH, "Information indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_IND_LENGTH, actual_length), INFO_IND_LENGTH); dissect_isup_information_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3211,7 +3211,7 @@ dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) return offset; } /* ------------------------------------------------------------------ - Dissector Message Type Continuity + Dissector Message Type Continuity */ gint dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree) @@ -3220,14 +3220,14 @@ dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree) tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: Continuity indicators*/ + + /* Do stuff for first mandatory fixed parameter: Continuity indicators*/ parameter_type = PARAM_TYPE_CONTINUITY_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, CONTINUITY_IND_LENGTH, "Continuity indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CONTINUITY_IND_LENGTH, actual_length), CONTINUITY_IND_LENGTH); dissect_isup_continuity_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3244,14 +3244,14 @@ dissect_isup_address_complete_message(tvbuff_t *message_tvb, proto_tree *isup_tr tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: backward call indicators*/ + + /* Do stuff for first mandatory fixed parameter: backward call indicators*/ parameter_type = PARAM_TYPE_BACKW_CALL_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, BACKWARD_CALL_IND_LENGTH, "Backward Call Indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH); dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3268,14 +3268,14 @@ dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree) tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: backward call indicators*/ + + /* Do stuff for first mandatory fixed parameter: backward call indicators*/ parameter_type = PARAM_TYPE_BACKW_CALL_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, BACKWARD_CALL_IND_LENGTH, "Backward Call Indicators"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH); dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3283,16 +3283,16 @@ dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree) return offset; } /* ------------------------------------------------------------------ - Dissector Message Type release message + Dissector Message Type release message */ -gint +gint dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter Cause indicators */ parameter_type = PARAM_TYPE_CAUSE_INDICATORS; @@ -3304,10 +3304,10 @@ dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree) parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Cause indicators, see Q.850"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3324,14 +3324,14 @@ dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: backward call indicators*/ + + /* Do stuff for first mandatory fixed parameter: backward call indicators*/ parameter_type = PARAM_TYPE_SUSP_RESUME_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, SUSPEND_RESUME_IND_LENGTH, "Suspend/Resume indicator"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(SUSPEND_RESUME_IND_LENGTH, actual_length), SUSPEND_RESUME_IND_LENGTH); dissect_isup_suspend_resume_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3341,14 +3341,14 @@ dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree /* ------------------------------------------------------------------ Dissector Message Type Circuit group reset/query message */ -gint +gint dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter range and status*/ parameter_type = PARAM_TYPE_RANGE_AND_STATUS; @@ -3360,10 +3360,10 @@ dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Range and status"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3371,9 +3371,9 @@ dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree return offset; } /* ------------------------------------------------------------------ - Dissector Message Type Circuit group blocking/blocking ack/unblocking/unblocking ack messages + Dissector Message Type Circuit group blocking/blocking ack/unblocking/unblocking ack messages */ -gint +gint dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -3381,18 +3381,18 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree * gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - /* Do stuff for first mandatory fixed parameter: circuit group supervision message type*/ + /* Do stuff for first mandatory fixed parameter: circuit group supervision message type*/ parameter_type = PARAM_TYPE_CIRC_GRP_SV_MSG_TYPE; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, CIRC_GRP_SV_MSG_TYPE_LENGTH, "Circuit group supervision message type"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CIRC_GRP_SV_MSG_TYPE_LENGTH, actual_length), CIRC_GRP_SV_MSG_TYPE_LENGTH); dissect_isup_circuit_group_supervision_message_type_parameter(parameter_tvb, parameter_tree, parameter_item); offset += CIRC_GRP_SV_MSG_TYPE_LENGTH; - + /* Do stuff for mandatory variable parameter range and status*/ parameter_type = PARAM_TYPE_RANGE_AND_STATUS; @@ -3404,10 +3404,10 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree * parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Facility indicator"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3425,14 +3425,14 @@ dissect_isup_facility_request_accepted_message(tvbuff_t *message_tvb, proto_tree tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: facility indicators*/ + + /* Do stuff for first mandatory fixed parameter: facility indicators*/ parameter_type = PARAM_TYPE_FACILITY_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, FACILITY_IND_LENGTH, "Facility indicator"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH); dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item); @@ -3449,14 +3449,14 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - - /* Do stuff for first mandatory fixed parameter: facility indicators*/ + + /* Do stuff for first mandatory fixed parameter: facility indicators*/ parameter_type = PARAM_TYPE_FACILITY_IND; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, FACILITY_IND_LENGTH, "Facility indicator"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH); dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item); @@ -3473,10 +3473,10 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Cause indicators, see Q.850"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3484,16 +3484,16 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre return offset; } /* ------------------------------------------------------------------ - Dissector Message Type Circuit group reset acknowledgement message + Dissector Message Type Circuit group reset acknowledgement message */ -gint +gint dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter range and status*/ parameter_type = PARAM_TYPE_RANGE_AND_STATUS; @@ -3505,10 +3505,10 @@ dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Range and status"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3518,14 +3518,14 @@ dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, /* ------------------------------------------------------------------ Dissector Message Type Circuit group query response message */ -gint +gint dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for 1. mandatory variable parameter range and status*/ parameter_type = PARAM_TYPE_RANGE_AND_STATUS; @@ -3537,10 +3537,10 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Range and status"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3556,10 +3556,10 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Circuit state indicator (national use)"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_circuit_state_ind_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3576,14 +3576,14 @@ dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree) tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, actual_length; - - /* Do stuff for first mandatory fixed parameter: Event information*/ + + /* Do stuff for first mandatory fixed parameter: Event information*/ parameter_type = PARAM_TYPE_EVENT_INFO; parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, EVENT_INFO_LENGTH, "Event information"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(EVENT_INFO_LENGTH, actual_length), EVENT_INFO_LENGTH); dissect_isup_event_information_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -3593,14 +3593,14 @@ dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type User-to-User information */ -gint +gint dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter User-to-user information*/ parameter_type = PARAM_TYPE_USER_TO_USER_INFO; @@ -3612,10 +3612,10 @@ dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree parameter_length + PARAMETER_LENGTH_IND_LENGTH, "User-to-user information, see Q.931"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_user_to_user_information_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3623,16 +3623,16 @@ dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree return offset; } /* ------------------------------------------------------------------ - Dissector Message Type Confusion + Dissector Message Type Confusion */ -gint +gint dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; gint offset = 0; gint parameter_type, parameter_pointer, parameter_length, actual_length; - + /* Do stuff for mandatory variable parameter Cause indicators */ parameter_type = PARAM_TYPE_CAUSE_INDICATORS; @@ -3644,10 +3644,10 @@ dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree) parameter_length + PARAMETER_LENGTH_IND_LENGTH, "Cause indicators, see Q.850"); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); - proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); - proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); + proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown")); + proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter length: %u", parameter_length); - actual_length = tvb_ensure_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length ); dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += PARAMETER_POINTER_LENGTH; @@ -3657,25 +3657,25 @@ dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ */ static void dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree) -{ +{ tvbuff_t *parameter_tvb; tvbuff_t *optional_parameter_tvb; proto_item* pass_along_item; proto_tree* pass_along_tree; gint offset, bufferlength; guint8 message_type, opt_parameter_pointer; - gint opt_part_possible = FALSE; /* default setting - for message types allowing optional + gint opt_part_possible = FALSE; /* default setting - for message types allowing optional params explicitely set to TRUE in case statement */ offset = 0; - + /* Extract message type field */ - message_type = tvb_get_guint8(message_tvb,0); + message_type = tvb_get_guint8(message_tvb,0); if (check_col(pinfo->cinfo, COL_INFO)){ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_type, isup_message_type_value, "reserved")); col_append_str(pinfo->cinfo, COL_INFO, " "); } - + proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type, "Message type: %s (%u)", val_to_str(message_type, isup_message_type_value, "reserved"), message_type); offset += MESSAGE_TYPE_LENGTH; @@ -3821,7 +3821,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup break; case MESSAGE_TYPE_CHARGE_INFO: /* do nothing since format is a national matter */ - proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); + proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter"); break; case MESSAGE_TYPE_NETW_RESRC_MGMT: /* no dissector necessary since no mandatory parameters included */ @@ -3859,24 +3859,24 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Unknown Message type (possibly reserved/used in former ISUP version)"); break; } - + /* extract pointer to start of optional part (if any) */ if (opt_part_possible == TRUE){ opt_parameter_pointer = tvb_get_guint8(message_tvb, offset); if (opt_parameter_pointer > 0){ - proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, PARAMETER_POINTER_LENGTH, opt_parameter_pointer, "Pointer to start of optional part: %u", opt_parameter_pointer); + proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, PARAMETER_POINTER_LENGTH, opt_parameter_pointer, "Pointer to start of optional part: %u", opt_parameter_pointer); offset += opt_parameter_pointer; optional_parameter_tvb = tvb_new_subset(message_tvb, offset, -1, -1 ); dissect_isup_optional_parameter(optional_parameter_tvb, isup_tree); } else - proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, PARAMETER_POINTER_LENGTH, opt_parameter_pointer, "No optional parameter present (Pointer: %u)", opt_parameter_pointer); + proto_tree_add_uint_format(isup_tree, hf_isup_pointer_to_start_of_optional_part, message_tvb, offset, PARAMETER_POINTER_LENGTH, opt_parameter_pointer, "No optional parameter present (Pointer: %u)", opt_parameter_pointer); } else if (message_type !=MESSAGE_TYPE_CHARGE_INFO) - proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type"); - + proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type"); + } - + /* ------------------------------------------------------------------ */ static void dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -3886,13 +3886,13 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; proto_tree *isup_tree; tvbuff_t *message_tvb; - guint16 cic; + guint16 cic; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISUP"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, "ISUP message: "); /* In the interest of speed, if "tree" is NULL, don't do any work not @@ -3901,11 +3901,11 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_isup, tvb, 0, -1, FALSE); isup_tree = proto_item_add_subtree(ti, ett_isup); - /* dissect CIC in main dissector since pass-along message type carrying complete IUSP message w/o CIC needs + /* dissect CIC in main dissector since pass-along message type carrying complete IUSP message w/o CIC needs recursive message dissector call */ - cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x0FFF; /*since upper 4 bits spare */ - - proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic); + cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x0FFF; /*since upper 4 bits spare */ + + proto_tree_add_uint_format(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic, "CIC: %u", cic); message_tvb = tvb_new_subset(tvb, CIC_LENGTH, -1, -1); dissect_isup_message(message_tvb, pinfo, isup_tree); @@ -3917,29 +3917,29 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_isup(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_isup_cic, { "CIC", "isup.cic", - FT_UINT16, BASE_HEX, NULL, 0xFF0F, - "", HFILL }}, + FT_UINT16, BASE_HEX, NULL, 0xFF0F, + "", HFILL }}, { &hf_isup_message_type, { "Message Type", "isup.message_type", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - + { &hf_isup_parameter_type, { "Parameter Type", "isup.parameter_type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - + { &hf_isup_parameter_length, { "Parameter Length", "isup.parameter_length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - + { &hf_isup_mandatory_variable_parameter_pointer, { "Pointer to Parameter", "isup.mandatory_variable_parameter_pointer", FT_UINT8, BASE_DEC, NULL, 0x0, @@ -4004,12 +4004,12 @@ proto_register_isup(void) { "SCCP method indicator", "isup.forw_call_sccp_method_indicator", FT_UINT16, BASE_HEX, VALS(isup_SCCP_method_ind_value), KJ_16BIT_MASK, "", HFILL }}, - + { &hf_isup_calling_partys_category, { "Calling Party's category", "isup.calling_partys_category", FT_UINT8, BASE_HEX, VALS(isup_calling_partys_category_value), 0x0, "", HFILL }}, - + { &hf_isup_transmission_medium_requirement, { "Transmission medium requirement", "isup.transmission_medium_requirement", FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0, @@ -4024,12 +4024,12 @@ proto_register_isup(void) { "Nature of address indicator", "isup.called_party_nature_of_address_indicator", FT_UINT8, BASE_DEC, VALS(isup_called_party_nature_of_address_ind_value), ISUP_NATURE_OF_ADDRESS_IND_MASK, "", HFILL }}, - + { &hf_isup_calling_party_nature_of_address_indicator, { "Nature of address indicator", "isup.calling_party_nature_of_address_indicator", FT_UINT8, BASE_DEC, VALS(isup_calling_party_nature_of_address_ind_value), ISUP_NATURE_OF_ADDRESS_IND_MASK, "", HFILL }}, - + { &hf_isup_inn_indicator, { "INN indicator", "isup.inn_indicator", FT_BOOLEAN, 8, TFS(&isup_INN_ind_value), ISUP_INN_MASK, @@ -4074,32 +4074,32 @@ proto_register_isup(void) { "Address signal digit", "isup.called_party_even_address_signal_digit", FT_UINT8, BASE_DEC, VALS(isup_called_party_address_digit_value), ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK, "", HFILL }}, - + { &hf_isup_calling_party_even_address_signal_digit, { "Address signal digit", "isup.calling_party_even_address_signal_digit", FT_UINT8, BASE_DEC, VALS(isup_calling_party_address_digit_value), ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK, "", HFILL }}, - + { &hf_isup_calling_party_address_request_indicator, { "Calling party address request indicator", "isup.calling_party_address_request_indicator", FT_BOOLEAN, 16, TFS(&isup_calling_party_address_request_ind_value), A_16BIT_MASK, "", HFILL }}, - + { &hf_isup_info_req_holding_indicator, { "Holding indicator", "isup.info_req_holding_indicator", FT_BOOLEAN, 16, TFS(&isup_holding_ind_value), B_16BIT_MASK, "", HFILL }}, - + { &hf_isup_calling_partys_category_request_indicator, { "Calling party's category request indicator", "isup.calling_partys_category_request_indicator", FT_BOOLEAN, 16, TFS(&isup_calling_partys_category_request_ind_value), D_16BIT_MASK, "", HFILL }}, - + { &hf_isup_charge_information_request_indicator, { "Charge information request indicator", "isup.charge_information_request_indicator", FT_BOOLEAN, 16, TFS(&isup_charge_information_request_ind_value), E_16BIT_MASK, "", HFILL }}, - + { &hf_isup_malicious_call_identification_request_indicator, { "Malicious call identification request indicator (ISUP'88)", "isup.malicious_call_ident_request_indicator", FT_BOOLEAN, 16, TFS(&isup_malicious_call_identification_request_ind_value), H_16BIT_MASK, @@ -4109,22 +4109,22 @@ proto_register_isup(void) { "Calling party address response indicator", "isup.calling_party_address_response_indicator", FT_UINT16, BASE_HEX, VALS(isup_calling_party_address_response_ind_value), BA_16BIT_MASK, "", HFILL }}, - + { &hf_isup_hold_provided_indicator, { "Hold provided indicator", "isup.hold_provided_indicator", FT_BOOLEAN, 16, TFS(&isup_hold_provided_ind_value), C_16BIT_MASK, "", HFILL }}, - + { &hf_isup_calling_partys_category_response_indicator, { "Calling party's category response indicator", "isup.calling_partys_category_response_indicator", FT_BOOLEAN, 16, TFS(&isup_calling_partys_category_response_ind_value), F_16BIT_MASK, "", HFILL }}, - + { &hf_isup_charge_information_response_indicator, { "Charge information response indicator", "isup.charge_information_response_indicator", FT_BOOLEAN, 16, TFS(&isup_charge_information_response_ind_value), G_16BIT_MASK, "", HFILL }}, - + { &hf_isup_solicited_indicator, { "Solicited indicator", "isup.solicided_indicator", FT_BOOLEAN, 16, TFS(&isup_solicited_information_ind_value), H_16BIT_MASK, @@ -4174,7 +4174,7 @@ proto_register_isup(void) { "Holding indicator", "isup.backw_call_holding_indicator", FT_BOOLEAN, 16, TFS(&isup_holding_ind_value), L_16BIT_MASK, "", HFILL }}, - + { &hf_isup_backw_call_isdn_access_ind, { "ISDN access indicator", "isup.backw_call_isdn_access_indicator", FT_BOOLEAN, 16, TFS(&isup_ISDN_terminating_access_ind_value), M_16BIT_MASK, @@ -4189,12 +4189,12 @@ proto_register_isup(void) { "SCCP method indicator", "isup.backw_call_sccp_method_indicator", FT_UINT16, BASE_HEX, VALS(isup_SCCP_method_ind_value), PO_16BIT_MASK, "", HFILL }}, - + { &hf_isup_suspend_resume_indicator, { "Suspend/Resume indicator", "isup.suspend_resume_indicator", FT_BOOLEAN, 8, TFS(&isup_suspend_resume_ind_value), A_8BIT_MASK, "", HFILL }}, - + { &hf_isup_transmission_medium_requirement, { "Transmission medium requirement", "isup.transmission_medium_requirement", FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0, @@ -4219,17 +4219,17 @@ proto_register_isup(void) { "Maintenance blocking state", "isup.mtc_blocking_state", FT_UINT8, BASE_DEC, VALS(isup_mtc_blocking_state_DCnot00_value), BA_8BIT_MASK, "", HFILL }}, - + { &hf_isup_call_proc_state, { "Call processing state", "isup.call_processing_state", FT_UINT8, BASE_DEC, VALS(isup_call_processing_state_value), DC_8BIT_MASK, "", HFILL }}, - + { &hf_isup_hw_blocking_state, { "HW blocking state", "isup.hw_blocking_state", FT_UINT8, BASE_DEC, VALS(isup_HW_blocking_state_value), FE_8BIT_MASK, "", HFILL }}, - + { &hf_isup_event_ind, { "Event indicator", "isup.event_ind", FT_UINT8, 8, NULL, 0x0, @@ -4283,13 +4283,13 @@ proto_register_isup(void) { &hf_isup_network_identification_plan, { "Network identification plan", "isup.network_identification_plan", FT_UINT8, BASE_DEC, VALS(isup_network_identification_plan_value), DCBA_8BIT_MASK, - "", HFILL }}, + "", HFILL }}, { &hf_isup_map_type, { "Map Type", "isup.map_type", FT_UINT8, BASE_DEC, VALS(isup_map_type_value), FEDCBA_8BIT_MASK, "", HFILL }}, - + { &hf_isup_automatic_congestion_level, { "Automatic congestion level", "isup.automatic_congestion_level", FT_UINT8, BASE_DEC, VALS(isup_auto_congestion_level_value), 0x0, @@ -4309,27 +4309,27 @@ proto_register_isup(void) { "MLPP user indicator", "isup.mlpp_user", FT_BOOLEAN, 8, TFS(&isup_MLPP_user_ind_value), D_8BIT_MASK, "", HFILL }}, - + { &hf_isup_access_delivery_ind, { "Access delivery indicator", "isup.access_delivery_ind", FT_BOOLEAN, 8, TFS(&isup_access_delivery_ind_value), A_8BIT_MASK, "", HFILL }}, - + { &hf_isup_transmission_medium_requirement_prime, { "Transmission medium requirement prime", "isup.transmission_medium_requirement_prime", FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_prime_value), 0x0, "", HFILL }}, - + { &hf_isup_loop_prevention_response_ind, { "Response indicator", "isup.loop_prevention_response_ind", FT_UINT8, BASE_DEC, VALS(isup_loop_prevention_response_ind_value), CB_8BIT_MASK, "", HFILL }}, - + { &hf_isup_temporary_alternative_routing_ind, { "Temporary alternative routing indicator", "isup.temporary_alternative_routing_ind", FT_BOOLEAN, 8, TFS(&isup_temporary_alternative_routing_ind_value), A_8BIT_MASK, "", HFILL }}, - + { &hf_isup_extension_ind, { "Extension indicator", "isup.extension_ind", FT_BOOLEAN, 8, TFS(&isup_extension_ind_value), H_8BIT_MASK, @@ -4339,12 +4339,12 @@ proto_register_isup(void) { "Call to be diverted indicator", "isup.call_to_be_diverted_ind", FT_UINT8, BASE_DEC, VALS(isup_call_to_be_diverted_ind_value), BA_8BIT_MASK, "", HFILL }}, - + { &hf_isup_call_to_be_offered_ind, { "Call to be offered indicator", "isup.call_to_be_offered_ind", FT_UINT8, BASE_DEC, VALS(isup_call_to_be_offered_ind_value), BA_8BIT_MASK, - "", HFILL }}, - + "", HFILL }}, + { &hf_isup_conference_acceptance_ind, { "Conference acceptance indicator", "isup.conference_acceptance_ind", FT_UINT8, BASE_DEC, VALS(isup_conference_acceptance_ind_value), BA_8BIT_MASK, diff --git a/packet-iua.c b/packet-iua.c index 198a354d71..a6159bb3e1 100644 --- a/packet-iua.c +++ b/packet-iua.c @@ -8,24 +8,24 @@ * * Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-iua.c,v 1.15 2002/07/12 19:37:33 guy Exp $ + * $Id: packet-iua.c,v 1.16 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -86,7 +86,7 @@ static gboolean support_IG = FALSE; static dissector_handle_t q931_handle; -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -124,11 +124,11 @@ static void dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 interface_id_length; - + interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, NETWORK_BYTE_ORDER); - proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, + proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, (char *)tvb_get_ptr(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); } @@ -138,7 +138,7 @@ static void dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 info_string_length; - + info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, NETWORK_BYTE_ORDER); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, @@ -161,7 +161,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre static void dissect_dlci_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) -{ +{ proto_tree_add_item(parameter_tree, hf_dlci_zero_bit, parameter_tvb, DLCI_SAPI_OFFSET, DLCI_SAPI_LENGTH, NETWORK_BYTE_ORDER); proto_tree_add_item(parameter_tree, hf_dlci_spare_bit, parameter_tvb, DLCI_SAPI_OFFSET, DLCI_SAPI_LENGTH, NETWORK_BYTE_ORDER); proto_tree_add_item(parameter_tree, hf_dlci_sapi, parameter_tvb, DLCI_SAPI_OFFSET, DLCI_SAPI_LENGTH, NETWORK_BYTE_ORDER); @@ -174,7 +174,7 @@ static void dissect_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 diag_info_length; - + diag_info_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_diag_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diag_info_length, NETWORK_BYTE_ORDER); proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s")); @@ -192,7 +192,7 @@ dissect_integer_range_interface_identifier_parameter(tvbuff_t *parameter_tvb, pr { guint16 number_of_ranges, range_number; gint offset; - + number_of_ranges = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INTERVAL_LENGTH; offset = PARAMETER_VALUE_OFFSET; for(range_number = 1; range_number <= number_of_ranges; range_number++) { @@ -210,7 +210,7 @@ static void dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 heartbeat_data_length; - + heartbeat_data_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, NETWORK_BYTE_ORDER); proto_item_append_text(parameter_item, " (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s")); @@ -245,7 +245,7 @@ static const value_string traffic_mode_type_values[] = { static void dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ +{ proto_tree_add_item(parameter_tree, hf_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, NETWORK_BYTE_ORDER); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), traffic_mode_type_values, "unknown")); @@ -307,7 +307,7 @@ static void dissect_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { proto_tree_add_item(parameter_tree, support_IG?hf_error_code_ig:hf_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, NETWORK_BYTE_ORDER); - proto_item_append_text(parameter_item, " (%s)", + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET), support_IG?error_code_ig_values:error_code_values, "unknown")); } @@ -328,18 +328,18 @@ static const value_string status_type_values[] = { #define ALTERNATE_ASP_ACTIVE_STATUS_IDENT 0x02 static const value_string status_type_id_values[] = { - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_DOWN_STATUS_IDENT, "Application server down" }, - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_INACTIVE_STATUS_IDENT, "Application server inactive" }, - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_ACTIVE_STATUS_IDENT, "Application server active" }, - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_PENDING_STATUS_IDENT, "Application server pending" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_DOWN_STATUS_IDENT, "Application server down" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_INACTIVE_STATUS_IDENT, "Application server inactive" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_ACTIVE_STATUS_IDENT, "Application server active" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_PENDING_STATUS_IDENT, "Application server pending" }, { OTHER_STATUS_TYPE * 256 * 256 + INSUFFICIENT_ASP_RESOURCES_STATUS_IDENT, "Insufficient ASP resources active in AS" }, { OTHER_STATUS_TYPE * 256 * 256 + ALTERNATE_ASP_ACTIVE_STATUS_IDENT, "Alternate ASP active" }, { 0, NULL } }; static const value_string status_type_id_ig_values[] = { - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_INACTIVE_STATUS_IDENT, "Application server inactive" }, - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_ACTIVE_STATUS_IDENT, "Application server active" }, - { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_PENDING_STATUS_IDENT, "Application server pending" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_INACTIVE_STATUS_IDENT, "Application server inactive" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_ACTIVE_STATUS_IDENT, "Application server active" }, + { ASP_STATE_CHANGE_STATUS_TYPE * 256 * 256 + AS_PENDING_STATUS_IDENT, "Application server pending" }, { OTHER_STATUS_TYPE * 256 * 256 + INSUFFICIENT_ASP_RESOURCES_STATUS_IDENT, "Insufficient ASP resources active in AS" }, { OTHER_STATUS_TYPE * 256 * 256 + ALTERNATE_ASP_ACTIVE_STATUS_IDENT, "Alternate ASP active" }, { 0, NULL } }; @@ -400,7 +400,7 @@ static void dissect_release_reason_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { proto_tree_add_item(parameter_tree, hf_release_reason, parameter_tvb, RELEASE_REASON_OFFSET, RELEASE_REASON_LENGTH, NETWORK_BYTE_ORDER); - proto_item_append_text(parameter_item, " (%s)", + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, RELEASE_REASON_OFFSET), release_reason_values, "unknown")); } @@ -419,7 +419,7 @@ static void dissect_tei_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { proto_tree_add_item(parameter_tree, hf_tei_status, parameter_tvb, TEI_STATUS_OFFSET, TEI_STATUS_LENGTH, NETWORK_BYTE_ORDER); - proto_item_append_text(parameter_item, " (%s)", + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TEI_STATUS_OFFSET), tei_status_values, "unknown")); } @@ -437,11 +437,11 @@ static void dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 parameter_value_length; - + parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if (parameter_value_length > 0) proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, NETWORK_BYTE_ORDER); - proto_item_append_text(parameter_item, " with tag %u and %u byte%s value", + proto_item_append_text(parameter_item, " with tag %u and %u byte%s value", tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET), parameter_value_length, plurality(parameter_value_length, "", "s")); } @@ -551,10 +551,10 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, dissect_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; case STATUS_TYPE_INDENTIFICATION_PARAMETER_TAG: - dissect_status_type_identification_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_status_type_identification_parameter(parameter_tvb, parameter_tree, parameter_item); break; case PROTOCOL_DATA_PARAMETER_TAG: - dissect_protocol_data_parameter(parameter_tvb, parameter_item, pinfo, tree); + dissect_protocol_data_parameter(parameter_tvb, parameter_item, pinfo, tree); break; case RELEASE_REASON_PARAMETER_TAG: dissect_release_reason_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -572,7 +572,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); break; }; - + if (padding_length > 0) proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER); } @@ -593,7 +593,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tre total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - dissect_parameter(parameter_tvb, pinfo, tree, iua_tree); + dissect_parameter(parameter_tvb, pinfo, tree, iua_tree); /* get rid of the handled parameter */ offset += total_length; } @@ -762,7 +762,7 @@ static const value_string message_class_type_acro_values[] = { { MESSAGE_CLASS_QPTM_MESSAGE * 256 + MESSAGE_TYPE_RELEASE_CONFIRM, "REL_CON" }, { MESSAGE_CLASS_QPTM_MESSAGE * 256 + MESSAGE_TYPE_RELEASE_INDICATION, "REL_IND" }, { 0, NULL } }; - + static const value_string message_class_type_acro_ig_values[] = { { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_ERR, "ERR" }, { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_NTFY, "NTFY" }, @@ -810,7 +810,7 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre proto_tree_add_item(iua_tree, hf_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, NETWORK_BYTE_ORDER); proto_tree_add_item(iua_tree, hf_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, NETWORK_BYTE_ORDER); proto_tree_add_item(iua_tree, hf_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, NETWORK_BYTE_ORDER); - proto_tree_add_uint_format(iua_tree, hf_message_type, + proto_tree_add_uint_format(iua_tree, hf_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, "Message type: %u (%s)", message_type, val_to_str(message_class * 256 + message_type, support_IG?message_class_type_ig_values:message_class_type_values, "reserved")); @@ -826,7 +826,7 @@ dissect_iua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, common_header_tvb = tvb_new_subset(message_tvb, COMMON_HEADER_OFFSET, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); parameters_tvb = tvb_new_subset(message_tvb, PARAMETERS_OFFSET, -1, -1); dissect_common_header(common_header_tvb, pinfo, iua_tree); - dissect_parameters(parameters_tvb, pinfo, tree, iua_tree); + dissect_parameters(parameters_tvb, pinfo, tree, iua_tree); } static void @@ -836,9 +836,9 @@ dissect_iua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *iua_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, support_IG?"IUA (IG)":"IUA (RFC 3057)"); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -855,49 +855,49 @@ dissect_iua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_iua(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { - { &hf_int_interface_id, { "Integer interface identifier", "iua.int_interface_identifier", FT_INT32, BASE_HEX, NULL, 0x0, "", HFILL } }, - { &hf_text_interface_id, { "Text interface identifier", "iua.text_interface_identifier", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_info_string, { "Info string", "iua.info_string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_dlci_zero_bit, { "Zero bit", "iua.dlci_zero_bit", FT_BOOLEAN, 8, NULL, ZERO_BIT_MASK, "", HFILL } }, - { &hf_dlci_spare_bit, { "Spare bit", "iua.dlci_spare_bit", FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, "", HFILL } }, - { &hf_dlci_sapi, { "SAPI", "iua.dlci_sapi", FT_UINT8, BASE_HEX, NULL, SAPI_MASK, "", HFILL } }, - { &hf_dlci_one_bit, { "One bit", "iua.dlci_one_bit", FT_BOOLEAN, 8, NULL, ONE_BIT_MASK, "", HFILL } }, + { &hf_int_interface_id, { "Integer interface identifier", "iua.int_interface_identifier", FT_INT32, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_text_interface_id, { "Text interface identifier", "iua.text_interface_identifier", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_info_string, { "Info string", "iua.info_string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_dlci_zero_bit, { "Zero bit", "iua.dlci_zero_bit", FT_BOOLEAN, 8, NULL, ZERO_BIT_MASK, "", HFILL } }, + { &hf_dlci_spare_bit, { "Spare bit", "iua.dlci_spare_bit", FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, "", HFILL } }, + { &hf_dlci_sapi, { "SAPI", "iua.dlci_sapi", FT_UINT8, BASE_HEX, NULL, SAPI_MASK, "", HFILL } }, + { &hf_dlci_one_bit, { "One bit", "iua.dlci_one_bit", FT_BOOLEAN, 8, NULL, ONE_BIT_MASK, "", HFILL } }, { &hf_dlci_tei, { "TEI", "iua.dlci_tei", FT_UINT8, BASE_HEX, NULL, TEI_MASK, "", HFILL } }, { &hf_dlci_spare, { "Spare", "iua.dlci_spare", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } }, - { &hf_diag_info, { "Diagnostic information", "iua.diagnostic_information", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_interface_range_start, { "Start", "iua.interface_range_start", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_interface_range_end, { "End", "iua.interface_range_end", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_heartbeat_data, { "Heartbeat data", "iua.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_asp_reason, { "Reason", "iua.asp_reason", FT_UINT32, BASE_HEX, VALS(asp_reason_values), 0x0, "", HFILL } }, - { &hf_traffic_mode_type, { "Traffic mode type", "iua.traffic_mode_type", FT_UINT32, BASE_HEX, VALS(traffic_mode_type_values), 0x0, "", HFILL } }, - { &hf_error_code, { "Error code", "iua.error_code", FT_UINT32, BASE_DEC, VALS(error_code_values), 0x0, "", HFILL } }, - { &hf_error_code_ig, { "Error code", "iua.error_code", FT_UINT32, BASE_DEC, VALS(error_code_ig_values), 0x0, "", HFILL } }, - { &hf_status_type, { "Status type", "iua.status_type", FT_UINT16, BASE_DEC, VALS(status_type_values), 0x0, "", HFILL } }, - { &hf_status_id, { "Status identification", "iua.status_identification", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_diag_info, { "Diagnostic information", "iua.diagnostic_information", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_interface_range_start, { "Start", "iua.interface_range_start", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_interface_range_end, { "End", "iua.interface_range_end", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_heartbeat_data, { "Heartbeat data", "iua.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_asp_reason, { "Reason", "iua.asp_reason", FT_UINT32, BASE_HEX, VALS(asp_reason_values), 0x0, "", HFILL } }, + { &hf_traffic_mode_type, { "Traffic mode type", "iua.traffic_mode_type", FT_UINT32, BASE_HEX, VALS(traffic_mode_type_values), 0x0, "", HFILL } }, + { &hf_error_code, { "Error code", "iua.error_code", FT_UINT32, BASE_DEC, VALS(error_code_values), 0x0, "", HFILL } }, + { &hf_error_code_ig, { "Error code", "iua.error_code", FT_UINT32, BASE_DEC, VALS(error_code_ig_values), 0x0, "", HFILL } }, + { &hf_status_type, { "Status type", "iua.status_type", FT_UINT16, BASE_DEC, VALS(status_type_values), 0x0, "", HFILL } }, + { &hf_status_id, { "Status identification", "iua.status_identification", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_release_reason, { "Reason", "iua.release_reason", FT_UINT32, BASE_HEX, VALS(release_reason_values), 0x0, "", HFILL } }, - { &hf_tei_status, { "TEI status", "iua.tei_status", FT_UINT32, BASE_HEX, VALS(tei_status_values), 0x0, "", HFILL } }, - { &hf_asp_id, { "ASP identifier", "iua.asp_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_tei_status, { "TEI status", "iua.tei_status", FT_UINT32, BASE_HEX, VALS(tei_status_values), 0x0, "", HFILL } }, + { &hf_asp_id, { "ASP identifier", "iua.asp_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_parameter_tag, { "Parameter Tag", "iua.parameter_tag", FT_UINT16, BASE_DEC, VALS(parameter_tag_values), 0x0, "", HFILL } }, { &hf_parameter_tag_ig, { "Parameter Tag", "iua.parameter_tag", FT_UINT16, BASE_DEC, VALS(parameter_tag_ig_values), 0x0, "", HFILL } }, - { &hf_parameter_length, { "Parameter length", "iua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_parameter_value, { "Parameter value", "iua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_parameter_padding, { "Parameter padding", "iua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_parameter_length, { "Parameter length", "iua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_parameter_value, { "Parameter value", "iua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_parameter_padding, { "Parameter padding", "iua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_version, { "Version", "iua.version", FT_UINT8, BASE_DEC, VALS(protocol_version_values), 0x0, "", HFILL } }, - { &hf_reserved, { "Reserved", "iua.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_reserved, { "Reserved", "iua.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_message_class, { "Message class", "iua.message_class", FT_UINT8, BASE_DEC, VALS(message_class_values), 0x0, "", HFILL } }, { &hf_message_type, { "Message Type", "iua.message_type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_message_length, { "Message length", "iua.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_message_length, { "Message length", "iua.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, }; /* Setup protocol subtree array */ static gint *ett[] = { &ett_iua, &ett_iua_parameter, }; - + /* Register the protocol name and description */ proto_iua = proto_register_protocol("ISDN Q.921-User Adaptation Layer", "IUA", "iua"); iua_module = prefs_register_protocol(proto_iua, NULL); diff --git a/packet-kerberos.c b/packet-kerberos.c index d3495821af..d952f803c4 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.24 2002/08/22 08:47:13 guy Exp $ + * $Id: packet-kerberos.c,v 1.25 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -130,7 +130,7 @@ static gint ett_additional_tickets = -1; #define KRB5_ENCTYPE_DES3_CBC_SHA 5 #define KRB5_ENCTYPE_DES3_CBC_RAW 6 #define KRB5_ENCTYPE_DES_HMAC_SHA1 8 -#define KRB5_ENCTYPE_DES3_CBC_SHA1 0x10 +#define KRB5_ENCTYPE_DES3_CBC_SHA1 0x10 #define KRB5_ENCTYPE_UNKNOWN 0x1ff #define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 0x7007 @@ -525,7 +525,7 @@ dissect_type_value_pair(ASN1_SCK *asn1p, int *inoff, asn1_header_decode (asn1p, &cls, &con, &tag, &def, val_len); asn1_header_decode (asn1p, &cls, &con, &tag, &def, val_len); offset += asn1p->offset - start; - + if (val_off) *val_off = offset; @@ -557,7 +557,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int ret; guint protocol_message_type; - + guint32 version; guint32 msg_type; guint32 preauth_type; @@ -579,7 +579,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) kerberos_tree = proto_item_add_subtree(item, ett_kerberos); } message_end = asn1p->offset + item_len; - + /* second header */ KRB_HEAD_DECODE_OR_DIE("top2"); @@ -655,7 +655,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* AS-REQ ::= [APPLICATION 10] KDC-REQ TGS-REQ ::= [APPLICATION 12] KDC-REQ - + KDC-REQ ::= SEQUENCE { pvno[1] INTEGER, msg-type[2] INTEGER, @@ -757,7 +757,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += item_len; KRB_HEAD_DECODE_OR_DIE("Nonce"); } - + DIE_IF_NOT_CONTEXT_TYPE("Nonce", KRB5_BODY_NONCE); KRB_DECODE_UINT32_OR_DIE("Nonce", tmp_int); if (request_tree) { @@ -766,7 +766,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tmp_int); } offset += length; - + KRB_DECODE_CONTEXT_HEAD_OR_DIE("encryption type spot", KRB5_BODY_ENCTYPE); KRB_HEAD_DECODE_OR_DIE("encryption type list"); @@ -866,7 +866,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (item_len == -1) return -1; offset += item_len; - + KRB_DECODE_CONTEXT_HEAD_OR_DIE("ticket", KRB5_KDC_REP_TICKET); length = dissect_Ticket(asn1p, pinfo, kerberos_tree, offset); if (length == -1) @@ -932,7 +932,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += item_len; KRB_HEAD_DECODE_OR_DIE("susec"); - DIE_IF_NOT_CONTEXT_TYPE("susec", KRB5_ERROR_SUSEC); + DIE_IF_NOT_CONTEXT_TYPE("susec", KRB5_ERROR_SUSEC); KRB_DECODE_UINT32_OR_DIE("susec", tmp_int); if (kerberos_tree) { proto_tree_add_text(kerberos_tree, tvb, offset, length, @@ -1184,7 +1184,7 @@ dissect_Addresses(ASN1_SCK *asn1p, packet_info *pinfo, str_len, format_text(str, str_len)); } break; - + default: proto_tree_add_text(address_tree, asn1p->tvb, tmp_pos2, str_len, "Value: %s", @@ -1192,7 +1192,7 @@ dissect_Addresses(ASN1_SCK *asn1p, packet_info *pinfo, } } } - + return offset - start_offset; } @@ -1262,7 +1262,7 @@ dissect_EncryptedData(char *title, ASN1_SCK *asn1p, packet_info *pinfo, "CipherText: %s", bytes_to_str(data, item_len)); } offset += data_len; - + return offset - start_offset; } @@ -1383,7 +1383,7 @@ proto_reg_handoff_kerberos(void) /* MISC definitions from RFC1510: - + Realm ::= GeneralString KerberosTime ::= GeneralizedTime diff --git a/packet-klm.c b/packet-klm.c index 0bc653aa69..7c73ce97b8 100644 --- a/packet-klm.c +++ b/packet-klm.c @@ -1,7 +1,7 @@ /* packet-klm.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for klm dissection * - * $Id: packet-klm.c,v 1.9 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-klm.c,v 1.10 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -71,21 +71,21 @@ dissect_holder(tvbuff_t *tvb, proto_tree *tree, int offset) lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder); - offset = dissect_rpc_bool( tvb, lock_tree, + offset = dissect_rpc_bool( tvb, lock_tree, hf_klm_exclusive, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_pid, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_offset, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_len, offset); return offset; } - + static int dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset) { @@ -102,13 +102,13 @@ dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset) offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh"); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_pid, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_offset, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_klm_len, offset); return offset; @@ -126,7 +126,7 @@ static int dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_klm_stats, offset); return offset; @@ -135,10 +135,10 @@ dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ static int dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_bool( tvb, tree, + offset = dissect_rpc_bool( tvb, tree, hf_klm_block, offset); - offset = dissect_rpc_bool( tvb, tree, + offset = dissect_rpc_bool( tvb, tree, hf_klm_exclusive, offset); offset = dissect_lock(tvb, pinfo, tree, offset); @@ -153,7 +153,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ stats = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_klm_stats, offset); if (stats == KLM_DENIED) { @@ -166,7 +166,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ static int dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_bool( tvb, tree, + offset = dissect_rpc_bool( tvb, tree, hf_klm_exclusive, offset); offset = dissect_lock(tvb, pinfo, tree, offset); diff --git a/packet-klm.h b/packet-klm.h index e7f3c92492..1657f2a643 100644 --- a/packet-klm.h +++ b/packet-klm.h @@ -1,21 +1,21 @@ /* packet-klm.h 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-klm.h,v 1.3 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-klm.h,v 1.4 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-l2tp.c b/packet-l2tp.c index ea3b4646b6..9a1d73c066 100644 --- a/packet-l2tp.c +++ b/packet-l2tp.c @@ -7,22 +7,22 @@ * Laurent Cazalet <laurent.cazalet@mailclub.net> * Thomas Parvais <thomas.parvais@advalvas.be> * - * $Id: packet-l2tp.c,v 1.34 2002/08/02 23:35:52 jmayer Exp $ + * $Id: packet-l2tp.c,v 1.35 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ static int hf_l2tp_type = -1; static int hf_l2tp_length_bit = -1; static int hf_l2tp_seq_bit = -1; static int hf_l2tp_offset_bit = -1; -static int hf_l2tp_priority = -1; +static int hf_l2tp_priority = -1; static int hf_l2tp_version = -1; static int hf_l2tp_length = -1; static int hf_l2tp_tunnel = -1; @@ -63,7 +63,7 @@ static int hf_l2tp_tie_breaker = -1; #define UDP_PORT_L2TP 1701 #define CONTROL_BIT(msg_info) (msg_info & 0x8000) /* Type bit control = 1 data = 0 */ -#define LENGTH_BIT(msg_info) (msg_info & 0x4000) /* Length bit = 1 */ +#define LENGTH_BIT(msg_info) (msg_info & 0x4000) /* Length bit = 1 */ #define RESERVE_BITS(msg_info) (msg_info &0x37F8) /* Reserved bit - usused */ #define SEQUENCE_BIT(msg_info) (msg_info & 0x0800) /* SEQUENCE bit = 1 Ns and Nr fields */ #define OFFSET_BIT(msg_info) (msg_info & 0x0200) /* Offset */ @@ -86,15 +86,15 @@ static gint ett_l2tp_avp = -1; #define AVP_SCCCN 3 #define AVP_StopCCN 4 #define AVP_Reserved 5 -#define AVP_HELLO 6 -#define AVP_OCRQ 7 -#define AVP_OCRP 8 -#define AVP_ORCRP 9 -#define AVP_ICRQ 10 -#define AVP_ICRP 11 -#define AVP_ICCN 12 -#define AVP_Reserved1 13 -#define AVP_CDN 14 +#define AVP_HELLO 6 +#define AVP_OCRQ 7 +#define AVP_OCRP 8 +#define AVP_ORCRP 9 +#define AVP_ICRQ 10 +#define AVP_ICRP 11 +#define AVP_ICCN 12 +#define AVP_Reserved1 13 +#define AVP_CDN 14 #define NUM_CONTROL_CALL_TYPES 16 @@ -188,7 +188,7 @@ static const value_string authen_type_vals[] = { #define ASSIGNED_TUNNEL_ID 9 #define RECEIVE_WINDOW_SIZE 10 #define CHALLENGE 11 -#define CAUSE_CODE 12 +#define CAUSE_CODE 12 #define CHALLENGE_RESPONSE 13 #define ASSIGNED_SESSION 14 #define CALL_SERIAL_NUMBER 15 @@ -283,7 +283,7 @@ static const value_string avp_type_vals[] = { #define VENDOR_COSINE 3085 #define VENDOR_UNISPHERE 4874 -static const value_string avp_vendor_id_vals[] = +static const value_string avp_vendor_id_vals[] = {{VENDOR_IETF,"IETF"}, {VENDOR_ACC,"ACC"}, {VENDOR_CISCO,"Cisco"}, @@ -328,7 +328,7 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* build output for closed L2tp frame displayed */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -367,11 +367,11 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (SEQUENCE_BIT(control)) { tmp_index += 4; } - + tmp_index+=4; - + avp_type = tvb_get_ntohs(tvb, (tmp_index+=2)); - + if (avp_type == CONTROL_MESSAGE) { /* We print message type */ @@ -390,7 +390,7 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ sprintf(textbuffer,"%s (tunnel id=%d, session id=%d)", control_msg , tid ,cid); - + } } } @@ -488,11 +488,11 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) avp_type = tvb_get_ntohs(tvb, index + 4); if (avp_vendor_id == VENDOR_IETF) { - tf = proto_tree_add_text(l2tp_tree, tvb, index, + tf = proto_tree_add_text(l2tp_tree, tvb, index, avp_len, "%s AVP", val_to_str(avp_type, avp_type_vals, "Unknown (%u)")); } else { /* Vendor-Specific AVP */ - tf = proto_tree_add_text(l2tp_tree, tvb, index, + tf = proto_tree_add_text(l2tp_tree, tvb, index, avp_len, "Vendor %s AVP", val_to_str(avp_vendor_id, avp_vendor_id_vals, "Unknown (%u)")); } @@ -533,7 +533,7 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* For the time being, we don't decode any Vendor- specific AVP. */ - proto_tree_add_text(l2tp_avp_tree, tvb, index, + proto_tree_add_text(l2tp_avp_tree, tvb, index, avp_len, "Vendor-Specific AVP"); index += avp_len; @@ -937,8 +937,8 @@ dissect_l2tp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; proto_tree_add_text(l2tp_avp_tree, tvb, index, 1, "Direction: %s", - val_to_str(tvb_get_guint8(tvb, index), - cause_code_direction_vals, + val_to_str(tvb_get_guint8(tvb, index), + cause_code_direction_vals, "Reserved (%u)")); index += 1; avp_len -= 1; diff --git a/packet-lapb.c b/packet-lapb.c index ab6855f81f..10a583267f 100644 --- a/packet-lapb.c +++ b/packet-lapb.c @@ -2,22 +2,22 @@ * Routines for lapb frame disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-lapb.c,v 1.36 2002/08/02 23:35:53 jmayer Exp $ + * $Id: packet-lapb.c,v 1.37 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -111,7 +111,7 @@ proto_register_lapb(void) { static hf_register_info hf[] = { { &hf_lapb_address, - { "Address Field", "lapb.address", FT_UINT8, BASE_HEX, NULL, 0x0, + { "Address Field", "lapb.address", FT_UINT8, BASE_HEX, NULL, 0x0, "Address", HFILL }}, { &hf_lapb_control, diff --git a/packet-lapbether.c b/packet-lapbether.c index e3623da372..16b41c6778 100644 --- a/packet-lapbether.c +++ b/packet-lapbether.c @@ -3,22 +3,22 @@ * Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-lapbether.c,v 1.10 2002/08/02 23:35:53 jmayer Exp $ + * $Id: packet-lapbether.c,v 1.11 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -58,11 +58,11 @@ dissect_lapbether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_lapbether, tvb, 0, 2, + ti = proto_tree_add_protocol_format(tree, proto_lapbether, tvb, 0, 2, "LAPBETHER"); lapbether_tree = proto_item_add_subtree(ti, ett_lapbether); - proto_tree_add_uint_format(lapbether_tree, hf_lapbether_length, tvb, 0, 2, + proto_tree_add_uint_format(lapbether_tree, hf_lapbether_length, tvb, 0, 2, len, "Length: %u", len); } @@ -77,7 +77,7 @@ proto_register_lapbether(void) { static hf_register_info hf[] = { { &hf_lapbether_length, - { "Length Field", "lapbether.length", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Length Field", "lapbether.length", FT_UINT16, BASE_DEC, NULL, 0x0, "LAPBEther Length Field", HFILL }}, }; diff --git a/packet-lapd.c b/packet-lapd.c index 9ce4035585..b2ed87706d 100644 --- a/packet-lapd.c +++ b/packet-lapd.c @@ -2,22 +2,22 @@ * Routines for LAPD frame disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-lapd.c,v 1.30 2002/08/02 23:35:53 jmayer Exp $ + * $Id: packet-lapd.c,v 1.31 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -164,7 +164,7 @@ proto_register_lapd(void) { static hf_register_info hf[] = { { &hf_lapd_address, - { "Address Field", "lapd.address", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Address Field", "lapd.address", FT_UINT16, BASE_HEX, NULL, 0x0, "Address", HFILL }}, { &hf_lapd_sapi, diff --git a/packet-ldap.c b/packet-ldap.c index 7d5f05d91f..a2f075b3cd 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.45 2002/08/26 09:21:54 guy Exp $ + * $Id: packet-ldap.c,v 1.46 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,14 +26,14 @@ * This is not a complete implementation. It doesn't handle the full version 3, more specifically, * it handles only the commands of version 2, but any additional characteristics of the ver3 command are supported. * It's also missing extensible search filters. - * + * * There should probably be alot more error checking, I simply assume that if we have a full packet, it will be a complete * and correct packet. - * + * * AFAIK, it will handle all messages used by the OpenLDAP 1.2.9 server and libraries which was my goal. I do plan to add * the remaining commands as time permits but this is not a priority to me. Send me an email if you need it and I'll see what * I can do. - * + * * Doug Nazar * nazard@dragoninc.on.ca */ @@ -125,7 +125,7 @@ static value_string msgTypes [] = { {LDAP_REQ_COMPARE, "Compare Request"}, {LDAP_REQ_ABANDON, "Abandon Request"}, {LDAP_REQ_EXTENDED, "Extended Request"}, - + {LDAP_RES_BIND, "Bind Result"}, {LDAP_RES_SEARCH_ENTRY, "Search Entry"}, {LDAP_RES_SEARCH_RESULT, "Search Result"}, @@ -145,7 +145,7 @@ static int read_length(ASN1_SCK *a, proto_tree *tree, int hf_id, guint *len) gboolean def = FALSE; int start = a->offset; int ret; - + ret = asn1_length_decode(a, &def, &length); if (ret != ASN1_ERR_NOERROR) { if (tree) { @@ -171,7 +171,7 @@ static int read_sequence(ASN1_SCK *a, guint *len) gboolean def; guint length; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret != ASN1_ERR_NOERROR) return ret; @@ -180,7 +180,7 @@ static int read_sequence(ASN1_SCK *a, guint *len) if (len) *len = length; - + return ASN1_ERR_NOERROR; } @@ -190,16 +190,16 @@ static int read_set(ASN1_SCK *a, guint *len) gboolean def; guint length; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret != ASN1_ERR_NOERROR) return ret; if (cls != ASN1_UNI || con != ASN1_CON || tag != ASN1_SET) return ASN1_ERR_WRONG_TYPE; - + if (len) *len = length; - + return ASN1_ERR_NOERROR; } @@ -240,7 +240,7 @@ static int read_integer(ASN1_SCK *a, proto_tree *tree, int hf_id, guint length; int start = a->offset; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret == ASN1_ERR_NOERROR) { if (cls != ASN1_UNI || con != ASN1_PRI || tag != expected_tag) @@ -295,7 +295,7 @@ static int read_boolean(ASN1_SCK *a, proto_tree *tree, int hf_id, guint length; int start = a->offset; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret == ASN1_ERR_NOERROR) { if (cls != ASN1_UNI || con != ASN1_PRI || tag != ASN1_BOL) @@ -319,7 +319,7 @@ static int read_string_value(ASN1_SCK *a, proto_tree *tree, int hf_id, guchar *string; proto_item *temp_item = NULL; int ret; - + if (length) { ret = asn1_string_value_decode(a, length, &string); @@ -336,7 +336,7 @@ static int read_string_value(ASN1_SCK *a, proto_tree *tree, int hf_id, } else string = "(null)"; - + if (tree) temp_item = proto_tree_add_string(tree, hf_id, a->tvb, start, a->offset - start, string); if (new_item) @@ -358,7 +358,7 @@ static int read_string(ASN1_SCK *a, proto_tree *tree, int hf_id, guint length; int start = a->offset; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret == ASN1_ERR_NOERROR) { if (cls != expected_cls || con != ASN1_PRI || tag != expected_tag) @@ -382,7 +382,7 @@ static int read_bytestring_value(ASN1_SCK *a, proto_tree *tree, int hf_id, guchar *string; proto_item *temp_item = NULL; int ret; - + if (length) { ret = asn1_string_value_decode(a, length, &string); @@ -399,7 +399,7 @@ static int read_bytestring_value(ASN1_SCK *a, proto_tree *tree, int hf_id, } else string = "(null)"; - + if (tree) temp_item = proto_tree_add_bytes(tree, hf_id, a->tvb, start, a->offset - start, string); if (new_item) @@ -421,7 +421,7 @@ static int read_bytestring(ASN1_SCK *a, proto_tree *tree, int hf_id, guint length; int start = a->offset; int ret; - + ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret == ASN1_ERR_NOERROR) { if (cls != expected_cls || con != ASN1_PRI || tag != expected_tag) @@ -485,7 +485,7 @@ static int parse_filter_substrings(ASN1_SCK *a, char **filter, guint *filter_len guint string_length; guint string_bytes; guint seq_len; - guint header_bytes; + guint header_bytes; int ret, any_valued; /* For ASN.1 parsing of octet strings */ @@ -504,7 +504,7 @@ static int parse_filter_substrings(ASN1_SCK *a, char **filter, guint *filter_len *filter_length += 2 + 1 + string_length; *filter = g_realloc(*filter, *filter_length); - + filterp = *filter + strlen(*filter); *filterp++ = '('; if (string_length != 0) { @@ -568,7 +568,7 @@ static int parse_filter_substrings(ASN1_SCK *a, char **filter, guint *filter_len filterp = *filter + strlen(*filter); *filterp++ = '*'; } - + /* NB: Allocated byte for this earlier */ *filterp++ = ')'; *filterp = '\0'; @@ -588,7 +588,7 @@ static int parse_filter(ASN1_SCK *a, char **filter, guint *filter_length, ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length); if (ret != ASN1_ERR_NOERROR) return ret; - + if (*end == 0) { *end = a->offset + length; @@ -684,7 +684,7 @@ static int parse_filter(ASN1_SCK *a, char **filter, guint *filter_length, { guchar *string; char *filterp; - + if (con != ASN1_PRI) return ASN1_ERR_WRONG_TYPE; ret = asn1_string_value_decode(a, length, &string); @@ -717,7 +717,7 @@ static int parse_filter(ASN1_SCK *a, char **filter, guint *filter_length, return ASN1_ERR_WRONG_TYPE; } } - + if (a->offset == *end) return -1; else @@ -731,7 +731,7 @@ static gboolean read_filter(ASN1_SCK *a, proto_tree *tree, int hf_id) guint filter_length = 0; int end = 0; int ret; - + while ((ret = parse_filter(a, &filter, &filter_length, &end)) == ASN1_ERR_NOERROR) continue; @@ -756,7 +756,7 @@ static void dissect_ldap_result(ASN1_SCK *a, proto_tree *tree) { guint resultCode = 0; int ret; - + if (read_integer(a, tree, hf_ldap_message_result, 0, &resultCode, ASN1_ENUM) != ASN1_ERR_NOERROR) return; if (read_string(a, tree, hf_ldap_message_result_matcheddn, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) @@ -771,7 +771,7 @@ static void dissect_ldap_result(ASN1_SCK *a, proto_tree *tree) guint length; proto_item *ti; proto_tree *referralTree; - + ret = read_sequence(a, &length); if (ret != ASN1_ERR_NOERROR) { if (tree) { @@ -908,7 +908,7 @@ static void dissect_ldap_request_search(ASN1_SCK *a, proto_tree *tree) guint seq_length; int end; int ret; - + if (read_string(a, tree, hf_ldap_message_search_base, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) return; if (read_integer(a, tree, hf_ldap_message_search_scope, 0, 0, ASN1_ENUM) != ASN1_ERR_NOERROR) @@ -945,7 +945,7 @@ static void dissect_ldap_response_search_entry(ASN1_SCK *a, proto_tree *tree) guint seq_length; int end_of_sequence; int ret; - + if (read_string(a, tree, hf_ldap_message_dn, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) return; ret = read_sequence(a, &seq_length); @@ -1002,7 +1002,7 @@ static void dissect_ldap_request_add(ASN1_SCK *a, proto_tree *tree) guint seq_length; int end_of_sequence; int ret; - + if (read_string(a, tree, hf_ldap_message_dn, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) return; @@ -1072,7 +1072,7 @@ static void dissect_ldap_request_modifyrdn(ASN1_SCK *a, proto_tree *tree, return; if (read_boolean(a, tree, hf_ldap_message_modrdn_delete, 0, 0) != ASN1_ERR_NOERROR) return; - + if (a->offset < (int) (start + length)) { /* LDAP V3 Modify DN operation, with newSuperior */ if (read_string(a, tree, hf_ldap_message_modrdn_superior, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) @@ -1088,7 +1088,7 @@ static void dissect_ldap_request_compare(ASN1_SCK *a, proto_tree *tree) char *string2 = 0; char *compare; int ret; - + if (read_string(a, tree, hf_ldap_message_dn, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) return; ret = read_sequence(a, 0); @@ -1124,11 +1124,11 @@ static void dissect_ldap_request_compare(ASN1_SCK *a, proto_tree *tree) snprintf(compare, length, "%s=%s", string1, string2); proto_tree_add_string(tree, hf_ldap_message_compare, a->tvb, start, a->offset-start, compare); - + g_free(string1); g_free(string2); g_free(compare); - + return; } @@ -1137,7 +1137,7 @@ static void dissect_ldap_request_modify(ASN1_SCK *a, proto_tree *tree) guint seq_length; int end_of_sequence; int ret; - + if (read_string(a, tree, hf_ldap_message_dn, 0, 0, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR) return; ret = read_sequence(a, &seq_length); @@ -1235,7 +1235,7 @@ static void dissect_ldap_request_abandon(ASN1_SCK *a, proto_tree *tree, int start, guint length) { read_integer_value(a, tree, hf_ldap_message_abandon_msgid, NULL, NULL, - start, length); + start, length); } static void @@ -1260,7 +1260,7 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int message_id_start; int message_id_length; int message_start; - + /* * XXX - should handle the initial sequence specifier split across * segment boundaries. @@ -1322,7 +1322,7 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); } - if (tree) + if (tree) { ti = proto_tree_add_item(tree, proto_ldap, tvb, message_start, next_offset - message_start, FALSE); @@ -1359,7 +1359,7 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) first_time = FALSE; } - if (ldap_tree) + if (ldap_tree) { proto_tree_add_uint_hidden(ldap_tree, hf_ldap_message_id, tvb, message_id_start, message_id_length, messageId); proto_tree_add_uint_hidden(ldap_tree, hf_ldap_message_type, tvb, @@ -1489,14 +1489,14 @@ proto_register_ldap(void) {LDAP_AUTH_SASL, "SASL"}, {0, NULL}, }; - + static value_string search_scope[] = { {0x00, "Base"}, {0x01, "Single"}, {0x02, "Subtree"}, {0x00, NULL}, }; - + static value_string search_dereference[] = { {0x00, "Never"}, {0x01, "Searching"}, @@ -1504,13 +1504,13 @@ proto_register_ldap(void) {0x03, "Always"}, {0x00, NULL}, }; - + static hf_register_info hf[] = { { &hf_ldap_length, { "Length", "ldap.length", FT_UINT32, BASE_DEC, NULL, 0x0, "LDAP Length", HFILL }}, - + { &hf_ldap_message_id, { "Message Id", "ldap.message_id", FT_UINT32, BASE_DEC, NULL, 0x0, diff --git a/packet-ldap.h b/packet-ldap.h index 46e4b915cf..a1cefa0c1a 100644 --- a/packet-ldap.h +++ b/packet-ldap.h @@ -1,22 +1,22 @@ /* packet-ldap.h * - * $Id: packet-ldap.h,v 1.5 2000/08/11 13:34:09 deniel Exp $ + * $Id: packet-ldap.h,v 1.6 2002/08/28 21:00:19 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ldp.c b/packet-ldp.c index 1ec33de547..e3c665cb20 100644 --- a/packet-ldp.c +++ b/packet-ldp.c @@ -1,8 +1,8 @@ /* packet-ldp.c * Routines for LDP (RFC 3036) packet disassembly * - * $Id: packet-ldp.c,v 1.42 2002/08/27 19:21:02 guy Exp $ - * + * $Id: packet-ldp.c,v 1.43 2002/08/28 21:00:20 jmayer Exp $ + * * Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com> * * CRLDP (RFC3212) is now supported @@ -133,7 +133,7 @@ static int hf_ldp_tlv_fec_vc_controlword = -1; static int hf_ldp_tlv_fec_vc_vctype = -1; static int hf_ldp_tlv_fec_vc_infolength = -1; static int hf_ldp_tlv_fec_vc_groupid = -1; -static int hf_ldp_tlv_fec_vc_vcid = -1; +static int hf_ldp_tlv_fec_vc_vcid = -1; static int hf_ldp_tlv_fec_vc_intparam_length = -1; static int hf_ldp_tlv_fec_vc_intparam_mtu = -1; static int hf_ldp_tlv_fec_vc_intparam_id = -1; @@ -230,7 +230,7 @@ static int global_ldp_udp_port = UDP_PORT_LDP; #define TLV_EXPERIMENTAL_START 0x3F00 #define TLV_EXPERIMENTAL_END 0x3FFF -static const value_string tlv_type_names[] = { +static const value_string tlv_type_names[] = { { TLV_FEC, "Forwarding Equivalence Classes TLV" }, { TLV_ADDRESS_LIST, "Address List TLV"}, { TLV_HOP_COUNT, "Hop Count TLV"}, @@ -358,7 +358,7 @@ static const value_string fec_vc_types_vals[] = { #define FEC_VC_INTERFACEPARAM_DESCRIPTION 0x03 #define FEC_VC_INTERFACEPARAM_CEMBYTES 0x04 #define FEC_VC_INTERFACEPARAM_CEMOPTIONS 0x05 -#define FEC_VC_INTERFACEPARAM_VPNID 0x06 +#define FEC_VC_INTERFACEPARAM_VPNID 0x06 static const value_string fec_vc_interfaceparm[] = { @@ -551,7 +551,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) family=tvb_get_ntohs(tvb, offset+1); prefix_len=tvb_get_guint8(tvb, offset+3); prefix_len_octets=(prefix_len+7)/8; - + implemented=1; switch(family) { case AFNUM_INET: /*IPv4*/ @@ -569,7 +569,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if( !implemented ) { guint16 noctets; - + noctets= rem>4+prefix_len_octets?4+prefix_len_octets:rem; proto_tree_add_text(val_tree, tvb, offset, noctets,"Support for Address Family not implemented"); offset+=noctets; @@ -594,8 +594,8 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, FALSE); offset += 1; - - + + if( addr_size < prefix_len_octets) { offset+=addr_size; rem-=addr_size; @@ -608,7 +608,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) fprintf(stderr, "packet-ldp: dissect_tlv_fec() malloc failed\n"); return; } - + for(ax=0; ax+1 <= prefix_len_octets; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); if( prefix_len % 8 ) @@ -616,7 +616,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) str = (* (char* (*)(guint8 *))str_handler)(addr); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_pfval, tvb, offset, prefix_len_octets, str, "Prefix: %s", str); - + offset += prefix_len_octets; rem -= 4+prefix_len_octets; g_free(addr); @@ -647,7 +647,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if( !implemented ) { guint16 noctets; - + noctets= rem>4+host_len?4+host_len:rem; proto_tree_add_text(val_tree, tvb, offset, noctets,"Support for Address Family not implemented"); offset+=noctets; @@ -672,8 +672,8 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_len, tvb, offset, 1, FALSE); offset += 1; - - + + if( addr_size != host_len) { offset+=addr_size; rem-=addr_size; @@ -686,13 +686,13 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) fprintf(stderr, "packet-ldp: dissect_tlv_fec() malloc failed\n"); return; } - + for(ax=0; ax+1 <= host_len; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); str = (* (char* (*)(guint8 *))str_handler)(addr); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_hoval, tvb, offset, host_len, str, "Address: %s", str); - + offset += host_len; rem -= 4+host_len; g_free(addr); @@ -716,7 +716,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_groupid,tvb, offset +4, 4, FALSE); rem -=8; offset +=8; - + if ( (vc_len > 3) && ( rem > 3 ) ) { /* there is enough room for vcid */ proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_vc_vcid,tvb, offset, 4, FALSE); proto_item_append_text (ti," VCID: %u",tvb_get_ntohl(tvb,offset)); @@ -908,10 +908,10 @@ dissect_tlv_atm_label(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(val_tree, hf_ldp_tlv_atm_label_vbits, tvb, offset, 1, FALSE); id=tvb_get_ntohs(tvb, offset)&0x0FFF; - proto_tree_add_uint_format(val_tree, hf_ldp_tlv_atm_label_vpi, tvb, offset, 2, id, "VPI: %u", id); - + proto_tree_add_uint_format(val_tree, hf_ldp_tlv_atm_label_vpi, tvb, offset, 2, id, "VPI: %u", id); + id=tvb_get_ntohs(tvb, offset+2); - proto_tree_add_uint_format(val_tree, hf_ldp_tlv_atm_label_vci, tvb, offset+2, 2, id, "VCI: %u", id); + proto_tree_add_uint_format(val_tree, hf_ldp_tlv_atm_label_vci, tvb, offset+2, 2, id, "VCI: %u", id); } } @@ -936,11 +936,11 @@ dissect_tlv_frame_label(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if(val_tree == NULL) return; len=(guint8)(tvb_get_ntohs(tvb, offset)>>7) & 0x03; - proto_tree_add_uint_format(val_tree, hf_ldp_tlv_fr_label_len, tvb, offset, 2, len, "Number of DLCI bits: %s (%u)", val_to_str(len, tlv_fr_len_vals, "Unknown Length"), len); + proto_tree_add_uint_format(val_tree, hf_ldp_tlv_fr_label_len, tvb, offset, 2, len, "Number of DLCI bits: %s (%u)", val_to_str(len, tlv_fr_len_vals, "Unknown Length"), len); id=tvb_get_ntoh24(tvb, offset+1)&0x7FFFFF; - proto_tree_add_uint_format(val_tree, - hf_ldp_tlv_fr_label_dlci, tvb, offset+1, 3, id, "DLCI: %u", id); + proto_tree_add_uint_format(val_tree, + hf_ldp_tlv_fr_label_dlci, tvb, offset+1, 3, id, "DLCI: %u", id); } } @@ -964,14 +964,14 @@ dissect_tlv_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); if(val_tree == NULL) return; - proto_tree_add_item(val_tree, hf_ldp_tlv_status_ebit, tvb, offset, 1, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_fbit, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_ebit, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_fbit, tvb, offset, 1, FALSE); data=tvb_get_ntohl(tvb, offset)&0x3FFFFFFF; - proto_tree_add_uint_format(val_tree, hf_ldp_tlv_status_data, tvb, offset, 4, data, "Status Data: %s (0x%X)", val_to_str(data, tlv_status_data, "Unknown Status Data"), data); + proto_tree_add_uint_format(val_tree, hf_ldp_tlv_status_data, tvb, offset, 4, data, "Status Data: %s (0x%X)", val_to_str(data, tlv_status_data, "Unknown Status Data"), data); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_id, tvb, offset+4, 4, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_type, tvb, offset+8, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_id, tvb, offset+4, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_status_msg_type, tvb, offset+8, 2, FALSE); } } @@ -993,10 +993,10 @@ dissect_tlv_returned_pdu(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); if(val_tree == NULL) return; - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_version, tvb, offset, 2, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_pdu_len, tvb, offset+2, 2, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_lsr, tvb, offset+4, 4, FALSE); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_ls_id, tvb, offset+8, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_version, tvb, offset, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_pdu_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_lsr, tvb, offset+4, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_ls_id, tvb, offset+8, 2, FALSE); offset += 10; rem -= 10; @@ -1026,17 +1026,17 @@ dissect_tlv_returned_message(tvbuff_t *tvb, guint offset, proto_tree *tree, int val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); if(val_tree == NULL) return; - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_ubit, tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_ubit, tvb, offset, 1, FALSE); type=tvb_get_ntohs(tvb, offset)&0x7FFF; - proto_tree_add_uint_format(val_tree, hf_ldp_tlv_returned_msg_type, tvb, offset, 2, type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); + proto_tree_add_uint_format(val_tree, hf_ldp_tlv_returned_msg_type, tvb, offset, 2, type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_len, tvb, offset+2, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_len, tvb, offset+2, 2, FALSE); offset += 4; rem -= 4; if( rem >= 4 ) { /*have msg_id*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_id, tvb, offset, 4, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_returned_msg_id, tvb, offset, 4, FALSE); offset += 4; rem -= 4; } @@ -1050,7 +1050,7 @@ dissect_tlv_returned_message(tvbuff_t *tvb, guint offset, proto_tree *tree, int /* Dissect the common hello params */ -static void +static void #if 0 dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) #else @@ -1107,7 +1107,7 @@ dissect_tlv_mac(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) /* Dissect the common session params */ -static void +static void dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) { proto_tree *ti = NULL, *val_tree = NULL; @@ -1124,26 +1124,26 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, if(val_tree != NULL) { /*Protocol Version*/ - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ver, tvb,offset, 2, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ver, tvb,offset, 2, FALSE); /*KeepAlive Time*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ka, tvb,offset + 2, 2, FALSE); /*A bit*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_advbit,tvb, offset + 4, 1, FALSE); - + /*D bit*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_ldetbit,tvb, offset + 4, 1, FALSE); - + /*Path Vector Limit*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_pvlim,tvb, offset + 5, 1, FALSE); - + /*Max PDU Length*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_mxpdu,tvb, offset + 6, 2, FALSE); - + /*Rx LSR*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxlsr,tvb, offset + 8, 4, FALSE); - + /*Rx LS*/ proto_tree_add_item(val_tree, hf_ldp_tlv_sess_rxls,tvb, offset + 12, 2, FALSE); } @@ -1152,7 +1152,7 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, /* Dissect the atm session params */ -static void +static void dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) { proto_tree *ti = NULL, *val_tree = NULL, *lbl_tree = NULL; @@ -1171,21 +1171,21 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); if(val_tree != NULL) { - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_merge,tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_merge,tvb, offset, 1, FALSE); - /*get the number of label ranges*/ + /*get the number of label ranges*/ numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F; proto_tree_add_uint_format(val_tree, hf_ldp_tlv_sess_atm_lr, tvb, offset, 1, numlr, "Number of Label Range components: %u", - numlr); + numlr); - proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_dir,tvb, offset, 1, FALSE); + proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_dir,tvb, offset, 1, FALSE); /*move into range components*/ offset += 4; rem -= 4; ti = proto_tree_add_text(val_tree, tvb, offset, rem,"ATM Label Range Components"); - + if(numlr) { val_tree=proto_item_add_subtree(ti,ett_ldp_tlv_val); if( ! val_tree ) return; @@ -1199,26 +1199,26 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int if( lbl_tree == NULL ) break; id=tvb_get_ntohs(tvb, offset)&0x0FFF; - proto_tree_add_uint_format(lbl_tree, + proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_atm_minvpi, tvb, offset, 2, - id, "Minimum VPI: %u", id); + id, "Minimum VPI: %u", id); id=tvb_get_ntohs(tvb, offset+4)&0x0FFF; - proto_tree_add_uint_format(lbl_tree, + proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_atm_maxvpi, tvb, (offset+4), 2, id, - "Maximum VPI: %u", id); - + "Maximum VPI: %u", id); + id=tvb_get_ntohs(tvb, offset+2); - proto_tree_add_uint_format(lbl_tree, + proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_atm_minvci, tvb, offset+2, 2, - id, "Minimum VCI: %u", id); + id, "Minimum VCI: %u", id); id=tvb_get_ntohs(tvb, offset+6); - proto_tree_add_uint_format(lbl_tree, + proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_atm_maxvci, tvb, offset+6, 2, - id, "Maximum VCI: %u", id); + id, "Maximum VCI: %u", id); offset += 8; } @@ -1231,7 +1231,7 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int /* Dissect the frame relay session params */ -static void +static void dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, guint offset,proto_tree *tree, int rem) { proto_tree *ti = NULL, *val_tree = NULL, *lbl_tree = NULL; @@ -1252,16 +1252,16 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, guint offset,proto_tree *tr if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_sess_fr_merge, - tvb, offset, 1, FALSE); + tvb, offset, 1, FALSE); - /*get the number of label ranges*/ + /*get the number of label ranges*/ numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F; proto_tree_add_uint_format(val_tree, hf_ldp_tlv_sess_fr_lr, tvb, offset, 1, numlr, "Number of Label Range components: %u", - numlr); + numlr); proto_tree_add_item(val_tree, hf_ldp_tlv_sess_fr_dir, - tvb, offset, 1, FALSE); + tvb, offset, 1, FALSE); /*move into range components*/ offset += 4; @@ -1284,14 +1284,14 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, guint offset,proto_tree *tr if( lbl_tree == NULL ) break; len=(guint8)(tvb_get_ntohs(tvb, offset)>>7) & 0x03; - proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_fr_len, tvb, offset, 2, len, "Number of DLCI bits: %s (%u)", val_to_str(len, tlv_fr_len_vals, "Unknown Length"), len); + proto_tree_add_uint_format(lbl_tree, hf_ldp_tlv_sess_fr_len, tvb, offset, 2, len, "Number of DLCI bits: %s (%u)", val_to_str(len, tlv_fr_len_vals, "Unknown Length"), len); id=tvb_get_ntoh24(tvb, offset+1)&0x7FFFFF; - proto_tree_add_uint_format(lbl_tree, - hf_ldp_tlv_sess_fr_mindlci, tvb, offset+1, 3, id, "Minimum DLCI %u", id); + proto_tree_add_uint_format(lbl_tree, + hf_ldp_tlv_sess_fr_mindlci, tvb, offset+1, 3, id, "Minimum DLCI %u", id); id=tvb_get_ntoh24(tvb, offset+5)&0x7FFFFF; - proto_tree_add_uint_format(lbl_tree, - hf_ldp_tlv_sess_fr_maxdlci, tvb, offset+5, 3, id, "Maximum DLCI %u", id); + proto_tree_add_uint_format(lbl_tree, + hf_ldp_tlv_sess_fr_maxdlci, tvb, offset+5, 3, id, "Maximum DLCI %u", id); offset += 8; } @@ -1323,12 +1323,12 @@ dissect_tlv_lspid(tvbuff_t *tvb, guint offset,proto_tree *tree, int rem) if(val_tree != NULL) { proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_act_flg, - tvb, offset, 2, FALSE); + tvb, offset, 2, FALSE); offset += 2; proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_cr_lsp, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_ldpid, + proto_tree_add_item(val_tree, hf_ldp_tlv_lspid_ldpid, tvb, offset, 4, FALSE); } } @@ -1643,12 +1643,12 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) if (tree != NULL) { /*chk for vendor-private*/ if(type>=TLV_VENDOR_PRIVATE_START && type<=TLV_VENDOR_PRIVATE_END){ - typebak=type; /*keep type*/ + typebak=type; /*keep type*/ type=TLV_VENDOR_PRIVATE_START; /*chk for experimental*/ } else if(type>=TLV_EXPERIMENTAL_START && type<=TLV_EXPERIMENTAL_END){ - typebak=type; /*keep type*/ + typebak=type; /*keep type*/ type=TLV_EXPERIMENTAL_START; } @@ -1659,7 +1659,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(tlv_tree, hf_ldp_tlv_unknown, tvb, offset, 1, FALSE); - proto_tree_add_uint_format(tlv_tree, hf_ldp_tlv_type, tvb, offset, 2, type, "TLV Type: %s (0x%X)", val_to_str(type, tlv_type_names, "Unknown TLV type"), type ); + proto_tree_add_uint_format(tlv_tree, hf_ldp_tlv_type, tvb, offset, 2, type, "TLV Type: %s (0x%X)", val_to_str(type, tlv_type_names, "Unknown TLV type"), type ); proto_tree_add_item(tlv_tree, hf_ldp_tlv_len, tvb, offset + 2, 2, FALSE); @@ -1679,7 +1679,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Hop Count TLV: length is %d, should be 1", length); else - proto_tree_add_item(tlv_tree, hf_ldp_tlv_hc_value, tvb,offset + 4, length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_hc_value, tvb,offset + 4, length, FALSE); break; case TLV_PATH_VECTOR: @@ -1695,7 +1695,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) guint32 label=tvb_get_ntohl(tvb, offset+4) & 0x000FFFFF; proto_tree_add_uint_format(tlv_tree, hf_ldp_tlv_generic_label, - tvb, offset+4, length, label, "Generic Label: %u", label); + tvb, offset+4, length, label, "Generic Label: %u", label); } break; @@ -1717,7 +1717,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Extended Status TLV: length is %d, should be 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_extstatus_data, tvb, offset + 4, length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_extstatus_data, tvb, offset + 4, length, FALSE); } break; @@ -1766,8 +1766,8 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(tlv_tree, hf_ldp_tlv_ipv6_taddr, tvb, offset + 4, 16, FALSE); } break; - - case TLV_MAC: /* draft-lasserre-vkompella-ppvpn-vpls-02.txt */ + + case TLV_MAC: /* draft-lasserre-vkompella-ppvpn-vpls-02.txt */ dissect_tlv_mac(tvb, offset + 4, tlv_tree, length); break; @@ -1789,57 +1789,57 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Label Request Message ID TLV: length is %d, should be 4", length); else - proto_tree_add_item(tlv_tree, hf_ldp_tlv_lbl_req_msg_id, tvb,offset + 4,length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_lbl_req_msg_id, tvb,offset + 4,length, FALSE); break; case TLV_LSPID: dissect_tlv_lspid(tvb, offset + 4, tlv_tree, length); break; - + case TLV_ER: dissect_tlv_er(tvb, offset + 4, tlv_tree, length); break; - + case TLV_ER_HOP_IPV4: dissect_tlv_er_hop_ipv4(tvb, offset + 4, tlv_tree, length); break; - + case TLV_ER_HOP_IPV6: dissect_tlv_er_hop_ipv6(tvb, offset +4, tlv_tree, length); break; - + case TLV_ER_HOP_AS: dissect_tlv_er_hop_as(tvb, offset + 4, tlv_tree, length); break; - + case TLV_ER_HOP_LSPID: dissect_tlv_er_hop_lspid(tvb, offset +4, tlv_tree, length); break; - + case TLV_TRAFFIC_PARAM: dissect_tlv_traffic(tvb, offset +4, tlv_tree, length); break; - + case TLV_PREEMPTION: dissect_tlv_preemption(tvb, offset +4, tlv_tree, length); break; - + case TLV_RESOURCE_CLASS: dissect_tlv_resource_class(tvb, offset +4, tlv_tree, length); break; - + case TLV_ROUTE_PINNING: dissect_tlv_route_pinning(tvb, offset +4, tlv_tree, length); break; - + case TLV_VENDOR_PRIVATE_START: if( length < 4 ) /*error, at least Vendor ID*/ proto_tree_add_text(tlv_tree, tvb, offset + 4, length, "Error processing Vendor Private Start TLV: length is %d, should be >= 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_vendor_id, tvb,offset + 4, 4, FALSE); - if( length > 4 ) /*have data*/ + proto_tree_add_item(tlv_tree, hf_ldp_tlv_vendor_id, tvb,offset + 4, 4, FALSE); + if( length > 4 ) /*have data*/ proto_tree_add_text(tlv_tree, tvb, offset + 8, length-4,"Data"); } break; @@ -1850,8 +1850,8 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) "Error processing Experimental Start TLV: length is %d, should be >= 4", length); else { - proto_tree_add_item(tlv_tree, hf_ldp_tlv_experiment_id, tvb,offset + 4, 4, FALSE); - if( length > 4 ) /*have data*/ + proto_tree_add_item(tlv_tree, hf_ldp_tlv_experiment_id, tvb,offset + 4, 4, FALSE); + if( length > 4 ) /*have data*/ proto_tree_add_text(tlv_tree, tvb, offset + 8, length-4,"Data"); } break; @@ -1891,12 +1891,12 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) /*chk for vendor-private*/ if(type>=LDP_VENDOR_PRIVATE_START && type<=LDP_VENDOR_PRIVATE_END){ - typebak=type; /*keep type*/ + typebak=type; /*keep type*/ type=LDP_VENDOR_PRIVATE_START; extra=4; /*chk for experimental*/ } else if(type>=LDP_EXPERIMENTAL_MESSAGE_START && type<=LDP_EXPERIMENTAL_MESSAGE_END){ - typebak=type; /*keep type*/ + typebak=type; /*keep type*/ type=LDP_EXPERIMENTAL_MESSAGE_START; extra=4; } @@ -1910,7 +1910,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) length, 4+extra); return rem; } - rem -= 4; + rem -= 4; length = MIN(length, rem); /* Don't go haywire if a problem ... */ if( check_col(pinfo->cinfo, COL_INFO) ){ @@ -1926,7 +1926,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msg_tree, hf_ldp_msg_ubit, tvb, offset, 1, FALSE); type=tvb_get_ntohs(tvb, offset)&0x7FFF; - proto_tree_add_uint_format(msg_tree, hf_ldp_msg_type, tvb, offset, 2, type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); + proto_tree_add_uint_format(msg_tree, hf_ldp_msg_type, tvb, offset, 2, type, "Message Type: %s (0x%X)", val_to_str(type, ldp_message_types,"Unknown Message Type"), type); proto_tree_add_item(msg_tree, hf_ldp_msg_len, tvb, offset+2, 2, FALSE); proto_tree_add_item(msg_tree, hf_ldp_msg_id, tvb, offset+4, 4, FALSE); @@ -1944,17 +1944,17 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msg_tree, hf_tmp, tvb, offset+8, extra, FALSE); } } - + offset += (8+extra); length -= (4+extra); - - if( tree ) + + if( tree ) while( (length-ao) > 0 ) { co=dissect_tlv(tvb, offset, msg_tree, length-ao); offset += co; ao += co; } - + return length+8+extra; } @@ -1965,7 +1965,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0, co; int rem, length; proto_tree *ti=NULL, *pdu_tree = NULL; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDP"); @@ -2032,14 +2032,14 @@ dissect_ldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static int dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ +{ volatile gboolean first = TRUE; volatile int offset = 0; int length_remaining; guint16 plen; int length; tvbuff_t *next_tvb; - + while (tvb_reported_length_remaining(tvb, offset) != 0) { length_remaining = tvb_length_remaining(tvb, offset); @@ -2175,7 +2175,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register all the bits needed with the filtering engine */ -void +void proto_register_ldp(void) { static hf_register_info hf[] = { @@ -2207,19 +2207,19 @@ proto_register_ldp(void) { &hf_ldp_msg_len, { "Message Length", "ldp.msg.len", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP Message Length (excluding message type and len)", HFILL }}, - { &hf_ldp_msg_id, + { &hf_ldp_msg_id, { "Message ID", "ldp.msg.id", FT_UINT32, BASE_HEX, NULL, 0x0, "LDP Message ID", HFILL }}, - { &hf_ldp_msg_vendor_id, + { &hf_ldp_msg_vendor_id, { "Vendor ID", "ldp.msg.vendor.id", FT_UINT32, BASE_HEX, NULL, 0x0, "LDP Vendor-private Message ID", HFILL }}, - { &hf_ldp_msg_experiment_id, + { &hf_ldp_msg_experiment_id, { "Experiment ID", "ldp.msg.experiment.id", FT_UINT32, BASE_HEX, NULL, 0x0, "LDP Experimental Message ID", HFILL }}, - { &hf_ldp_tlv_unknown, + { &hf_ldp_tlv_unknown, { "TLV Unknown bits", "ldp.msg.tlv.unknown", FT_UINT8, BASE_HEX, VALS(tlv_unknown_vals), 0xC0, "TLV Unknown bits Field", HFILL }}, - { &hf_ldp_tlv_type, + { &hf_ldp_tlv_type, { "TLV Type", "ldp.msg.tlv.type", FT_UINT16, BASE_HEX, VALS(tlv_type_names), 0x3FFF, "TLV Type Field", HFILL }}, { &hf_ldp_tlv_len, @@ -2236,7 +2236,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_val_request, { "Hello Requested", "ldp,msg.tlv.hello.requested", FT_BOOLEAN, 16, TFS(&hello_requested_vals), 0x4000, "Hello Common Parameters Hello Requested Bit", HFILL }}, - + { &hf_ldp_tlv_val_res, { "Reserved", "ldp.msg.tlv.hello.res", FT_UINT16, BASE_HEX, NULL, 0x3FFF, "Hello Common Parameters Reserved Field", HFILL }}, @@ -2284,7 +2284,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_sess_advbit, { "Session Label Advertisement Discipline", "ldp.msg.tlv.sess.advbit", - FT_BOOLEAN, 8, TFS(&tlv_sess_advbit_vals), 0x80, + FT_BOOLEAN, 8, TFS(&tlv_sess_advbit_vals), 0x80, "Common Session Parameters Label Advertisement Discipline", HFILL }}, { &hf_ldp_tlv_sess_ldetbit, @@ -2341,7 +2341,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_sess_fr_maxdlci, { "Maximum DLCI", "ldp.msg.tlv.sess.fr.maxdlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, "Maximum DLCI", HFILL }}, - { &hf_ldp_tlv_lbl_req_msg_id, + { &hf_ldp_tlv_lbl_req_msg_id, { "Label Request Message ID", "ldp.tlv.lbl_req_msg_id", FT_UINT32, BASE_HEX, NULL, 0x0, "Label Request Message to be aborted", HFILL }}, { &hf_ldp_tlv_vendor_id, @@ -2377,7 +2377,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_status_data, { "Status Data", "ldp.msg.tlv.status.data", FT_UINT32, BASE_HEX, VALS(tlv_status_data), 0x3FFFFFFF, "Status Data", HFILL }}, - { &hf_ldp_tlv_status_msg_id, + { &hf_ldp_tlv_status_msg_id, { "Message ID", "ldp.msg.tlv.status.msg.id", FT_UINT32, BASE_HEX, NULL, 0x0, "Identifies peer message to which Status TLV refers", HFILL }}, { &hf_ldp_tlv_status_msg_type, @@ -2398,7 +2398,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_returned_ls_id, { "Returned PDU Label Space ID", "ldp.msg.tlv.returned.ldpid.lsid", FT_UINT16, BASE_HEX, NULL, 0x0, "LDP Label Space ID", HFILL }}, - { &hf_ldp_tlv_returned_msg_ubit, + { &hf_ldp_tlv_returned_msg_ubit, { "Returned Message Unknown bit", "ldp.msg.tlv.returned.msg.ubit", FT_UINT8, BASE_HEX, TFS(&ldp_message_ubit), 0x80, "Message Unknown bit", HFILL }}, { &hf_ldp_tlv_returned_msg_type, @@ -2407,7 +2407,7 @@ proto_register_ldp(void) { &hf_ldp_tlv_returned_msg_len, { "Returned Message Length", "ldp.msg.tlv.returned.msg.len", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP Message Length (excluding message type and len)", HFILL }}, - { &hf_ldp_tlv_returned_msg_id, + { &hf_ldp_tlv_returned_msg_id, { "Returned Message ID", "ldp.msg.tlv.returned.msg.id", FT_UINT32, BASE_HEX, NULL, 0x0, "LDP Message ID", HFILL }}, { &hf_ldp_tlv_mac, @@ -2471,67 +2471,67 @@ proto_register_ldp(void) { "IPv4 Address", "ldp.msg.tlv.er_hop.prefix4", FT_IPv4, BASE_DEC, NULL, 0x0, "IPv4 Address", HFILL}}, { &hf_ldp_tlv_er_hop_prefix6, { "IPv6 Address", "ldp.msg.tlv.er_hop.prefix6", FT_IPv6, BASE_DEC, NULL, 0x0, "IPv6 Address", HFILL}}, - + { &hf_ldp_tlv_er_hop_as, { "AS Number", "ldp.msg.tlv.er_hop.as", FT_UINT16, BASE_DEC, NULL, 0x0, "AS Number", HFILL}}, - + { &hf_ldp_tlv_er_hop_cr_lsp, { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.locallspid", FT_UINT16, BASE_DEC, NULL, 0x0, "Local CR-LSP ID", HFILL}}, - + { &hf_ldp_tlv_er_hop_ldpid, { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.lsrid", FT_IPv4, BASE_DEC, NULL, 0x0, "Local CR-LSP ID", HFILL}}, { &hf_ldp_tlv_flags_reserv, { "Reserved", "ldp.msg.tlv.flags_reserv", FT_UINT8, BASE_HEX, NULL, 0xC0, "Reserved", HFILL}}, - + { &hf_ldp_tlv_flags_pdr, { "PDR", "ldp.msg.tlv.flags_pdr", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x1, "PDR negotiability flag", HFILL}}, - + { &hf_ldp_tlv_flags_pbs, { "PBS", "ldp.msg.tlv.flags_pbs", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x2, "PBS negotiability flag", HFILL}}, - + { &hf_ldp_tlv_flags_cdr, { "CDR", "ldp.msg.tlv.flags_cdr", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x4, "CDR negotiability flag", HFILL}}, - + { &hf_ldp_tlv_flags_cbs, { "CBS", "ldp.msg.tlv.flags_cbs", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x8, "CBS negotiability flag", HFILL}}, - + { &hf_ldp_tlv_flags_ebs, { "EBS", "ldp.msg.tlv.flags_ebs", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x10, "EBS negotiability flag", HFILL}}, - + { &hf_ldp_tlv_flags_weight, { "Weight", "ldp.msg.tlv.flags_weight", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x20, "Weight negotiability flag", HFILL}}, - + { &hf_ldp_tlv_frequency, { "Frequency", "ldp.msg.tlv.frequency", FT_UINT8, BASE_DEC, VALS(freq_values), 0, "Frequency", HFILL}}, - + { &hf_ldp_tlv_weight, { "Weight", "ldp.msg.tlv.weight", FT_UINT8, BASE_DEC, NULL, 0, "Weight of the CR-LSP", HFILL}}, - + { &hf_ldp_tlv_pdr, { "PDR", "ldp.msg.tlv.pdr", FT_DOUBLE, BASE_NONE, NULL, 0, "Peak Data Rate", HFILL}}, - + { &hf_ldp_tlv_pbs, { "PBS", "ldp.msg.tlv.pbs", FT_DOUBLE, BASE_NONE, NULL, 0, "Peak Burst Size", HFILL}}, - + { &hf_ldp_tlv_cdr, { "CDR", "ldp.msg.tlv.cdr", FT_DOUBLE, BASE_NONE, NULL, 0, "Committed Data Rate", HFILL}}, - + { &hf_ldp_tlv_cbs, { "CBS", "ldp.msg.tlv.cbs", FT_DOUBLE, BASE_NONE, NULL, 0, "Committed Burst Size", HFILL}}, - + { &hf_ldp_tlv_ebs, { "EBS", "ldp.msg.tlv.ebs", FT_DOUBLE, BASE_NONE, NULL, 0, "Excess Burst Size", HFILL}}, - + { &hf_ldp_tlv_set_prio, { "Set Prio", "ldp.msg.tlv.set_prio", FT_UINT8, BASE_DEC, NULL, 0, "LSP setup priority", HFILL}}, - + { &hf_ldp_tlv_hold_prio, { "Hold Prio", "ldp.msg.tlv.hold_prio", FT_UINT8, BASE_DEC, NULL, 0, "LSP hold priority", HFILL}}, { &hf_ldp_tlv_route_pinning, { "Route Pinning", "ldp.msg.tlv.route_pinning", FT_UINT32, BASE_DEC, VALS(route_pinning_vals), 0x80000000, "Route Pinning", HFILL}}, - + { &hf_ldp_tlv_resource_class, { "Resource Class", "ldp.msg.tlv.resource_class", FT_UINT32, BASE_HEX, NULL, 0, "Resource Class (Color)", HFILL}}, @@ -2547,7 +2547,7 @@ proto_register_ldp(void) &ett_ldp_fec, &ett_ldp_fec_vc_interfaceparam }; - module_t *ldp_module; + module_t *ldp_module; proto_ldp = proto_register_protocol("Label Distribution Protocol", "LDP", "ldp"); diff --git a/packet-llc.c b/packet-llc.c index a8dcd82f08..fb1fd55253 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,22 +2,22 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-llc.c,v 1.99 2002/08/02 23:35:53 jmayer Exp $ + * $Id: packet-llc.c,v 1.100 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -218,7 +218,7 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) { break; } } - } + } else { /* non-SNAP */ if (XDLC_IS_INFORMATION(control)) { @@ -267,18 +267,18 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE); llc_tree = proto_item_add_subtree(ti, ett_llc); - proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0, + proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0, 1, dsap & SAP_MASK); - proto_tree_add_boolean(llc_tree, hf_llc_dsap_ig, tvb, 0, + proto_tree_add_boolean(llc_tree, hf_llc_dsap_ig, tvb, 0, 1, dsap & DSAP_GI_BIT); } else llc_tree = NULL; ssap = tvb_get_guint8(tvb, 1); if (tree) { - proto_tree_add_uint(llc_tree, hf_llc_ssap, tvb, 1, + proto_tree_add_uint(llc_tree, hf_llc_ssap, tvb, 1, 1, ssap & SAP_MASK); - proto_tree_add_boolean(llc_tree, hf_llc_ssap_cr, tvb, 1, + proto_tree_add_boolean(llc_tree, hf_llc_ssap_cr, tvb, 1, 1, ssap & SSAP_CR_BIT); } else llc_tree = NULL; @@ -308,7 +308,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "; DSAP %s %s, SSAP %s %s", val_to_str(dsap & SAP_MASK, sap_vals, "%02x"), dsap & DSAP_GI_BIT ? @@ -434,7 +434,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, break; } break; - + case OUI_CISCO: /* So are all CDP packets LLC packets with an OUI of OUI_CISCO and a @@ -484,36 +484,36 @@ proto_register_llc(void) static hf_register_info hf[] = { { &hf_llc_dsap, - { "DSAP", "llc.dsap", FT_UINT8, BASE_HEX, + { "DSAP", "llc.dsap", FT_UINT8, BASE_HEX, VALS(sap_vals), 0x0, "", HFILL }}, { &hf_llc_dsap_ig, - { "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX, + { "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX, &ig_bit, 0x0, "Individual/Group", HFILL }}, { &hf_llc_ssap, - { "SSAP", "llc.ssap", FT_UINT8, BASE_HEX, + { "SSAP", "llc.ssap", FT_UINT8, BASE_HEX, VALS(sap_vals), 0x0, "", HFILL }}, { &hf_llc_ssap_cr, - { "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX, + { "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX, &cr_bit, 0x0, "Command/Response", HFILL }}, { &hf_llc_ctrl, - { "Control", "llc.control", FT_UINT16, BASE_HEX, + { "Control", "llc.control", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* registered here but handled in ethertype.c */ { &hf_llc_type, - { "Type", "llc.type", FT_UINT16, BASE_HEX, + { "Type", "llc.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, "", HFILL }}, { &hf_llc_oui, - { "Organization Code", "llc.oui", FT_UINT24, BASE_HEX, + { "Organization Code", "llc.oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, "", HFILL }}, { &hf_llc_pid, - { "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX, + { "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }} }; static gint *ett[] = { diff --git a/packet-llc.h b/packet-llc.h index 45b55f3afc..c9e5bc7ec7 100644 --- a/packet-llc.h +++ b/packet-llc.h @@ -1,21 +1,21 @@ /* packet-llc.h * - * $Id: packet-llc.h,v 1.7 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-llc.h,v 1.8 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-lmi.c b/packet-lmi.c index 5b7b125a0f..274c9f106b 100644 --- a/packet-lmi.c +++ b/packet-lmi.c @@ -2,22 +2,22 @@ * Routines for Frame Relay Local Management Interface (LMI) disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-lmi.c,v 1.10 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-lmi.c,v 1.11 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,7 +49,7 @@ static int hf_lmi_call_ref = -1; static int hf_lmi_msg_type = -1; static int hf_lmi_inf_ele = -1; static int hf_lmi_inf_len = -1; - + static int hf_lmi_rcd_type = -1; static int hf_lmi_send_seq = -1; static int hf_lmi_recv_seq = -1; @@ -159,7 +159,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ele_id = tvb_get_guint8( tvb, offset); len = tvb_get_guint8( tvb, offset + 1); - ti = proto_tree_add_uint(lmi_tree, hf_lmi_inf_ele, tvb, offset, len + 2, + ti = proto_tree_add_uint(lmi_tree, hf_lmi_inf_ele, tvb, offset, len + 2, tvb_get_guint8( tvb, offset)); lmi_subtree = proto_item_add_subtree(ti, ett_lmi_ele); @@ -170,14 +170,14 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_get_guint8( tvb, offset); proto_tree_add_uint(lmi_subtree, hf_lmi_inf_len, tvb, offset, 1, len); ++offset; - if (( ele_id == 1) || (ele_id == 51)) + if (( ele_id == 1) || (ele_id == 51)) dissect_lmi_report_type( tvb, offset, lmi_subtree); - else if (( ele_id == 3) || (ele_id == 53)) + else if (( ele_id == 3) || (ele_id == 53)) dissect_lmi_link_int( tvb, offset, lmi_subtree); - else if (( ele_id == 7) || (ele_id == 57)) + else if (( ele_id == 7) || (ele_id == 57)) dissect_lmi_pvc_status( tvb, offset, lmi_subtree); offset += len; - } + } } else { lmi_tree = NULL; @@ -190,11 +190,11 @@ proto_register_lmi(void) { static hf_register_info hf[] = { { &hf_lmi_call_ref, - { "Call reference", "lmi.cmd", FT_UINT8, BASE_HEX, NULL, 0, + { "Call reference", "lmi.cmd", FT_UINT8, BASE_HEX, NULL, 0, "Call Reference", HFILL }}, { &hf_lmi_msg_type, - { "Message Type", "lmi.msg_type", FT_UINT8, BASE_HEX, VALS(msg_type_str), 0, + { "Message Type", "lmi.msg_type", FT_UINT8, BASE_HEX, VALS(msg_type_str), 0, "Message Type", HFILL }}, { &hf_lmi_inf_ele, diff --git a/packet-lmp.c b/packet-lmp.c index 88b20b2f9e..c4ac15a10e 100644 --- a/packet-lmp.c +++ b/packet-lmp.c @@ -3,22 +3,22 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-lmp.c,v 1.11 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-lmp.c,v 1.12 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,8 +27,8 @@ /* * LMP as a standard has shown a remarkable ability to get completely rewritten * across minor versions of the draft. This file currently implements - * two versions of LMP; described in draft-ietf-ccamp-lmp-02.txt and - * draft-ietf-ccamp-lmp-03.txt. The -03 version is the default; the + * two versions of LMP; described in draft-ietf-ccamp-lmp-02.txt and + * draft-ietf-ccamp-lmp-03.txt. The -03 version is the default; the * version being dissected can be changed from the LMP protocol preferences */ @@ -69,13 +69,13 @@ static int lmp_draft_ver = LMP_VER_DRAFT_CCAMP_03; * LMP message types */ typedef enum { - LMP_MSG_CONFIG=1, - LMP_MSG_CONFIG_ACK, - LMP_MSG_CONFIG_NACK, + LMP_MSG_CONFIG=1, + LMP_MSG_CONFIG_ACK, + LMP_MSG_CONFIG_NACK, LMP_MSG_HELLO, - LMP_MSG_BEGIN_VERIFY, - LMP_MSG_BEGIN_VERIFY_ACK, - LMP_MSG_BEGIN_VERIFY_NACK, + LMP_MSG_BEGIN_VERIFY, + LMP_MSG_BEGIN_VERIFY_ACK, + LMP_MSG_BEGIN_VERIFY_NACK, LMP_MSG_END_VERIFY, LMP_MSG_END_VERIFY_ACK, LMP_MSG_TEST, @@ -94,7 +94,7 @@ typedef enum { LMP_MSG_CHANNEL_STATUS_RESP, } lmp_message_types; -static value_string message_type_vals[] = { +static value_string message_type_vals[] = { {LMP_MSG_CONFIG, "Config Message. "}, {LMP_MSG_CONFIG_ACK, "ConfigAck Message. "}, {LMP_MSG_CONFIG_NACK, "ConfigNack Message. "}, @@ -152,26 +152,26 @@ typedef enum { static value_string lmp_class_vals[] = { - {LMP_CLASS_LOCAL_CCID, "LOCAL_CCID"}, - {LMP_CLASS_REMOTE_CCID, "REMOTE_CCID"}, - {LMP_CLASS_LOCAL_NODE_ID, "LOCAL_NODE_ID"}, - {LMP_CLASS_REMOTE_NODE_ID, "REMOTE_NODE_ID"}, - {LMP_CLASS_LOCAL_LINK_ID, "LOCAL_LINK_ID"}, - {LMP_CLASS_REMOTE_LINK_ID, "REMOTE_LINK_ID"}, - {LMP_CLASS_LOCAL_INTERFACE_ID, "LOCAL_INTERFACE_ID"}, - {LMP_CLASS_REMOTE_INTERFACE_ID, "REMOTE_INTERFACE_ID"}, - {LMP_CLASS_MESSAGE_ID, "MESSAGE_ID"}, - {LMP_CLASS_MESSAGE_ID_ACK, "MESSAGE_ID_ACK"}, - {LMP_CLASS_CONFIG, "CONFIG"}, - {LMP_CLASS_HELLO, "HELLO"}, - {LMP_CLASS_BEGIN_VERIFY, "BEGIN_VERIFY"}, - {LMP_CLASS_BEGIN_VERIFY_ACK, "BEGIN_VERIFY_ACK"}, - {LMP_CLASS_VERIFY_ID, "VERIFY_ID"}, - {LMP_CLASS_TE_LINK, "TE_LINK"}, - {LMP_CLASS_DATA_LINK, "DATA_LINK"}, - {LMP_CLASS_CHANNEL_STATUS, "CHANNEL_STATUS"}, - {LMP_CLASS_CHANNEL_STATUS_REQUEST, "CHANNEL_STATUS_REQUEST"}, - {LMP_CLASS_ERROR, "ERROR"}, + {LMP_CLASS_LOCAL_CCID, "LOCAL_CCID"}, + {LMP_CLASS_REMOTE_CCID, "REMOTE_CCID"}, + {LMP_CLASS_LOCAL_NODE_ID, "LOCAL_NODE_ID"}, + {LMP_CLASS_REMOTE_NODE_ID, "REMOTE_NODE_ID"}, + {LMP_CLASS_LOCAL_LINK_ID, "LOCAL_LINK_ID"}, + {LMP_CLASS_REMOTE_LINK_ID, "REMOTE_LINK_ID"}, + {LMP_CLASS_LOCAL_INTERFACE_ID, "LOCAL_INTERFACE_ID"}, + {LMP_CLASS_REMOTE_INTERFACE_ID, "REMOTE_INTERFACE_ID"}, + {LMP_CLASS_MESSAGE_ID, "MESSAGE_ID"}, + {LMP_CLASS_MESSAGE_ID_ACK, "MESSAGE_ID_ACK"}, + {LMP_CLASS_CONFIG, "CONFIG"}, + {LMP_CLASS_HELLO, "HELLO"}, + {LMP_CLASS_BEGIN_VERIFY, "BEGIN_VERIFY"}, + {LMP_CLASS_BEGIN_VERIFY_ACK, "BEGIN_VERIFY_ACK"}, + {LMP_CLASS_VERIFY_ID, "VERIFY_ID"}, + {LMP_CLASS_TE_LINK, "TE_LINK"}, + {LMP_CLASS_DATA_LINK, "DATA_LINK"}, + {LMP_CLASS_CHANNEL_STATUS, "CHANNEL_STATUS"}, + {LMP_CLASS_CHANNEL_STATUS_REQUEST, "CHANNEL_STATUS_REQUEST"}, + {LMP_CLASS_ERROR, "ERROR"}, }; #define VALID_CLASS(class) ((class) > LMP_CLASS_NULL && (class) < LMP_CLASS_MAX) @@ -203,11 +203,11 @@ enum lmp_filter_keys { LMPF_MSG_CONFIG, LMPF_MSG_CONFIG_ACK, - LMPF_MSG_CONFIG_NACK, + LMPF_MSG_CONFIG_NACK, LMPF_MSG_HELLO, - LMPF_MSG_BEGIN_VERIFY, - LMPF_MSG_BEGIN_VERIFY_ACK, - LMPF_MSG_BEGIN_VERIFY_NACK, + LMPF_MSG_BEGIN_VERIFY, + LMPF_MSG_BEGIN_VERIFY_ACK, + LMPF_MSG_BEGIN_VERIFY_NACK, LMPF_MSG_END_VERIFY, LMPF_MSG_END_VERIFY_ACK, LMPF_MSG_TEST, @@ -327,383 +327,383 @@ static int lmp_filter[LMPF_MAX]; static hf_register_info lmpf_info[] = { /* Message type number */ - {&lmp_filter[LMPF_MSG], + {&lmp_filter[LMPF_MSG], { "Message Type", "lmp.msg", FT_UINT8, BASE_DEC, VALS(message_type_vals), 0x0, "", HFILL }}, /* Message type shorthands */ - {&lmp_filter[LMPF_MSG_CONFIG], + {&lmp_filter[LMPF_MSG_CONFIG], { "Config Message", "lmp.msg.config", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CONFIG_ACK], + {&lmp_filter[LMPF_MSG_CONFIG_ACK], { "ConfigAck Message", "lmp.msg.configack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CONFIG_NACK], + {&lmp_filter[LMPF_MSG_CONFIG_NACK], { "ConfigNack Message", "lmp.msg.confignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_HELLO], + {&lmp_filter[LMPF_MSG_HELLO], { "HELLO Message", "lmp.msg.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_BEGIN_VERIFY], + {&lmp_filter[LMPF_MSG_BEGIN_VERIFY], { "BeginVerify Message", "lmp.msg.beginverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_ACK], + {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_ACK], { "BeginVerifyAck Message", "lmp.msg.beginverifyack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_NACK], + {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_NACK], { "BeginVerifyNack Message", "lmp.msg.beginverifynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_END_VERIFY], + {&lmp_filter[LMPF_MSG_END_VERIFY], { "EndVerify Message", "lmp.msg.endverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_TEST], + {&lmp_filter[LMPF_MSG_TEST], { "Test Message", "lmp.msg.test", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_TEST_STATUS_SUCCESS], + {&lmp_filter[LMPF_MSG_TEST_STATUS_SUCCESS], { "TestStatusSuccess Message", "lmp.msg.teststatussuccess", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_TEST_STATUS_FAILURE], + {&lmp_filter[LMPF_MSG_TEST_STATUS_FAILURE], { "TestStatusFailure Message", "lmp.msg.teststatusfailure", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_TEST_STATUS_ACK], + {&lmp_filter[LMPF_MSG_TEST_STATUS_ACK], { "TestStatusAck Message", "lmp.msg.teststatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_LINK_SUMMARY], + {&lmp_filter[LMPF_MSG_LINK_SUMMARY], { "LinkSummary Message", "lmp.msg.linksummary", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_LINK_SUMMARY_ACK], + {&lmp_filter[LMPF_MSG_LINK_SUMMARY_ACK], { "LinkSummaryAck Message", "lmp.msg.linksummaryack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_LINK_SUMMARY_NACK], + {&lmp_filter[LMPF_MSG_LINK_SUMMARY_NACK], { "LinkSummaryNack Message", "lmp.msg.linksummarynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_FAIL], + {&lmp_filter[LMPF_MSG_CHANNEL_FAIL], { "ChannelFail Message", "lmp.msg.channelfail", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_FAIL_ACK], + {&lmp_filter[LMPF_MSG_CHANNEL_FAIL_ACK], { "ChannelFailAck Message", "lmp.msg.channelfailack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_FAIL_NACK], + {&lmp_filter[LMPF_MSG_CHANNEL_FAIL_NACK], { "ChannelFailNack Message", "lmp.msg.channelfailnack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_STATUS], + {&lmp_filter[LMPF_MSG_CHANNEL_STATUS], { "ChannelStatus Message", "lmp.msg.channelstatus", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_ACK], + {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_ACK], { "ChannelStatusAck Message", "lmp.msg.channelstatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_REQ], + {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_REQ], { "ChannelStatusRequest Message", "lmp.msg.channelstatusrequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_RESP], + {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_RESP], { "ChannelStatusResponse Message", "lmp.msg.channelstatusresponse", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - + /* LMP Message Header Fields ------------------- */ - - {&lmp_filter[LMPF_HDR_FLAGS], + + {&lmp_filter[LMPF_HDR_FLAGS], { "LMP Header - Flags", "lmp.hdr.flags", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_HDR_FLAGS_CC_DOWN], + {&lmp_filter[LMPF_HDR_FLAGS_CC_DOWN], { "ControlChannelDown", "lmp.hdr.ccdown", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_HDR_FLAGS_REBOOT], + {&lmp_filter[LMPF_HDR_FLAGS_REBOOT], { "Reboot", "lmp.hdr.reboot", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_HDR_FLAGS_DWDM], + {&lmp_filter[LMPF_HDR_FLAGS_DWDM], { "DWDM Node", "lmp.hdr.dwdm", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }}, - {&lmp_filter[LMPF_HDR_FLAGS_AUTHENTICATION], + {&lmp_filter[LMPF_HDR_FLAGS_AUTHENTICATION], { "Authentication", "lmp.hdr.auth", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }}, /* LMP object class filters ------------------------------- */ - {&lmp_filter[LMPF_OBJECT], + {&lmp_filter[LMPF_OBJECT], { "LOCAL_CCID", "lmp.object", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_LOCAL_CCID], + {&lmp_filter[LMPF_CLASS_LOCAL_CCID], { "LOCAL_CCID", "lmp.obj.local_ccid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_REMOTE_CCID], + {&lmp_filter[LMPF_CLASS_REMOTE_CCID], { "REMOTE_CCID", "lmp.obj.remote_ccid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_LOCAL_NODE_ID], + {&lmp_filter[LMPF_CLASS_LOCAL_NODE_ID], { "LOCAL_NODE_ID", "lmp.obj.local_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_REMOTE_NODE_ID], + {&lmp_filter[LMPF_CLASS_REMOTE_NODE_ID], { "REMOTE_NODE_ID", "lmp.obj.remote_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_LOCAL_NODE_ID], + {&lmp_filter[LMPF_CLASS_LOCAL_NODE_ID], { "LOCAL_NODE_ID", "lmp.obj.local_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_REMOTE_NODE_ID], + {&lmp_filter[LMPF_CLASS_REMOTE_NODE_ID], { "REMOTE_NODE_ID", "lmp.obj.remote_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_LOCAL_LINK_ID], + {&lmp_filter[LMPF_CLASS_LOCAL_LINK_ID], { "LOCAL_LINK_ID", "lmp.obj.local_linkid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_REMOTE_LINK_ID], + {&lmp_filter[LMPF_CLASS_REMOTE_LINK_ID], { "REMOTE_LINK_ID", "lmp.obj.remote_linkid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_LOCAL_INTERFACE_ID], + {&lmp_filter[LMPF_CLASS_LOCAL_INTERFACE_ID], { "LOCAL_INTERFACE_ID", "lmp.obj.local_interfaceid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_REMOTE_INTERFACE_ID], + {&lmp_filter[LMPF_CLASS_REMOTE_INTERFACE_ID], { "REMOTE_INTERFACE_ID", "lmp.obj.remote_interfaceid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_MESSAGE_ID], + {&lmp_filter[LMPF_CLASS_MESSAGE_ID], { "MESSAGE_ID", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_MESSAGE_ID_ACK], + {&lmp_filter[LMPF_CLASS_MESSAGE_ID_ACK], { "MESSAGE_ID_ACK", "lmp.obj.messageid_ack", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_CONFIG], + {&lmp_filter[LMPF_CLASS_CONFIG], { "CONFIG", "lmp.obj.config", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_HELLO], + {&lmp_filter[LMPF_CLASS_HELLO], { "HELLO", "lmp.obj.hello", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY], + {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY], { "BEGIN_VERIFY", "lmp.obj.begin_verify", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY_ACK], + {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY_ACK], { "BEGIN_VERIFY_ACK", "lmp.obj.begin_verify_ack", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_VERIFY_ID], + {&lmp_filter[LMPF_CLASS_VERIFY_ID], { "VERIFY_ID", "lmp.obj.verifyid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_TE_LINK], + {&lmp_filter[LMPF_CLASS_TE_LINK], { "TE_LINK", "lmp.obj.te_link", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_DATA_LINK], + {&lmp_filter[LMPF_CLASS_DATA_LINK], { "DATA_LINK", "lmp.obj.data_link", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS], + {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS], { "CHANNEL_STATUS", "lmp.obj.channel_status", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS_REQUEST], + {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS_REQUEST], { "CHANNEL_STATUS_REQUEST", "lmp.obj.channel_status_request", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_CLASS_ERROR], + {&lmp_filter[LMPF_CLASS_ERROR], { "ERROR", "lmp.obj.error", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, /* Other LMP Value Filters ------------------------------ */ - {&lmp_filter[LMPF_VAL_CTYPE], + {&lmp_filter[LMPF_VAL_CTYPE], { "Object C-Type", "lmp.obj.ctype", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_CCID], + {&lmp_filter[LMPF_VAL_LOCAL_CCID], { "Local CCID Value", "lmp.local_ccid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_CCID], + {&lmp_filter[LMPF_VAL_REMOTE_CCID], { "Remote CCID Value", "lmp.remote_ccid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_NODE_ID], + {&lmp_filter[LMPF_VAL_LOCAL_NODE_ID], { "Local Node ID Value", "lmp.local_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_NODE_ID], + {&lmp_filter[LMPF_VAL_REMOTE_NODE_ID], { "Remote Node ID Value", "lmp.remote_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_IPV4], + {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_IPV4], { "Local Link ID - IPv4", "lmp.local_linkid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_UNNUM], + {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_UNNUM], { "Local Link ID - Unnumbered", "lmp.local_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_IPV4], + {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_IPV4], { "Remote Link ID - IPv4", "lmp.remote_linkid_ipv4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_UNNUM], + {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_UNNUM], { "Remote Link ID - Unnumbered", "lmp.remote_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_IPV4], + {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_IPV4], { "Local Interface ID - IPv4", "lmp.local_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM], + {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM], { "Local Interface ID - Unnumbered", "lmp.local_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_IPV4], + {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_IPV4], { "Remote Interface ID - IPv4", "lmp.remote_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM], + {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM], { "Remote Interface ID - Unnumbered", "lmp.remote_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - - {&lmp_filter[LMPF_VAL_MESSAGE_ID], + + {&lmp_filter[LMPF_VAL_MESSAGE_ID], { "Message-ID Value", "lmp.messageid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_MESSAGE_ID_ACK], + {&lmp_filter[LMPF_VAL_MESSAGE_ID_ACK], { "Message-ID Ack Value", "lmp.messageid_ack", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_CONFIG_HELLO], + {&lmp_filter[LMPF_VAL_CONFIG_HELLO], { "HelloInterval", "lmp.hellointerval", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD], + {&lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD], { "HelloDeadInterval", "lmp.hellodeadinterval", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_HELLO_TXSEQ], + {&lmp_filter[LMPF_VAL_HELLO_TXSEQ], { "TxSeqNum", "lmp.txseqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_HELLO_RXSEQ], + {&lmp_filter[LMPF_VAL_HELLO_RXSEQ], { "RxSeqNum", "lmp.rxseqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS], + {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS], { "Flags", "lmp.begin_verify.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS], - { "Verify All Links", "lmp.begin_verify.all_links", + {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS], + { "Verify All Links", "lmp.begin_verify.all_links", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE], - { "Data Link Type", "lmp.begin_verify.link_type", + {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE], + { "Data Link Type", "lmp.begin_verify.link_type", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE], + {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE], { "Encoding Type", "lmp.begin_verify.enctype", FT_UINT8, BASE_DEC, VALS(gmpls_lsp_enc_str), 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_VERIFY_ID], + {&lmp_filter[LMPF_VAL_VERIFY_ID], { "Verify-ID", "lmp.verifyid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS], + {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS], { "TE-Link Flags", "lmp.te_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT], - { "Fault Management Supported", "lmp.te_link.fault_mgmt", + {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT], + { "Fault Management Supported", "lmp.te_link.fault_mgmt", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY], - { "Link Verification Supported", "lmp.te_link.link_verify", + {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY], + { "Link Verification Supported", "lmp.te_link.link_verify", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4], + {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4], { "TE-Link Local ID - IPv4", "lmp.te_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM], + {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM], { "TE-Link Local ID - Unnumbered", "lmp.te_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4], + {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4], { "TE-Link Remote ID - IPv4", "lmp.te_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM], + {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM], { "TE-Link Remote ID - Unnumbered", "lmp.te_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS], + {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS], { "Data-Link Flags", "lmp.data_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT], - { "Data-Link is Individual Port", "lmp.data_link.port", + {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT], + { "Data-Link is Individual Port", "lmp.data_link.port", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED], - { "Data-Link is Allocated", "lmp.data_link.link_verify", + {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED], + { "Data-Link is Allocated", "lmp.data_link.link_verify", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4], + {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4], { "Data-Link Local ID - IPv4", "lmp.data_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM], + {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM], { "Data-Link Local ID - Unnumbered", "lmp.data_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4], + {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4], { "Data-Link Remote ID - IPv4", "lmp.data_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM], + {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM], { "Data-Link Remote ID - Unnumbered", "lmp.data_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ], + {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ], { "Subobject", "lmp.data_link_subobj", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE], - { "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC, + {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE], + { "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC, VALS(gmpls_switching_type_str), 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING], - { "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC, + {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING], + { "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC, VALS(gmpls_lsp_enc_str), 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR], + {&lmp_filter[LMPF_VAL_ERROR], { "Error Code", "lmp.error", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], - { "Verification - Unsupported for this TE-Link", "lmp.error.verify_unsupported_link", + {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], + { "Verification - Unsupported for this TE-Link", "lmp.error.verify_unsupported_link", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], - { "Verification - Unwilling to Verify at this time", "lmp.error.verify_unwilling", + {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], + { "Verification - Unwilling to Verify at this time", "lmp.error.verify_unwilling", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], - { "Verification - Transport Unsupported", "lmp.error.verify_unsupported_transport", + {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], + { "Verification - Transport Unsupported", "lmp.error.verify_unsupported_transport", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], - { "Verification - TE Link ID Configuration Error", "lmp.error.verify_te_link_id", + {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], + { "Verification - TE Link ID Configuration Error", "lmp.error.verify_te_link_id", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], - { "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params", + {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], + { "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], - { "Summary - Renegotiate Parametere", "lmp.error.summary_renegotiate", + {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], + { "Summary - Renegotiate Parametere", "lmp.error.summary_renegotiate", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], - { "Summary - Bad Remote Link ID", "lmp.error.summary_bad_remote_linkid", + {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], + { "Summary - Bad Remote Link ID", "lmp.error.summary_bad_remote_linkid", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], - { "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link", + {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], + { "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK], - { "Summary - Bad Data Link Object", "lmp.error.summary_bad_data_link", + {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK], + { "Summary - Bad Data Link Object", "lmp.error.summary_bad_data_link", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS], - { "Config - Unacceptable non-negotiable parameters", "lmp.error.config_bad_params", + {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS], + { "Config - Unacceptable non-negotiable parameters", "lmp.error.config_bad_params", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE], - { "Config - Renegotiate Parametere", "lmp.error.config_renegotiate", + {&lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE], + { "Config - Renegotiate Parametere", "lmp.error.config_renegotiate", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }}, - {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID], - { "Config - Bad CC ID", "lmp.error.config_bad_ccid", + {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID], + { "Config - Bad CC ID", "lmp.error.config_bad_ccid", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }}, }; @@ -742,21 +742,21 @@ static gint lmp_subtree[NUM_LMP_SUBTREES]; static int lmp_class_to_subtree(int class) { - if (VALID_CLASS(class)) + if (VALID_CLASS(class)) return lmp_subtree[LMP_TREE_CLASS_START + class]; return -1; } /*------------------------------------------------------------------------------ - * Da code + * Da code */ -static void -dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void +dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; - proto_tree *lmp_tree = NULL, *ti, *ti2; + proto_tree *lmp_tree = NULL, *ti, *ti2; proto_tree *lmp_header_tree; proto_tree *lmp_header_flags_tree; proto_tree *lmp_object_tree; @@ -785,7 +785,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_type = tvb_get_guint8(tvb, offset+3); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, - val_to_str(message_type, message_type_vals, "Unknown (%u). ")); + val_to_str(message_type, message_type_vals, "Unknown (%u). ")); } if (tree) { @@ -794,13 +794,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FALSE); lmp_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_MAIN]); - ti = proto_tree_add_text(lmp_tree, tvb, offset, 12, "LMP Header. %s", - val_to_str(message_type, message_type_vals, - "Unknown Message (%u). ")); + ti = proto_tree_add_text(lmp_tree, tvb, offset, 12, "LMP Header. %s", + val_to_str(message_type, message_type_vals, + "Unknown Message (%u). ")); lmp_header_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_HEADER]); - proto_tree_add_text(lmp_header_tree, tvb, offset, 1, "LMP Version: %u", - version); + proto_tree_add_text(lmp_header_tree, tvb, offset, 1, "LMP Version: %u", + version); ti = proto_tree_add_text(lmp_header_tree, tvb, offset+2, 1, "Flags: %02x", flags); lmp_header_flags_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_HEADER_FLAGS]); @@ -812,20 +812,20 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset+2, 1, flags); proto_tree_add_boolean(lmp_header_flags_tree, lmp_filter[LMPF_HDR_FLAGS_AUTHENTICATION], tvb, offset+2, 1, flags); - proto_tree_add_uint(lmp_header_tree, lmp_filter[LMPF_MSG], tvb, + proto_tree_add_uint(lmp_header_tree, lmp_filter[LMPF_MSG], tvb, offset+3, 1, message_type); proto_tree_add_text(lmp_header_tree, tvb, offset+4, 2, "Length: %d bytes", msg_length); if (LMPF_MSG + message_type <= LMPF_MSG_CHANNEL_STATUS_RESP && message_type > 0) { - proto_tree_add_boolean_hidden(lmp_header_tree, lmp_filter[LMPF_MSG + message_type], tvb, + proto_tree_add_boolean_hidden(lmp_header_tree, lmp_filter[LMPF_MSG + message_type], tvb, offset+3, 1, 1); } else { proto_tree_add_protocol_format(lmp_header_tree, proto_malformed, tvb, offset+3, 1, "Invalid message type: %u", message_type); return; } - + cksum = tvb_get_ntohs(tvb, offset+6); if (!pinfo->fragmented && (int) tvb_length(tvb) >= msg_length) { /* The packet isn't part of a fragmented datagram and isn't @@ -848,15 +848,15 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Message Checksum: 0x%04x", cksum); } - proto_tree_add_text(lmp_header_tree, tvb, offset+8, 4, + proto_tree_add_text(lmp_header_tree, tvb, offset+8, 4, "Local Control Channel ID: %d (%s)", - tvb_get_ntohl(tvb, offset+8), + tvb_get_ntohl(tvb, offset+8), ip_to_str(tvb_get_ptr(tvb, offset+8, 4))); offset += 8; len = 8; while (len < msg_length) { - guint8 class; + guint8 class; guint8 type; guint8 negotiable; char *object_type; @@ -866,7 +866,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_guint8(tvb, offset); negotiable = (type >> 7); type &= 0x7f; object_type = val_to_str(class, lmp_class_vals, "Unknown"); - proto_tree_add_uint_hidden(lmp_tree, lmp_filter[LMPF_OBJECT], tvb, + proto_tree_add_uint_hidden(lmp_tree, lmp_filter[LMPF_OBJECT], tvb, offset, 1, class); if (VALID_CLASS(class)) { ti = proto_tree_add_item(lmp_tree, lmp_filter[lmp_class_to_filter_num(class)], @@ -879,36 +879,36 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lmp_object_tree = proto_item_add_subtree(ti, lmp_class_to_subtree(class)); - ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4, + ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4, "Header. Class %d, C-Type %d, Length %d, %s", - class, type, obj_length, + class, type, obj_length, negotiable ? "Negotiable" : "Not Negotiable"); lmp_object_header_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_OBJECT_HEADER]); - proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1, + proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1, negotiable ? "Negotiable" : "Not Negotiable"); proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2, "Length: %u", obj_length); - proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1, - "Object Class: %u - %s", + proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1, + "Object Class: %u - %s", class, object_type); - proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE], + proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE], tvb, offset, 1, type); offset2 = offset+4; mylen = obj_length - 4; switch(class) { - + case LMP_CLASS_NULL: break; - + case LMP_CLASS_LOCAL_CCID: case LMP_CLASS_REMOTE_CCID: switch(type) { - case 1: - l = (class == LMP_CLASS_LOCAL_CCID) ? + case 1: + l = (class == LMP_CLASS_LOCAL_CCID) ? LMPF_VAL_LOCAL_CCID : LMPF_VAL_REMOTE_CCID; proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, tvb_get_ntohl(tvb, offset2)); break; default: @@ -917,16 +917,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_LOCAL_NODE_ID: case LMP_CLASS_REMOTE_NODE_ID: switch(type) { - case 1: - l = (class == LMP_CLASS_LOCAL_NODE_ID) ? + case 1: + l = (class == LMP_CLASS_LOCAL_NODE_ID) ? LMPF_VAL_LOCAL_NODE_ID : LMPF_VAL_REMOTE_NODE_ID; - proto_item_append_text(ti, ": %s", + proto_item_append_text(ti, ": %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); - proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, FALSE); break; default: @@ -939,25 +939,25 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_LOCAL_LINK_ID: case LMP_CLASS_REMOTE_LINK_ID: switch(type) { - case 1: - l = (class == LMP_CLASS_LOCAL_LINK_ID) ? + case 1: + l = (class == LMP_CLASS_LOCAL_LINK_ID) ? LMPF_VAL_LOCAL_LINK_ID_IPV4 : LMPF_VAL_REMOTE_LINK_ID_IPV4; - proto_item_append_text(ti, ": IPv4 %s", + proto_item_append_text(ti, ": IPv4 %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); - proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, FALSE); break; - case 2: - proto_item_append_text(ti, ": IPv6 %s", + case 2: + proto_item_append_text(ti, ": IPv6 %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); break; - case 3: - l = (class == LMP_CLASS_LOCAL_LINK_ID) ? + case 3: + l = (class == LMP_CLASS_LOCAL_LINK_ID) ? LMPF_VAL_LOCAL_LINK_ID_UNNUM : LMPF_VAL_REMOTE_LINK_ID_UNNUM; proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2)); - proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, FALSE); break; default: @@ -970,25 +970,25 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_LOCAL_INTERFACE_ID: case LMP_CLASS_REMOTE_INTERFACE_ID: switch(type) { - case 1: - l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ? + case 1: + l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ? LMPF_VAL_LOCAL_INTERFACE_ID_IPV4 : LMPF_VAL_REMOTE_INTERFACE_ID_IPV4; - proto_item_append_text(ti, ": IPv4 %s", + proto_item_append_text(ti, ": IPv4 %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); - proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, FALSE); break; - case 2: - proto_item_append_text(ti, ": IPv6 %s", + case 2: + proto_item_append_text(ti, ": IPv6 %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); break; - case 3: - l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ? + case 3: + l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ? LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM : LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM; proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2)); - proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, FALSE); break; default: @@ -1001,11 +1001,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_MESSAGE_ID: case LMP_CLASS_MESSAGE_ID_ACK: switch(type) { - case 1: - l = (class == LMP_CLASS_MESSAGE_ID) ? + case 1: + l = (class == LMP_CLASS_MESSAGE_ID) ? LMPF_VAL_MESSAGE_ID : LMPF_VAL_MESSAGE_ID_ACK; proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, + proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4, tvb_get_ntohl(tvb, offset2)); break; default: @@ -1014,15 +1014,15 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_CONFIG: switch(type) { - case 1: - proto_item_append_text(ti, ": HelloInterval: %d, HelloDeadInterval: %d", + case 1: + proto_item_append_text(ti, ": HelloInterval: %d, HelloDeadInterval: %d", tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO], + proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO], tvb, offset2, 2, tvb_get_ntohs(tvb, offset2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD], + proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD], tvb, offset2+2, 2, tvb_get_ntohs(tvb, offset2+2)); break; default: @@ -1031,16 +1031,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_HELLO: switch(type) { - case 1: - proto_item_append_text(ti, ": TxSeq %d, RxSeq: %d", - tvb_get_ntohl(tvb, offset2), + case 1: + proto_item_append_text(ti, ": TxSeq %d, RxSeq: %d", + tvb_get_ntohl(tvb, offset2), tvb_get_ntohl(tvb, offset2+4)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_TXSEQ], + proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_TXSEQ], tvb, offset2, 4, tvb_get_ntohl(tvb, offset2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_RXSEQ], + proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_RXSEQ], tvb, offset2+4, 4, tvb_get_ntohl(tvb, offset2+4)); break; default: @@ -1049,10 +1049,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_BEGIN_VERIFY: switch(type) { - case 1: + case 1: l = tvb_get_ntohs(tvb, offset2); ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS], tvb, offset2, 2, FALSE); @@ -1062,17 +1062,17 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset2, 2, l); proto_tree_add_boolean(lmp_flags_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE], tvb, offset2, 2, l); - proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2, + proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2, "Verify Interval: %d ms", tvb_get_ntohs(tvb, offset2+2)); - proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 4, + proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 4, "Number of Data Links: %d", tvb_get_ntohl(tvb, offset2+4)); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE], tvb, offset2+8, 1, FALSE); - proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2, + proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2, "Verify Transport Mechanism: 0x%0x", tvb_get_ntohs(tvb, offset2+10)); - proto_tree_add_text(lmp_object_tree, tvb, offset2+12, 4, + proto_tree_add_text(lmp_object_tree, tvb, offset2+12, 4, "Transmission Rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+12)); - proto_tree_add_text(lmp_object_tree, tvb, offset2+16, 4, + proto_tree_add_text(lmp_object_tree, tvb, offset2+16, 4, "Wavelength: %d", tvb_get_ntohl(tvb, offset2+4)); break; default: @@ -1081,15 +1081,15 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_BEGIN_VERIFY_ACK: switch(type) { - case 1: - proto_item_append_text(ti, ": VerifyDeadInterval: %d, TransportResponse: 0x%0x", + case 1: + proto_item_append_text(ti, ": VerifyDeadInterval: %d, TransportResponse: 0x%0x", tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2)); - proto_tree_add_text(lmp_object_tree, tvb, offset2, 2, + proto_tree_add_text(lmp_object_tree, tvb, offset2, 2, "VerifyDeadInterval: %d ms", tvb_get_ntohs(tvb, offset2)); - proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2, + proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2, "Verify Transport Response: 0x%0x", tvb_get_ntohs(tvb, offset2+2)); break; default: @@ -1098,12 +1098,12 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_VERIFY_ID: switch(type) { - case 1: + case 1: proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2)); - proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_VERIFY_ID], tvb, offset2, 4, + proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_VERIFY_ID], tvb, offset2, 4, tvb_get_ntohl(tvb, offset2)); break; default: @@ -1112,46 +1112,46 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + case LMP_CLASS_TE_LINK: l = tvb_get_guint8(tvb, offset2); - ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_FLAGS], + ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_FLAGS], tvb, offset2, 1, l); - proto_item_append_text(ti2, ": %s%s", + proto_item_append_text(ti2, ": %s%s", (l&0x01) ? "Fault-Mgmt-Supported " : "", (l&0x02) ? "Link-Verification-Supported " : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_TE_LINK_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT], tvb, offset2, 1, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY], tvb, offset2, 1, l); switch(type) { - case 1: - proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", + case 1: + proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)), ip_to_str(tvb_get_ptr(tvb, offset2+8, 4))); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4], tvb, offset2+4, 4, FALSE); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4], tvb, offset2+8, 4, FALSE); break; - case 2: - proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", + case 2: + proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "TE-Link Local ID - IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "TE-Link Local ID - IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "TE-Link Remote ID - IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "TE-Link Remote ID - IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); break; - case 3: - proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d", + case 3: + proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d", tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8)); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM], tvb, offset2+4, 4, FALSE); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM], tvb, offset2+8, 4, FALSE); break; default: @@ -1163,47 +1163,47 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_DATA_LINK: l = tvb_get_guint8(tvb, offset2); - ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_FLAGS], + ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_FLAGS], tvb, offset2, 1, l); - proto_item_append_text(ti2, ": %s%s", + proto_item_append_text(ti2, ": %s%s", (l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ", (l&0x02) ? "Allocated " : "Unallocated "); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_DATA_LINK_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT], tvb, offset2, 1, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED], tvb, offset2, 1, l); switch(type) { - case 1: - proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", + case 1: + proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)), ip_to_str(tvb_get_ptr(tvb, offset2+8, 4))); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4], tvb, offset2+4, 4, FALSE); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4], tvb, offset2+8, 4, FALSE); l = 12; break; - case 2: - proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", + case 2: + proto_item_append_text(ti, ": IPv6: Local %s, Remote %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)), ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, - "Data-Link Local ID - IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, + "Data-Link Local ID - IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); - proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, - "Data-Link Remote ID - IPv6: %s", + proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, + "Data-Link Remote ID - IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16))); l = 36; break; - case 3: - proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d", + case 3: + proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d", tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8)); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM], tvb, offset2+4, 4, FALSE); - proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM], + proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM], tvb, offset2+8, 4, FALSE); l = 12; break; @@ -1218,51 +1218,51 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ], tvb, offset2+l, mylen, FALSE); lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1, + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1, "Subobject Type: %d", tvb_get_guint8(tvb, offset2+l)); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1, + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1, "Subobject Length: %d", mylen); switch(tvb_get_guint8(tvb, offset2+l)) { - case 1: + case 1: proto_item_set_text(ti2, "Interface Switching Capability: " - "Switching Cap: %s, Encoding Type: %s, Min BW: %.10g, Max BW: %.10g", - val_to_str(tvb_get_guint8(tvb, offset2+l+2), + "Switching Cap: %s, Encoding Type: %s, Min BW: %.10g, Max BW: %.10g", + val_to_str(tvb_get_guint8(tvb, offset2+l+2), gmpls_switching_type_str, "Unknown (%d)"), - val_to_str(tvb_get_guint8(tvb, offset2+l+3), + val_to_str(tvb_get_guint8(tvb, offset2+l+3), gmpls_lsp_enc_str, "Unknown (%d)"), - tvb_get_ntohieee_float(tvb, offset2+l+4), + tvb_get_ntohieee_float(tvb, offset2+l+4), tvb_get_ntohieee_float(tvb, offset2+l+8)); - proto_tree_add_item(lmp_subobj_tree, + proto_tree_add_item(lmp_subobj_tree, lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE], tvb, offset2+l+2, 1, FALSE); - proto_tree_add_item(lmp_subobj_tree, + proto_tree_add_item(lmp_subobj_tree, lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING], tvb, offset2+l+3, 1, FALSE); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4, - "Minimum Reservable Bandwidth: %.10g bytes/s", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4, + "Minimum Reservable Bandwidth: %.10g bytes/s", tvb_get_ntohieee_float(tvb, offset2+l+4)); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8, 4, - "Maximum Reservable Bandwidth: %.10g bytes/s", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8, 4, + "Maximum Reservable Bandwidth: %.10g bytes/s", tvb_get_ntohieee_float(tvb, offset2+l+8)); break; case 2: - proto_item_set_text(ti2, "Wavelength: %d", + proto_item_set_text(ti2, "Wavelength: %d", tvb_get_ntohl(tvb, offset2+l+2)); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4, - "Wavelength: %d", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4, + "Wavelength: %d", tvb_get_ntohl(tvb, offset2+l+2)); break; default: - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, tvb_get_guint8(tvb, offset2+l+1), "Data (%d bytes)", tvb_get_guint8(tvb, offset2+l+1)); break; } l += tvb_get_guint8(tvb, offset2+l+1); } - + break; case LMP_CLASS_CHANNEL_STATUS: @@ -1277,37 +1277,37 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!k) break; for (l=0; l<obj_length - 4; ) { - ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k, + ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k, "Interface-Id"); lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_CHANNEL_STATUS_ID]); switch(type) { - case 1: - if (j < 4) - proto_item_append_text(ti, ": [IPv4-%s", + case 1: + if (j < 4) + proto_item_append_text(ti, ": [IPv4-%s", ip_to_str(tvb_get_ptr(tvb, offset2+l, 4))); - proto_item_append_text(ti2, ": IPv4 %s", + proto_item_append_text(ti2, ": IPv4 %s", ip_to_str(tvb_get_ptr(tvb, offset2+l, 4))); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, - "Interface ID: IPv4: %s", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, + "Interface ID: IPv4: %s", ip_to_str(tvb_get_ptr(tvb, offset2+l, 4))); l += 4; break; - case 2: - if (j < 4) - proto_item_append_text(ti, ": [IPv6-%s", + case 2: + if (j < 4) + proto_item_append_text(ti, ": [IPv6-%s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); - proto_item_append_text(ti2, ": IPv6 %s", + proto_item_append_text(ti2, ": IPv6 %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16))); l += 16; break; - case 3: + case 3: if (j < 4) proto_item_append_text(ti, ": [Unnum-%d", tvb_get_ntohl(tvb, offset2+l)); proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2+l)); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, - "Interface ID: Unnumbered: %d", + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, + "Interface ID: Unnumbered: %d", tvb_get_ntohl(tvb, offset2+l)); l += 4; break; @@ -1319,22 +1319,22 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (l == obj_length - 4) break; - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1, - tvb_get_guint8(tvb, offset2+l) & 0x80 ? - "Link Allocated - Active Monitoring" : + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1, + tvb_get_guint8(tvb, offset2+l) & 0x80 ? + "Link Allocated - Active Monitoring" : "Link Not Allocated"); - if (j < 4) - proto_item_append_text(ti, "-%s,%s], ", + if (j < 4) + proto_item_append_text(ti, "-%s,%s], ", tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Act" : "NA", - val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, + val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, channel_status_short_str, "UNK (%u).")); - proto_item_append_text(ti2, ": %s, ", + proto_item_append_text(ti2, ": %s, ", tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active"); - proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, - "Channel Status: %s", - val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, + proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4, + "Channel Status: %s", + val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, channel_status_str, "Unknown (%u). ")); - proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, + proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, channel_status_str, "Unknown (%u). ")); j++; l += 4; @@ -1346,20 +1346,20 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_CHANNEL_STATUS_REQUEST: for (l=0; l<obj_length - 4; ) { switch(type) { - case 1: - proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4, - "Interface ID: IPv4: %s", + case 1: + proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4, + "Interface ID: IPv4: %s", ip_to_str(tvb_get_ptr(tvb, offset2+l, 4))); l += 4; break; - case 2: - proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s", + case 2: + proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16))); l += 16; break; - case 3: - proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4, - "Interface ID: Unnumbered: %d", + case 3: + proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4, + "Interface ID: Unnumbered: %d", tvb_get_ntohl(tvb, offset2+l)); l += 4; break; @@ -1374,63 +1374,63 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case LMP_CLASS_ERROR: l = tvb_get_ntohl(tvb, offset2); - ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR], + ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR], tvb, offset2, 4, l); /* Errors are different in draft-02 and draft-03 */ switch(lmp_draft_ver) { case LMP_VER_DRAFT_CCAMP_02: switch(type) { - case 1: + case 1: proto_item_append_text(ti, ": CONFIG_ERROR: %s%s%s", (l&0x01) ? "Unacceptable-Params " : "", (l&0x02) ? "Renegotiate" : "", (l&0x04) ? "Bad Received CCID" : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID], tvb, offset, 4, l); break; - case 2: + case 2: proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s", (l&0x01) ? "Unsupported-Link " : "", (l&0x02) ? "Unwilling" : "", (l&0x04) ? "Unsupported-Transport" : "", (l&0x08) ? "TE-Link-ID" : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], tvb, offset, 4, l); break; - case 3: + case 3: proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s", (l&0x01) ? "Unacceptable-Params " : "", (l&0x02) ? "Renegotiate" : "", (l&0x04) ? "Remote-Link-ID" : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], tvb, offset, 4, l); break; default: @@ -1444,27 +1444,27 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: case LMP_VER_DRAFT_CCAMP_03: switch(type) { - case 1: + case 1: proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s", (l&0x01) ? "Unsupported-Link " : "", (l&0x02) ? "Unwilling" : "", (l&0x04) ? "Unsupported-Transport" : "", (l&0x08) ? "TE-Link-ID" : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID], tvb, offset, 4, l); break; - case 2: + case 2: proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s%s%s", (l&0x01) ? "Unacceptable-Params " : "", (l&0x02) ? "Renegotiate" : "", @@ -1472,20 +1472,20 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (l&0x08) ? "TE-Link" : "", (l&0x10) ? "Data-Link" : ""); lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], tvb, offset, 4, l); - proto_tree_add_boolean(lmp_flags_tree, - lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK], + proto_tree_add_boolean(lmp_flags_tree, + lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK], tvb, offset, 4, l); break; default: @@ -1497,13 +1497,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } break; - + default : proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen, "Data (%d bytes)", mylen); break; - } + } offset += obj_length; len += obj_length; @@ -1511,7 +1511,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void +static void register_lmp_prefs (void) { module_t *lmp_module; @@ -1523,7 +1523,7 @@ register_lmp_prefs (void) lmp_module = prefs_register_protocol(proto_lmp, NULL); prefs_register_enum_preference( - lmp_module, "lmp_version", + lmp_module, "lmp_version", "Draft version of LMP", "Specifies the IETF CCAMP draft version of LMP to interpret", &lmp_draft_ver, lmp_ver, FALSE); @@ -1531,10 +1531,10 @@ register_lmp_prefs (void) void proto_register_lmp(void) -{ +{ static gint *ett[NUM_LMP_SUBTREES]; int i; - + for (i=0; i<NUM_LMP_SUBTREES; i++) { lmp_subtree[i] = -1; ett[i] = &lmp_subtree[i]; diff --git a/packet-lpd.c b/packet-lpd.c index fbd0cba566..fcb26541fe 100644 --- a/packet-lpd.c +++ b/packet-lpd.c @@ -2,22 +2,22 @@ * Routines for LPR and LPRng packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-lpd.c,v 1.36 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-lpd.c,v 1.37 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -167,7 +167,7 @@ proto_register_lpd(void) { static hf_register_info hf[] = { { &hf_lpd_response, - { "Response", "lpd.response", + { "Response", "lpd.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if LPD response", HFILL }}, diff --git a/packet-m2pa.c b/packet-m2pa.c index 6b460e6b66..9d2807f9be 100644 --- a/packet-m2pa.c +++ b/packet-m2pa.c @@ -3,27 +3,27 @@ * It is hopefully (needs testing) compliant to * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2pa-05.txt * - * Copyright 2001, 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>, + * Copyright 2001, 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>, * updated by Michael Tuexen <michael.tuexen[AT]siemens.com> * - * $Id: packet-m2pa.c,v 1.11 2002/08/27 19:28:23 tuexen Exp $ + * $Id: packet-m2pa.c,v 1.12 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-m3ua.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -169,7 +169,7 @@ static const value_string link_status_values[] = { { STATUS_ALIGNMENT, "Alignment" }, { STATUS_PROVING_NORMAL, "Proving Normal" }, { STATUS_PROVING_EMERGENCY, "Proving Emergency" }, - { STATUS_READY, "Ready" }, + { STATUS_READY, "Ready" }, { STATUS_PROCESSOR_OUTAGE, "Processor Outage" }, { STATUS_PROCESSOR_OUTAGE_ENDED, "Processor Outage Ended" }, { STATUS_BUSY, "Busy" }, @@ -182,7 +182,7 @@ static void dissect_m2pa_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_tree *m2pa_tree) { guint16 filler_length; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "Link status "); if (m2pa_tree) { @@ -195,7 +195,7 @@ dissect_m2pa_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, static void dissect_m2pa_unknown_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_tree *m2pa_tree) -{ +{ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "Unknown "); if (m2pa_tree) @@ -299,4 +299,4 @@ proto_reg_handoff_m2pa(void) m2pa_handle = create_dissector_handle(dissect_m2pa, proto_m2pa); dissector_add("sctp.ppi", M2PA_PAYLOAD_PROTOCOL_ID, m2pa_handle); dissector_add("sctp.port", SCTP_PORT_M2PA, m2pa_handle); -}
\ No newline at end of file +} diff --git a/packet-m2tp.c b/packet-m2tp.c index 2f86b87172..0052394449 100644 --- a/packet-m2tp.c +++ b/packet-m2tp.c @@ -5,7 +5,7 @@ * * Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com> * - * $Id: packet-m2tp.c,v 1.3 2002/01/24 09:20:49 guy Exp $ + * $Id: packet-m2tp.c,v 1.4 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -13,17 +13,17 @@ * * Copied from packet-m3ua.c * Thanks to Michael Tuexen for his valuable improvements - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -152,7 +152,7 @@ static const value_string m2tp_message_class_type_acro_values[] = { #define M2TP_USER_OFFSET PARAMETER_VALUE_OFFSET #define PROTOCOL_DATA_OFFSET PARAMETER_VALUE_OFFSET - + #define MASTER_SLAVE_LENGTH 4 #define MASTER_SLAVE_OFFSET PARAMETER_VALUE_OFFSET @@ -163,7 +163,7 @@ static const value_string m2tp_message_class_type_acro_values[] = { #define ERROR_CODE_LENGTH 4 #define ERROR_CODE_OFFSET PARAMETER_VALUE_OFFSET - + #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET #define BSN_OFFSET PARAMETER_VALUE_OFFSET @@ -186,7 +186,7 @@ static const value_string m2tp_mode_values[] = { { M2TP_MODE_MASTER, "Master" }, { M2TP_MODE_SLAVE, "Slave" }, { 0, NULL}}; - + #define M2TP_ERROR_CODE_INVALID_VERSION 1 #define M2TP_ERROR_CODE_INVALID_INTERFACE_IDENTIFIER 2 #define M2TP_ERROR_CODE_INVALID_ADAPTATION_LAYER_IDENTIFIER 3 @@ -217,7 +217,7 @@ static const value_string m2tp_reason_code_values[] = { { MTP_RELEASE_REASON_CODE, "MTP Release" }, { 0, NULL } }; - + /* Initialize the protocol and registered fields */ static int proto_m2tp = -1; static int hf_m2tp_version = -1; @@ -245,7 +245,7 @@ static gint ett_m2tp_parameter = -1; static dissector_handle_t mtp2_handle; static int mtp2_proto_id; -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -264,7 +264,7 @@ dissect_m2tp_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot { guint8 version, reserved, message_class, message_type; guint32 message_length; - + /* Extract the common header */ version = tvb_get_guint8(common_header_tvb, VERSION_OFFSET); reserved = tvb_get_guint8(common_header_tvb, RESERVED_OFFSET); @@ -283,7 +283,7 @@ dissect_m2tp_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot proto_tree_add_uint(m2tp_tree, hf_m2tp_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, version); proto_tree_add_uint(m2tp_tree, hf_m2tp_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); proto_tree_add_uint(m2tp_tree, hf_m2tp_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class); - proto_tree_add_uint_format(m2tp_tree, hf_m2tp_message_type, + proto_tree_add_uint_format(m2tp_tree, hf_m2tp_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, "Message type: %u (%s)", message_type, val_to_str(message_class * 256 + message_type, m2tp_message_class_type_values, "reserved")); @@ -351,9 +351,9 @@ static void dissect_m2tp_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, diagnostic_info_length; - + if (parameter_tree) { - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); diagnostic_info_length = length - PARAMETER_HEADER_LENGTH; proto_tree_add_bytes(parameter_tree, hf_m2tp_diagnostic_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length)); @@ -366,7 +366,7 @@ static void dissect_m2tp_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, heartbeat_data_length; - + if (parameter_tree) { length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); heartbeat_data_length = length - PARAMETER_HEADER_LENGTH; @@ -432,16 +432,16 @@ static void dissect_m2tp_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 tag, length, parameter_value_length; - + if (parameter_tree) { tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + parameter_value_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_bytes(parameter_tree, hf_m2tp_parameter_value, + proto_tree_add_bytes(parameter_tree, hf_m2tp_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); - + proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); } } @@ -466,12 +466,12 @@ dissect_m2tp_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree * /* create proto_tree stuff */ parameter_item = proto_tree_add_text(m2tp_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "Incomplete parameter"); parameter_tree = proto_item_add_subtree(parameter_item, ett_m2tp_parameter); - + /* add tag and length to the m2tp tree */ proto_tree_add_uint(parameter_tree, hf_m2tp_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag); proto_tree_add_uint(parameter_tree, hf_m2tp_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); } - + switch(tag) { case INTERFACE_IDENTIFIER_PARAMETER_TAG: dissect_m2tp_interface_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -506,7 +506,7 @@ dissect_m2tp_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree * }; if ((parameter_tree) && (padding_length > 0)) - proto_tree_add_bytes(parameter_tree, hf_m2tp_parameter_padding, + proto_tree_add_bytes(parameter_tree, hf_m2tp_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } @@ -524,7 +524,7 @@ dissect_m2tp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2tp common_header_tvb = tvb_new_subset(message_tvb, offset, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); dissect_m2tp_common_header(common_header_tvb, pinfo, m2tp_tree); offset += COMMON_HEADER_LENGTH; - + /* extract zero or more parameters and process them individually */ while(tvb_reported_length_remaining(message_tvb, offset)) { length = tvb_get_ntohs(message_tvb, offset + PARAMETER_LENGTH_OFFSET); @@ -532,7 +532,7 @@ dissect_m2tp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2tp total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(message_tvb, offset, total_length, total_length); - dissect_m2tp_parameter(parameter_tvb, pinfo, m2tp_tree, m2tp_item, tree); + dissect_m2tp_parameter(parameter_tvb, pinfo, m2tp_tree, m2tp_item, tree); /* get rid of the handled parameter */ offset += total_length; } @@ -546,9 +546,9 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m2tp_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2TP"); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -566,103 +566,103 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_m2tp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_m2tp_version, { "Version", "m2tp.version", - FT_UINT8, BASE_DEC, VALS(m2tp_protocol_version_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m2tp_protocol_version_values), 0x0, "", HFILL} }, { &hf_m2tp_reserved, { "Reserved", "m2tp.reserved", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL} - }, + }, { &hf_m2tp_message_class, { "Message class", "m2tp.message_class", - FT_UINT8, BASE_DEC, VALS(m2tp_message_class_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m2tp_message_class_values), 0x0, "", HFILL} }, { &hf_m2tp_message_type, { "Message Type", "m2tp.message_type", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL} }, { &hf_m2tp_message_length, { "Message length", "m2tp.message_length", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} - }, + }, { &hf_m2tp_parameter_tag, { "Parameter Tag", "m2tp.parameter_tag", - FT_UINT16, BASE_DEC, VALS(m2tp_parameter_tag_values), 0x0, + FT_UINT16, BASE_DEC, VALS(m2tp_parameter_tag_values), 0x0, "", HFILL} }, { &hf_m2tp_parameter_length, { "Parameter length", "m2tp.parameter_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL} - }, + }, { &hf_m2tp_parameter_value, { "Parameter Value", "m2tp.parameter_value", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_m2tp_parameter_padding, { "Padding", "m2tp.parameter_padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m2tp_interface_identifier, { "Interface Identifier", "m2tp.interface_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} - }, + }, { &hf_m2tp_user, { "M2tp User Identifier", "m2tp.user_identifier", - FT_UINT32, BASE_DEC, VALS(m2tp_user_identifier_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m2tp_user_identifier_values), 0x0, "", HFILL} - }, + }, { &hf_m2tp_master_slave, { "Master Slave Indicator", "m2tp.master_slave", - FT_UINT32, BASE_DEC, VALS(m2tp_mode_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m2tp_mode_values), 0x0, "", HFILL} - }, + }, { &hf_m2tp_info_string, { "Info string", "m2tp.info_string", - FT_STRING, BASE_DEC, NULL, 0x0, + FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL} - }, + }, { &hf_m2tp_diagnostic_info, { "Diagnostic information", "m2tp.diagnostic_info", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_m2tp_heartbeat_data, { "Heartbeat data", "m2tp.heartbeat_data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_m2tp_error_code, { "Error code", "m2tp.error_code", - FT_UINT32, BASE_DEC, VALS(m2tp_error_code_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m2tp_error_code_values), 0x0, "", HFILL} - }, + }, { &hf_m2tp_reason, { "Reason", "m2tp.reason", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} - }, + }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_m2tp, &ett_m2tp_parameter, }; - + /* Register the protocol name and description */ proto_m2tp = proto_register_protocol("MTP 2 Transparent Proxy", "M2TP", "m2tp"); diff --git a/packet-m2ua.c b/packet-m2ua.c index 665cde22c7..6880f9331f 100644 --- a/packet-m2ua.c +++ b/packet-m2ua.c @@ -8,24 +8,24 @@ * * Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-m2ua.c,v 1.3 2002/08/17 18:38:41 tuexen Exp $ + * $Id: packet-m2ua.c,v 1.4 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -92,7 +92,7 @@ static dissector_handle_t mtp3_handle; static void dissect_m2ua_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -124,7 +124,7 @@ nr_of_padding_bytes (guint length) static const value_string m2ua_protocol_version_values[] = { { PROTOCOL_VERSION_RELEASE_1, "Release 1" }, { 0, NULL } }; - + #define MESSAGE_CLASS_MGMT_MESSAGE 0 #define MESSAGE_CLASS_ASPSM_MESSAGE 3 #define MESSAGE_CLASS_ASPTM_MESSAGE 4 @@ -253,7 +253,7 @@ dissect_m2ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot { guint8 version, reserved, message_class, message_type; guint32 message_length; - + /* Extract the common header */ version = tvb_get_guint8(common_header_tvb, VERSION_OFFSET); reserved = tvb_get_guint8(common_header_tvb, RESERVED_OFFSET); @@ -272,7 +272,7 @@ dissect_m2ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot proto_tree_add_uint(m2ua_tree, hf_m2ua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); proto_tree_add_uint(m2ua_tree, hf_m2ua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class); proto_tree_add_uint_format(m2ua_tree, hf_m2ua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, - "Message type: %s (%u)", + "Message type: %s (%u)", val_to_str(message_class * 256 + message_type, m2ua_message_class_type_values, "reserved"), message_type); proto_tree_add_uint(m2ua_tree, hf_m2ua_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, message_length); } @@ -310,7 +310,7 @@ dissect_m2ua_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_ char *id; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + id_length = length - PARAMETER_HEADER_LENGTH; id = (char *)tvb_get_ptr(parameter_tvb, INTERFACE_IDENTIFIER_TEXT_OFFSET, id_length); proto_tree_add_string(parameter_tree, hf_m2ua_interface_id_text, parameter_tvb, INTERFACE_IDENTIFIER_TEXT_OFFSET, id_length, id); @@ -326,7 +326,7 @@ dissect_m2ua_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete char *info_string; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + info_string_length = length - PARAMETER_HEADER_LENGTH; info_string = (char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length); proto_tree_add_string(parameter_tree, hf_m2ua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, info_string); @@ -339,7 +339,7 @@ static void dissect_m2ua_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, diagnostic_info_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); diagnostic_info_length = length - PARAMETER_HEADER_LENGTH; @@ -379,11 +379,11 @@ static void dissect_m2ua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, heartbeat_data_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); heartbeat_data_length = length - PARAMETER_HEADER_LENGTH; - if (heartbeat_data_length > 0) + if (heartbeat_data_length > 0) proto_tree_add_bytes(parameter_tree, hf_m2ua_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, tvb_get_ptr(parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length)); @@ -410,7 +410,7 @@ dissect_m2ua_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *pa traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, traffic_mode_type); - + proto_item_set_text(parameter_item, "Traffic mode type parameter (%s)", val_to_str(traffic_mode_type, m2ua_traffic_mode_type_values, "unknown")); } @@ -511,7 +511,7 @@ dissect_m2ua_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre proto_tree_add_uint_format(parameter_tree, hf_m2ua_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, m2ua_status_type_info_values, "unknown"), status_info); - proto_item_set_text(parameter_item, + proto_item_set_text(parameter_item, "Status type / ID (%s)", val_to_str(status_type * 256 * 256 + status_info, m2ua_status_type_info_values, "unknown status information")); } @@ -522,7 +522,7 @@ static void dissect_m2ua_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 id; - + id = tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_asp_id, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, id); proto_item_set_text(parameter_item, "ASP identifier (%u)", id); @@ -538,7 +538,7 @@ dissect_m2ua_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tre id = tvb_get_ntohl(parameter_tvb, CORRELATION_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, id); - + proto_item_set_text(parameter_item, "Correlation identifier parameter (%u)", id); } @@ -569,10 +569,10 @@ dissect_m2ua_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pin tvbuff_t *payload_tvb; guint32 payload_length; guint8 li; - + payload_length = tvb_length(parameter_tvb) - PARAMETER_HEADER_LENGTH - DATA_2_LI_LENGTH; li = tvb_get_guint8(parameter_tvb, DATA_2_LI_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_m2ua_data_2_li, parameter_tvb, DATA_2_LI_OFFSET, DATA_2_LI_LENGTH, li); payload_tvb = tvb_new_subset(parameter_tvb, DATA_2_MTP3_OFFSET, payload_length, payload_length); proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + DATA_2_LI_LENGTH); @@ -607,7 +607,7 @@ static const value_string m2ua_state_values[] = { { STATUS_CONG_ACCEPT, "Congestion accept" }, { STATUS_CONG_DISCARD, "Congestion discard" }, {0, NULL } }; - + #define STATE_LENGTH 4 #define STATE_OFFSET PARAMETER_VALUE_OFFSET @@ -618,7 +618,7 @@ dissect_m2ua_state_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parame state = tvb_get_ntohl(parameter_tvb, STATE_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_state, parameter_tvb, STATE_OFFSET, STATE_LENGTH, state); - + proto_item_set_text(parameter_item, "State request parameter (%s)", val_to_str(state, m2ua_state_values, "unknown")); } @@ -644,7 +644,7 @@ dissect_m2ua_event_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parame event = tvb_get_ntohl(parameter_tvb, STATE_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_event, parameter_tvb, EVENT_OFFSET, EVENT_LENGTH, event); - + proto_item_set_text(parameter_item, "State event parameter (%s)", val_to_str(event, m2ua_event_values, "unknown")); } @@ -670,7 +670,7 @@ dissect_m2ua_congestion_status_parameter(tvbuff_t *parameter_tvb, proto_tree *pa status = tvb_get_ntohl(parameter_tvb, CONGESTION_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_congestion_status, parameter_tvb, CONGESTION_STATUS_OFFSET, CONGESTION_STATUS_LENGTH, status); - + proto_item_set_text(parameter_item, "Congestion status parameter (%s)", val_to_str(status, m2ua_level_values, "unknown")); } @@ -684,7 +684,7 @@ dissect_m2ua_discard_status_parameter(tvbuff_t *parameter_tvb, proto_tree *param status = tvb_get_ntohl(parameter_tvb, DISCARD_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_discard_status, parameter_tvb, DISCARD_STATUS_OFFSET, DISCARD_STATUS_LENGTH, status); - + proto_item_set_text(parameter_item, "Discard status parameter (%s)", val_to_str(status, m2ua_level_values, "unknown")); } @@ -707,7 +707,7 @@ dissect_m2ua_action_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre action = tvb_get_ntohl(parameter_tvb, ACTION_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_action, parameter_tvb, ACTION_OFFSET, ACTION_LENGTH, action); - + proto_item_set_text(parameter_item, "Action parameter (%s)", val_to_str(action, m2ua_action_values, "unknown")); } @@ -721,7 +721,7 @@ dissect_m2ua_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para number = tvb_get_ntohl(parameter_tvb, SEQUENCE_NUMBER_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_sequence_number, parameter_tvb, SEQUENCE_NUMBER_OFFSET, SEQUENCE_NUMBER_LENGTH, number); - + proto_item_set_text(parameter_item, "Sequence number parameter (%u)", number); } @@ -744,7 +744,7 @@ dissect_m2ua_retrieval_result_parameter(tvbuff_t *parameter_tvb, proto_tree *par result = tvb_get_ntohl(parameter_tvb, RETRIEVAL_RESULT_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_retrieval_result, parameter_tvb, RETRIEVAL_RESULT_OFFSET, RETRIEVAL_RESULT_LENGTH, result); - + proto_item_set_text(parameter_item, "Retrieval result parameter (%s)", val_to_str(result, m2ua_retrieval_result_values, "unknown")); } @@ -753,7 +753,7 @@ dissect_m2ua_link_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -771,12 +771,12 @@ dissect_m2ua_local_lk_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree * id = tvb_get_ntohl(parameter_tvb, LOCAL_LK_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_local_lk_id, parameter_tvb, LOCAL_LK_ID_OFFSET, LOCAL_LK_ID_LENGTH, id); - + proto_item_set_text(parameter_item, "Local KL identifier parameter (%u)", id); } #define SDT_RESERVED_LENGTH 2 -#define SDT_ID_LENGTH 2 +#define SDT_ID_LENGTH 2 #define SDT_RESERVED_OFFSET PARAMETER_VALUE_OFFSET #define SDT_ID_OFFSET (SDT_RESERVED_OFFSET + SDT_RESERVED_LENGTH) @@ -787,7 +787,7 @@ dissect_m2ua_sdt_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *param reserved = tvb_get_ntohs(parameter_tvb, SDT_RESERVED_OFFSET); id = tvb_get_ntohs(parameter_tvb, SDT_ID_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_m2ua_sdt_reserved, parameter_tvb, SDT_RESERVED_OFFSET, SDT_RESERVED_LENGTH, reserved); proto_tree_add_uint(parameter_tree, hf_m2ua_sdt_id, parameter_tvb, SDT_ID_OFFSET, SDT_ID_LENGTH, id); @@ -795,7 +795,7 @@ dissect_m2ua_sdt_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *param } #define SDL_RESERVED_LENGTH 2 -#define SDL_ID_LENGTH 2 +#define SDL_ID_LENGTH 2 #define SDL_RESERVED_OFFSET PARAMETER_VALUE_OFFSET #define SDL_ID_OFFSET (SDL_RESERVED_OFFSET + SDL_RESERVED_LENGTH) @@ -806,7 +806,7 @@ dissect_m2ua_sdl_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *param reserved = tvb_get_ntohs(parameter_tvb, SDT_RESERVED_OFFSET); id = tvb_get_ntohs(parameter_tvb, SDT_ID_OFFSET); - + proto_tree_add_uint(parameter_tree, hf_m2ua_sdl_reserved, parameter_tvb, SDL_RESERVED_OFFSET, SDL_RESERVED_LENGTH, reserved); proto_tree_add_uint(parameter_tree, hf_m2ua_sdl_id, parameter_tvb, SDL_ID_OFFSET, SDL_ID_LENGTH, id); @@ -818,7 +818,7 @@ dissect_m2ua_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -858,7 +858,7 @@ dissect_m2ua_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree * status = tvb_get_ntohl(parameter_tvb, REGISTRATION_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_registration_status, parameter_tvb, REGISTRATION_STATUS_OFFSET, REGISTRATION_STATUS_LENGTH, status); - + proto_item_set_text(parameter_item, "Registration status parameter (%s)", val_to_str(status, m2ua_registration_status_values, "unknown")); } @@ -867,7 +867,7 @@ dissect_m2ua_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_inf { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -899,7 +899,7 @@ dissect_m2ua_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree status = tvb_get_ntohl(parameter_tvb, DEREGISTRATION_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m2ua_deregistration_status, parameter_tvb, DEREGISTRATION_STATUS_OFFSET, DEREGISTRATION_STATUS_LENGTH, status); - + proto_item_set_text(parameter_item, "Deregistration status parameter (%s)", val_to_str(status, m2ua_deregistration_status_values, "unknown")); } @@ -907,14 +907,14 @@ static void dissect_m2ua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 tag, length, parameter_value_length; - + tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + parameter_value_length = length - PARAMETER_HEADER_LENGTH; if (parameter_value_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, + proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); @@ -1097,7 +1097,7 @@ dissect_m2ua_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree * }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, + proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } @@ -1118,7 +1118,7 @@ dissect_m2ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - dissect_m2ua_parameter(parameter_tvb, pinfo, tree, m2ua_tree); + dissect_m2ua_parameter(parameter_tvb, pinfo, tree, m2ua_tree); /* get rid of the handled parameter */ offset += total_length; } @@ -1132,7 +1132,7 @@ dissect_m2ua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree common_header_tvb = tvb_new_subset(message_tvb, 0, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); parameters_tvb = tvb_new_subset(message_tvb, COMMON_HEADER_LENGTH, -1, -1); - dissect_m2ua_common_header(common_header_tvb, pinfo, m2ua_tree); + dissect_m2ua_common_header(common_header_tvb, pinfo, m2ua_tree); dissect_m2ua_parameters(parameters_tvb, pinfo, tree, m2ua_tree); } @@ -1143,9 +1143,9 @@ dissect_m2ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m2ua_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2UA"); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -1162,32 +1162,32 @@ dissect_m2ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_m2ua(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_m2ua_version, { "Version", "m2ua.version", FT_UINT8, BASE_DEC, VALS(m2ua_protocol_version_values), 0x0, "", HFILL } }, - { &hf_m2ua_reserved, { "Reserved", "m2ua.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_reserved, { "Reserved", "m2ua.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_m2ua_message_class, { "Message class", "m2ua.message_class", FT_UINT8, BASE_DEC, VALS(m2ua_message_class_values), 0x0, "", HFILL } }, { &hf_m2ua_message_type, { "Message Type", "m2ua.message_type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_message_length, { "Message length", "m2ua.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_message_length, { "Message length", "m2ua.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m2ua_parameter_tag, { "Parameter Tag", "m2ua.parameter_tag", FT_UINT16, BASE_HEX, VALS(m2ua_parameter_tag_values), 0x0, "", HFILL } }, - { &hf_m2ua_parameter_length, { "Parameter length", "m2ua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_parameter_value, { "Parameter value", "m2ua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_parameter_padding, { "Padding", "m2ua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_interface_id_int, { "Interface Identifier (integer)", "m2ua.interface_identifier_int", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_interface_id_text, { "Interface identifier (text)", "m2ua.interface_identifier_text", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_info_string, { "Info string", "m2ua.info_string", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_diagnostic_information, { "Diagnostic information", "m2ua.diagnostic_information", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_interface_id_start, { "Interface Identifier (start)", "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_interface_id_stop, { "Interface Identifier (stop)", "m2ua.interface_identifier_stop", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_heartbeat_data, { "Heartbeat data", "m2ua.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_traffic_mode_type, { "Traffic mode Type", "m2ua.traffic_mode_type", FT_UINT32, BASE_DEC, VALS(m2ua_traffic_mode_type_values), 0x0, "", HFILL } }, - { &hf_m2ua_error_code, { "Error code", "m2ua.error_code", FT_UINT32, BASE_DEC, VALS(m2ua_error_code_values), 0x0, "", HFILL } }, - { &hf_m2ua_status_type, { "Status type", "m2ua.status_type", FT_UINT16, BASE_DEC, VALS(m2ua_status_type_values), 0x0, "", HFILL } }, - { &hf_m2ua_status_info, { "Status info", "m2ua.status_info", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_asp_id, { "ASP identifier", "m2ua.asp_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, - { &hf_m2ua_correlation_id, { "Correlation identifier", "m2ua.correlation identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_parameter_length, { "Parameter length", "m2ua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_parameter_value, { "Parameter value", "m2ua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_parameter_padding, { "Padding", "m2ua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_interface_id_int, { "Interface Identifier (integer)", "m2ua.interface_identifier_int", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_interface_id_text, { "Interface identifier (text)", "m2ua.interface_identifier_text", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_info_string, { "Info string", "m2ua.info_string", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_diagnostic_information, { "Diagnostic information", "m2ua.diagnostic_information", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_interface_id_start, { "Interface Identifier (start)", "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_interface_id_stop, { "Interface Identifier (stop)", "m2ua.interface_identifier_stop", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_heartbeat_data, { "Heartbeat data", "m2ua.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_traffic_mode_type, { "Traffic mode Type", "m2ua.traffic_mode_type", FT_UINT32, BASE_DEC, VALS(m2ua_traffic_mode_type_values), 0x0, "", HFILL } }, + { &hf_m2ua_error_code, { "Error code", "m2ua.error_code", FT_UINT32, BASE_DEC, VALS(m2ua_error_code_values), 0x0, "", HFILL } }, + { &hf_m2ua_status_type, { "Status type", "m2ua.status_type", FT_UINT16, BASE_DEC, VALS(m2ua_status_type_values), 0x0, "", HFILL } }, + { &hf_m2ua_status_info, { "Status info", "m2ua.status_info", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_asp_id, { "ASP identifier", "m2ua.asp_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_m2ua_correlation_id, { "Correlation identifier", "m2ua.correlation identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m2ua_data_2_li, { "Length indicator", "m2ua.data_2_li", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m2ua_state, { "State", "m2ua.state", FT_UINT32, BASE_DEC, VALS(m2ua_state_values), 0x0, "", HFILL } }, { &hf_m2ua_event, { "Event", "m2ua.event", FT_UINT32, BASE_DEC, VALS(m2ua_event_values), 0x0, "", HFILL } }, @@ -1204,13 +1204,13 @@ proto_register_m2ua(void) { &hf_m2ua_registration_status, { "Registration status", "m2ua.registration_status", FT_UINT32, BASE_DEC, VALS(m2ua_registration_status_values), 0x0, "", HFILL } }, { &hf_m2ua_deregistration_status, { "Deregistration status", "m2ua.deregistration_status", FT_UINT32, BASE_DEC, VALS(m2ua_deregistration_status_values), 0x0, "", HFILL } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_m2ua, &ett_m2ua_parameter, }; - + /* Register the protocol name and description */ proto_m2ua = proto_register_protocol("MTP 2 User Adaptation Layer", "M2UA", "m2ua"); @@ -1224,7 +1224,7 @@ void proto_reg_handoff_m2ua(void) { dissector_handle_t m2ua_handle; - + mtp3_handle = find_dissector("mtp3"); m2ua_handle = create_dissector_handle(dissect_m2ua, proto_m2ua); dissector_add("sctp.ppi", M2UA_PAYLOAD_PROTO_ID, m2ua_handle); diff --git a/packet-m3ua.c b/packet-m3ua.c index 607e85527d..36de6e4cde 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -9,24 +9,24 @@ * * Copyright 2000, 2001, 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-m3ua.c,v 1.20 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-m3ua.c,v 1.21 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -112,7 +112,7 @@ static const value_string m3ua_v6_parameter_tag_values[] = { { V6_REASON_PARAMETER_TAG, "Reason" }, { V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, { V6_ERROR_CODE_PARAMETER_TAG, "Error code" }, - { V6_STATUS_PARAMETER_TAG, "Status" }, + { V6_STATUS_PARAMETER_TAG, "Status" }, { V6_CONGESTION_INDICATION_PARAMETER_TAG, "Congestion indication" }, { V6_CONCERNED_DESTINATION_PARAMETER_TAG, "Concerned destination" }, { V6_ROUTING_KEY_PARAMETER_TAG, "Routing Key" }, @@ -127,7 +127,7 @@ static const value_string m3ua_v6_parameter_tag_values[] = { { V6_REGISTRATION_RESULTS_PARAMETER_TAG, "Registration results" }, { V6_DEREGISTRATION_RESULTS_PARAMETER_TAG, "De-registration results" }, { 0, NULL } }; - + #define V12_INFO_STRING_PARAMETER_TAG 0x0004 #define V12_ROUTING_CONTEXT_PARAMETER_TAG 0x0006 #define V12_DIAGNOSTIC_INFORMATION_PARAMETER_TAG 0x0007 @@ -383,7 +383,7 @@ static gint m3ua_version = M3UA_V12; static void dissect_m3ua_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -401,7 +401,7 @@ dissect_m3ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot { guint8 version, reserved, message_class, message_type; guint32 message_length; - + /* Extract the common header */ version = tvb_get_guint8(common_header_tvb, VERSION_OFFSET); reserved = tvb_get_guint8(common_header_tvb, RESERVED_OFFSET); @@ -420,7 +420,7 @@ dissect_m3ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot proto_tree_add_uint(m3ua_tree, hf_m3ua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); proto_tree_add_uint(m3ua_tree, hf_m3ua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class); proto_tree_add_uint_format(m3ua_tree, hf_m3ua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, - "Message type: %s (%u)", + "Message type: %s (%u)", val_to_str(message_class * 256 + message_type, m3ua_message_class_type_values, "reserved"), message_type); proto_tree_add_uint(m3ua_tree, hf_m3ua_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, message_length); } @@ -435,7 +435,7 @@ dissect_m3ua_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete char *info_string; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + info_string_length = length - PARAMETER_HEADER_LENGTH; info_string = (char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length); proto_tree_add_string(parameter_tree, hf_m3ua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, info_string); @@ -466,7 +466,7 @@ static void dissect_m3ua_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, diagnostic_info_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); diagnostic_info_length = length - PARAMETER_HEADER_LENGTH; @@ -480,9 +480,9 @@ static void dissect_m3ua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, heartbeat_data_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + heartbeat_data_length = length - PARAMETER_HEADER_LENGTH; proto_tree_add_bytes(parameter_tree, hf_m3ua_heartbeat_data, parameter_tvb, PARAMETER_VALUE_OFFSET, heartbeat_data_length, @@ -530,7 +530,7 @@ dissect_m3ua_v12_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET); - proto_tree_add_uint_format(parameter_tree, hf_m3ua_traffic_mode_type, + proto_tree_add_uint_format(parameter_tree, hf_m3ua_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, traffic_mode_type, "Traffic mode type: %u (%s)", traffic_mode_type, val_to_str(traffic_mode_type, m3ua_v12_traffic_mode_type_values, "unknown")); @@ -672,7 +672,7 @@ dissect_m3ua_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre proto_tree_add_uint_format(parameter_tree, hf_m3ua_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, m3ua_status_type_info_values, "unknown"), status_info); - proto_item_set_text(parameter_item, + proto_item_set_text(parameter_item, "Status type / ID (%s)", val_to_str(status_type * 256 * 256 + status_info, m3ua_status_type_info_values, "unknown status information")); } @@ -683,7 +683,7 @@ static void dissect_m3ua_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 identifier; - + identifier = tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET); proto_tree_add_uint(parameter_tree, hf_m3ua_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, identifier); proto_item_set_text(parameter_item, "ASP identifier (%u)", identifier); @@ -857,7 +857,7 @@ static void dissect_m3ua_congestion_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 level; - + level = tvb_get_guint8(parameter_tvb, CONG_IND_LEVEL_OFFSET); proto_tree_add_bytes(parameter_tree, hf_m3ua_congestion_reserved, parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH, @@ -876,7 +876,7 @@ static void dissect_m3ua_concerned_destination_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 pc; - + pc = tvb_get_ntoh24(parameter_tvb, CON_DEST_PC_OFFSET); proto_tree_add_bytes(parameter_tree, hf_m3ua_concerned_dest_reserved, parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH, @@ -890,7 +890,7 @@ dissect_m3ua_routing_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -929,7 +929,7 @@ dissect_m3ua_v6_registration_result_parameter(tvbuff_t *parameter_tvb, proto_tre proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_identifier, parameter_tvb, REG_RES_IDENTIFIER_OFFSET, REG_RES_IDENTIFIER_LENGTH, id); proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_status, parameter_tvb, REG_RES_STATUS_OFFSET, REG_RES_STATUS_LENGTH, status); - proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_context, parameter_tvb, REG_RES_CONTEXT_OFFSET, REG_RES_CONTEXT_LENGTH, context); + proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_context, parameter_tvb, REG_RES_CONTEXT_OFFSET, REG_RES_CONTEXT_LENGTH, context); proto_item_set_text(parameter_item, "Registration result"); } @@ -938,7 +938,7 @@ dissect_m3ua_v12_registration_result_parameter(tvbuff_t *parameter_tvb, packet_i { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -968,7 +968,7 @@ dissect_m3ua_v6_deregistration_result_parameter(tvbuff_t *parameter_tvb, proto_t context = tvb_get_ntohl(parameter_tvb, DEREG_RES_CONTEXT_OFFSET); status = tvb_get_ntohl(parameter_tvb, DEREG_RES_STATUS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_result_context, parameter_tvb, DEREG_RES_CONTEXT_OFFSET, DEREG_RES_CONTEXT_LENGTH, context); + proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_result_context, parameter_tvb, DEREG_RES_CONTEXT_OFFSET, DEREG_RES_CONTEXT_LENGTH, context); proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_result_status, parameter_tvb, DEREG_RES_STATUS_OFFSET, DEREG_RES_STATUS_LENGTH, status); proto_item_set_text(parameter_item, "De-registration result"); @@ -979,7 +979,7 @@ dissect_m3ua_v12_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -995,7 +995,7 @@ static void dissect_m3ua_local_routing_key_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 id; - + id = tvb_get_ntohl(parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET); proto_tree_add_uint(parameter_tree, hf_m3ua_local_rk_identifier, parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET, LOCAL_RK_IDENTIFIER_LENGTH, id); proto_item_set_text(parameter_item, "Local routing key identifier (%u)", id); @@ -1012,7 +1012,7 @@ dissect_m3ua_destination_point_code_parameter(tvbuff_t *parameter_tvb, proto_tre { guint32 pc; guint8 mask; - + mask = tvb_get_guint8(parameter_tvb, DPC_MASK_OFFSET); pc = tvb_get_ntoh24(parameter_tvb, DPC_PC_OFFSET); @@ -1171,7 +1171,7 @@ dissect_m3ua_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo proto_item_set_text(parameter_item, "Protocol data (SS7 message of %u byte%s)", ulp_length, plurality(ulp_length, "", "s")); proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + DATA_HDR_LENGTH); - + if (!dissector_try_port(m3ua_si_dissector_table, si, payload_tvb, pinfo, tree)) { call_dissector(data_handle, payload_tvb, pinfo, tree); } @@ -1184,7 +1184,7 @@ static void dissect_m3ua_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 id; - + id = tvb_get_ntohl(parameter_tvb, CORR_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_m3ua_correlation_identifier, parameter_tvb, CORR_ID_OFFSET, CORR_ID_LENGTH, id); proto_item_set_text(parameter_item, "Correlation Identifer (%u)", id); @@ -1211,7 +1211,7 @@ static void dissect_m3ua_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 status; - + status = tvb_get_ntohl(parameter_tvb, REG_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m3ua_registration_status, parameter_tvb, REG_STATUS_OFFSET, REG_STATUS_LENGTH, status); proto_item_set_text(parameter_item, "Registration status (%s)", val_to_str(status, m3ua_registration_status_values, "unknown")); @@ -1233,7 +1233,7 @@ static void dissect_m3ua_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 status; - + status = tvb_get_ntohl(parameter_tvb, DEREG_STATUS_OFFSET); proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_status, parameter_tvb, DEREG_STATUS_OFFSET, DEREG_STATUS_LENGTH, status); proto_item_set_text(parameter_item, "Deregistration status (%s)", val_to_str(status, m3ua_deregistration_status_values, "unknown")); @@ -1244,7 +1244,7 @@ dissect_m3ua_registration_results_parameter(tvbuff_t *parameter_tvb, packet_info { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -1257,7 +1257,7 @@ dissect_m3ua_deregistration_results_parameter(tvbuff_t *parameter_tvb, packet_in { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); @@ -1269,13 +1269,13 @@ static void dissect_m3ua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 tag, length, parameter_value_length; - + tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + parameter_value_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, + proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); @@ -1301,7 +1301,7 @@ dissect_m3ua_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tre parameter_tree = proto_item_add_subtree(parameter_item, ett_m3ua_parameter); /* add tag and length to the m3ua tree */ - proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, + proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, "Parameter tag: %s (0x%x)", val_to_str(tag, m3ua_v6_parameter_tag_values, "unknown"), tag); proto_tree_add_uint(parameter_tree, hf_m3ua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); @@ -1390,7 +1390,7 @@ dissect_m3ua_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tre }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, + proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } @@ -1414,7 +1414,7 @@ dissect_m3ua_v12_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tr parameter_tree = proto_item_add_subtree(parameter_item, ett_m3ua_parameter); /* add tag and length to the m3ua tree */ - proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, + proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, "Parameter tag: %s (0x%x)", val_to_str(tag, m3ua_v12_parameter_tag_values, "unknown"), tag); proto_tree_add_uint(parameter_tree, hf_m3ua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); @@ -1500,7 +1500,7 @@ dissect_m3ua_v12_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tr }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, + proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } @@ -1522,7 +1522,7 @@ dissect_m3ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); switch(m3ua_version) { case M3UA_V6: - dissect_m3ua_v6_parameter(parameter_tvb, pinfo, tree, m3ua_tree); + dissect_m3ua_v6_parameter(parameter_tvb, pinfo, tree, m3ua_tree); break; case M3UA_V12: dissect_m3ua_v12_parameter(parameter_tvb, pinfo, tree, m3ua_tree); @@ -1541,7 +1541,7 @@ dissect_m3ua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree common_header_tvb = tvb_new_subset(message_tvb, 0, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); parameters_tvb = tvb_new_subset(message_tvb, COMMON_HEADER_LENGTH, -1, -1); - dissect_m3ua_common_header(common_header_tvb, pinfo, m3ua_tree); + dissect_m3ua_common_header(common_header_tvb, pinfo, m3ua_tree); if (m3ua_tree) dissect_m3ua_parameters(parameters_tvb, pinfo, tree, m3ua_tree); } @@ -1553,9 +1553,9 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m3ua_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA"); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -1572,288 +1572,288 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_m3ua(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_m3ua_version, { "Version", "m3ua.version", - FT_UINT8, BASE_DEC, VALS(m3ua_protocol_version_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m3ua_protocol_version_values), 0x0, "", HFILL } }, { &hf_m3ua_reserved, { "Reserved", "m3ua.reserved", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_message_class, { "Message class", "m3ua.message_class", - FT_UINT8, BASE_DEC, VALS(m3ua_message_class_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m3ua_message_class_values), 0x0, "", HFILL } }, { &hf_m3ua_message_type, { "Message Type", "m3ua.message_type", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m3ua_message_length, { "Message length", "m3ua.message_length", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_parameter_tag, { "Parameter Tag", "m3ua.parameter_tag", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m3ua_parameter_length, { "Parameter length", "m3ua.parameter_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_parameter_value, { "Parameter value", "m3ua.parameter_value", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_parameter_padding, { "Padding", "m3ua.parameter_padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_info_string, { "Info string", "m3ua.info_string", - FT_STRING, BASE_DEC, NULL, 0x0, + FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_routing_context, { "Routing context", "m3ua.routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_diagnostic_information, { "Diagnostic information", "m3ua.diagnostic_information", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_heartbeat_data, { "Heartbeat data", "m3ua.heartbeat_data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_error_code, { "Error code", "m3ua.error_code", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_status_type, { "Status type", "m3ua.status_type", - FT_UINT16, BASE_DEC, VALS(m3ua_status_type_values), 0x0, + FT_UINT16, BASE_DEC, VALS(m3ua_status_type_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_status_info, { "Status info", "m3ua.status_info", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_asp_identifier, { "ASP identifier", "m3ua.asp_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_affected_point_code_mask, { "Mask", "m3ua.affected_point_code_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_affected_point_code_pc, { "Affected point code", "m3ua.affected_point_code_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_network_appearance, { "Network appearance", "m3ua.network_appearance", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_unavailability_cause, { "Unavailability cause", "m3ua.unavailability_cause", - FT_UINT16, BASE_DEC, VALS(m3ua_unavailability_cause_values), 0x0, + FT_UINT16, BASE_DEC, VALS(m3ua_unavailability_cause_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_user_identity, { "User Identity", "m3ua.user_identity", - FT_UINT16, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, + FT_UINT16, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_congestion_reserved, { "Reserved", "m3ua.congestion_reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_congestion_level, { "Congestion level", "m3ua.congestion_level", - FT_UINT8, BASE_DEC, VALS(m3ua_congestion_level_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m3ua_congestion_level_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_concerned_dest_reserved, { "Reserved", "m3ua.concerned_reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_concerned_dest_pc, { "Concerned DPC", "m3ua.concerned_dpc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_dpc_mask, { "Mask", "m3ua.dpc_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_dpc_pc, { "Destination point code", "m3ua.dpc_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_si, { "Service indicator", "m3ua_si", - FT_UINT8, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, + FT_UINT8, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_ssn, { "Subsystem number", "m3ua_ssn", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_opc_list_mask, { "Mask", "m3ua.opc_list_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_opc_list_pc, { "Originating point code", "m3ua.opc_list_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_cic_range_mask, { "Mask", "m3ua.cic_range_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_cic_range_pc, { "Originating point code", "m3ua.cic_range_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_cic_range_lower, { "Lower CIC value", "m3ua.cic_range_lower", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_cic_range_upper, { "Upper CIC value", "m3ua.cic_range_upper", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_local_rk_identifier, { "Local routing key identifier", "m3ua.local_rk_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_li, { "Length indicator", "m3ua.protocol_data_2_li", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_opc, { "OPC", "m3ua.protocol_data_opc", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_dpc, { "DPC", "m3ua.protocol_data_dpc", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_si, { "SI", "m3ua.protocol_data_si", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_ni, { "NI", "m3ua.protocol_data_ni", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_mp, { "MP", "m3ua.protocol_data_mp", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_protocol_data_sls, { "SLS", "m3ua.protocol_data_sls", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_correlation_identifier, { "Correlation Identifier", "m3ua.correlation_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_m3ua_registration_status, { "Registration status", "m3ua.registration_status", - FT_UINT32, BASE_DEC, VALS(m3ua_registration_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m3ua_registration_status_values), 0x0, "", HFILL } }, { &hf_m3ua_deregistration_status, { "Deregistration status", "m3ua.deregistration_status", - FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_status_values), 0x0, "", HFILL } }, { &hf_m3ua_reason, { "Reason", "m3ua_reason", - FT_UINT32, BASE_DEC, VALS(m3ua_reason_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m3ua_reason_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_traffic_mode_type, { "Traffic mode Type", "m3ua.traffic_mode_type", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_registration_result_identifier, { "Local RK-identifier value", "m3ua.registration_result_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_registration_result_status, { "Registration status", "m3ua.registration_results_status", - FT_UINT32, BASE_DEC, VALS(m3ua_registration_result_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m3ua_registration_result_status_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_registration_result_context, { "Routing context", "m3ua.registration_result_routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_m3ua_deregistration_result_status, { "De-Registration status", "m3ua.deregistration_results_status", - FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_result_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_result_status_values), 0x0, "", HFILL } - }, + }, { &hf_m3ua_deregistration_result_context, { "Routing context", "m3ua.deregistration_result_routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_m3ua, &ett_m3ua_parameter, }; - + static enum_val_t m3ua_options[] = { { "Internet Draft version 6", M3UA_V6 }, { "Internet Draft version 12", M3UA_V12 }, diff --git a/packet-mbtcp.c b/packet-mbtcp.c index 4ef65e54f5..7db1a46741 100644 --- a/packet-mbtcp.c +++ b/packet-mbtcp.c @@ -10,22 +10,22 @@ * * for information on Modbus/TCP. * - * $Id: packet-mbtcp.c,v 1.10 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mbtcp.c,v 1.11 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,8 +33,8 @@ /* TODO: * Analysis of the payload of the Modbus packet. - * -- Based on the function code in the header, and the fact that the packet is - * either a query or a response, the different fields in the payload can be + * -- Based on the function code in the header, and the fact that the packet is + * either a query or a response, the different fields in the payload can be * interpreted and displayed. */ @@ -50,7 +50,7 @@ #include <epan/packet.h> -#define DEBUG +#define DEBUG #define TCP_PORT_MBTCP 502 /* Modbus/TCP located on TCP port 502 */ @@ -127,7 +127,7 @@ static int hf_mbtcp_functioncode = -1; /* Initialize the subtree pointers */ static gint ett_mbtcp = -1; static gint ett_modbus_hdr = -1; - + static int classify_packet(packet_info *pinfo) { @@ -136,16 +136,16 @@ classify_packet(packet_info *pinfo) if ( ( 502 == pinfo->srcport && 502 != pinfo->destport ) || ( 502 != pinfo->srcport && 502 == pinfo->destport ) ) { /* the slave is receiving queries on port 502 */ - if ( 502 == pinfo->srcport ) + if ( 502 == pinfo->srcport ) return response_packet; - else if ( 502 == pinfo->destport ) + else if ( 502 == pinfo->destport ) return query_packet; } /* else, cannot classify */ return cannot_classify; } -/* returns string describing function, as given on p6 of +/* returns string describing function, as given on p6 of * "Open Modbus/TCP Specification", release 1 by Andy Swales. */ static char * function_string(guint16 func_code) @@ -213,12 +213,12 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char *func_string = "", pkt_type_str[9] = ""; char err_str[100] = ""; int packet_type; - guint32 packet_num = 0; /* num to uniquely identify different mbtcp + guint32 packet_num = 0; /* num to uniquely identify different mbtcp * packets in one TCP packet */ guint8 exception_code = 0, exception_returned = 0; - + /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Modbus/TCP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -238,9 +238,9 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { packet_type = classify_packet(pinfo); switch ( packet_type ) { - case query_packet : strcpy(pkt_type_str, "query"); + case query_packet : strcpy(pkt_type_str, "query"); break; - case response_packet : strcpy(pkt_type_str, "response"); + case response_packet : strcpy(pkt_type_str, "response"); break; case cannot_classify : strcpy(err_str, "Unable to classify as query or response."); strcpy(pkt_type_str, "unknown"); @@ -250,11 +250,11 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if ( exception_returned ) strcpy(err_str, "Exception returned "); - col_add_fstr(pinfo->cinfo, COL_INFO, - "%8s [%2u pkt(s)]: trans: %5u; unit: %3u, func: %3u: %s. %s", - pkt_type_str, 1, mh.transaction_id, (unsigned char) mh.mdbs_hdr.unit_id, + col_add_fstr(pinfo->cinfo, COL_INFO, + "%8s [%2u pkt(s)]: trans: %5u; unit: %3u, func: %3u: %s. %s", + pkt_type_str, 1, mh.transaction_id, (unsigned char) mh.mdbs_hdr.unit_id, (unsigned char) mh.mdbs_hdr.function_code, func_string, err_str); - } + } /* build up protocol tree */ do { @@ -263,64 +263,64 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mh.transaction_id = g_ntohs(mh.transaction_id); mh.protocol_id = g_ntohs(mh.protocol_id); mh.len = g_ntohs(mh.len); - + if ( mh.mdbs_hdr.function_code & 0x80 ) { tvb_memcpy(tvb, (guint8 *)&exception_code, offset + sizeof(mbtcp_hdr), 1); mh.mdbs_hdr.function_code ^= 0x80; exception_returned = 1; - } else + } else exception_code = 0; - + packet_type = classify_packet(pinfo); - + /* if a tree exists, perform operations to add fields to it */ if (tree) { packet_len = sizeof(mbtcp_hdr) - sizeof(modbus_hdr) + mh.len; - mi = proto_tree_add_protocol_format(tree, proto_mbtcp, tvb, offset, + mi = proto_tree_add_protocol_format(tree, proto_mbtcp, tvb, offset, packet_len, "Modbus/TCP"); mbtcp_tree = proto_item_add_subtree(mi, ett_mbtcp); - + /* Add items to protocol tree */ /* Modbus/TCP */ - proto_tree_add_uint(mbtcp_tree, hf_mbtcp_transid, tvb, offset, 2, + proto_tree_add_uint(mbtcp_tree, hf_mbtcp_transid, tvb, offset, 2, mh.transaction_id); - proto_tree_add_uint(mbtcp_tree, hf_mbtcp_protid, tvb, offset + 2, 2, + proto_tree_add_uint(mbtcp_tree, hf_mbtcp_protid, tvb, offset + 2, 2, mh.protocol_id); - proto_tree_add_uint(mbtcp_tree, hf_mbtcp_len, tvb, offset + 4, 2, + proto_tree_add_uint(mbtcp_tree, hf_mbtcp_len, tvb, offset + 4, 2, mh.len); /* Modbus */ packet_end = mh.len; - mf = proto_tree_add_text(mbtcp_tree, tvb, offset + 6, packet_end, + mf = proto_tree_add_text(mbtcp_tree, tvb, offset + 6, packet_end, "Modbus"); - modbus_tree = proto_item_add_subtree(mf, ett_modbus_hdr); - proto_tree_add_item(modbus_tree, hf_mbtcp_unitid, tvb, offset + 6, 1, + modbus_tree = proto_item_add_subtree(mf, ett_modbus_hdr); + proto_tree_add_item(modbus_tree, hf_mbtcp_unitid, tvb, offset + 6, 1, mh.mdbs_hdr.unit_id); - mi = proto_tree_add_item(modbus_tree, hf_mbtcp_functioncode, tvb, offset + 7, 1, + mi = proto_tree_add_item(modbus_tree, hf_mbtcp_functioncode, tvb, offset + 7, 1, mh.mdbs_hdr.function_code); func_string = function_string(mh.mdbs_hdr.function_code); - if ( 0 == exception_code ) - proto_item_set_text(mi, "function %u: %s", mh.mdbs_hdr.function_code, + if ( 0 == exception_code ) + proto_item_set_text(mi, "function %u: %s", mh.mdbs_hdr.function_code, func_string); - else - proto_item_set_text(mi, "function %u: %s. Exception: %s", - mh.mdbs_hdr.function_code, func_string, exception_string(exception_code)); - + else + proto_item_set_text(mi, "function %u: %s. Exception: %s", + mh.mdbs_hdr.function_code, func_string, exception_string(exception_code)); + packet_end = mh.len - 2; - proto_tree_add_text(modbus_tree, tvb, offset + 8, packet_end, + proto_tree_add_text(modbus_tree, tvb, offset + 8, packet_end, "Modbus data"); } offset = offset + sizeof(mbtcp_hdr) + (mh.len - sizeof(modbus_hdr)); packet_num++; } while ( tvb_reported_length_remaining(tvb, offset) > 0 ); - + /* Update entries in Info column on summary display */ if (check_col(pinfo->cinfo, COL_INFO)) { switch ( packet_type ) { - case query_packet : strcpy(pkt_type_str, "query"); + case query_packet : strcpy(pkt_type_str, "query"); break; - case response_packet : strcpy(pkt_type_str, "response"); + case response_packet : strcpy(pkt_type_str, "response"); break; case cannot_classify : strcpy(err_str, "Unable to classify as query or response."); strcpy(pkt_type_str, "unknown"); @@ -330,10 +330,10 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if ( exception_returned ) strcpy(err_str, "Exception returned "); - col_add_fstr(pinfo->cinfo, COL_INFO, - "%8s [%2u pkt(s)]: trans: %5u; unit: %3u, func: %3u: %s. %s", - pkt_type_str, packet_num, mh.transaction_id, (unsigned char) mh.mdbs_hdr.unit_id, - (unsigned char) mh.mdbs_hdr.function_code, func_string, err_str); + col_add_fstr(pinfo->cinfo, COL_INFO, + "%8s [%2u pkt(s)]: trans: %5u; unit: %3u, func: %3u: %s. %s", + pkt_type_str, packet_num, mh.transaction_id, (unsigned char) mh.mdbs_hdr.unit_id, + (unsigned char) mh.mdbs_hdr.function_code, func_string, err_str); } /* If this protocol has a sub-dissector call it here, see section 1.8 */ @@ -348,35 +348,35 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_modbus(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { /* Modbus/TCP header fields */ { &hf_mbtcp_transid, { "transaction identifier", "modbus_tcp.trans_id", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_mbtcp_protid, { "protocol identifier", "modbus_tcp.prot_id", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_mbtcp_len, { "length", "modbus_tcp.len", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, /* Modbus header fields */ { &hf_mbtcp_unitid, { "unit identifier", "modbus_tcp.unit_id", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_mbtcp_functioncode, { "function code ", "modbus_tcp.func_code", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } } }; diff --git a/packet-mip.c b/packet-mip.c index eb9ea4da85..c649df1021 100644 --- a/packet-mip.c +++ b/packet-mip.c @@ -2,7 +2,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab <sraab@cisco.com> * - * $Id: packet-mip.c,v 1.32 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mip.c,v 1.33 2002/08/28 21:00:20 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -188,7 +188,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) ext_len = tvb_get_guint8(tvb, offset + 1); hdrLen = 2; } - + ti = proto_tree_add_text(exts_tree, tvb, offset, ext_len + hdrLen, "Extension: %s", val_to_str(ext_type, mip_ext_types, @@ -213,7 +213,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) FALSE); break; case MN_NAI_EXT: - proto_tree_add_item(ext_tree, hf_mip_next_nai, tvb, offset, + proto_tree_add_item(ext_tree, hf_mip_next_nai, tvb, offset, ext_len, FALSE); break; @@ -231,7 +231,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) /* Key */ proto_tree_add_item(ext_tree, hf_mip_aext_auth, tvb, offset + 4, ext_len - 4, FALSE); - + break; case OLD_CVSE_EXT: /* RFC 3115 */ case CVSE_EXT: /* RFC 3115 */ @@ -262,30 +262,30 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flags; nstime_t ident_time; size_t offset=0; - + /* Make entries in Protocol column and Info column on summary display */ - - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MobileIP"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); type = tvb_get_guint8(tvb, offset); switch (type) { case REGISTRATION_REQUEST: - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Request: HAddr=%s COA=%s", + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Request: HAddr=%s COA=%s", ip_to_str(tvb_get_ptr(tvb, 4, 4)), ip_to_str(tvb_get_ptr(tvb,12,4))); - + if (tree) { ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); mip_tree = proto_item_add_subtree(ti, ett_mip); - + /* type */ proto_tree_add_uint(mip_tree, hf_mip_type, tvb, offset, 1, type); offset++; - + /* flags */ flags = tvb_get_guint8(tvb, offset); tf = proto_tree_add_uint(mip_tree, hf_mip_flags, tvb, @@ -303,15 +303,15 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* lifetime */ proto_tree_add_item(mip_tree, hf_mip_life, tvb, offset, 2, FALSE); offset +=2; - + /* home address */ proto_tree_add_item(mip_tree, hf_mip_homeaddr, tvb, offset, 4, FALSE); offset += 4; - + /* home agent address */ proto_tree_add_item(mip_tree, hf_mip_haaddr, tvb, offset, 4, FALSE); offset += 4; - + /* Care of Address */ proto_tree_add_item(mip_tree, hf_mip_coa, tvb, offset, 4, FALSE); offset += 4; @@ -321,23 +321,23 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ident_time.nsecs = tvb_get_ntohl(tvb,20)*1000; proto_tree_add_time(mip_tree, hf_mip_ident, tvb, offset, 8, &ident_time); offset += 8; - + } /* if tree */ break; case REGISTRATION_REPLY: - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Reply: HAddr=%s, Code=%u", + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Reply: HAddr=%s, Code=%u", ip_to_str(tvb_get_ptr(tvb,4,4)), tvb_get_guint8(tvb,1)); - + if (tree) { /* Add Subtree */ ti = proto_tree_add_item(tree, proto_mip, tvb, offset, -1, FALSE); mip_tree = proto_item_add_subtree(ti, ett_mip); - + /* Type */ proto_tree_add_uint(mip_tree, hf_mip_type, tvb, offset, 1, type); offset++; - + /* Reply Code */ proto_tree_add_item(mip_tree, hf_mip_code, tvb, offset, 1, FALSE); offset++; @@ -360,7 +360,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_time(mip_tree, hf_mip_ident, tvb, offset, 8, &ident_time); offset += 8; } /* if tree */ - + break; } /* End switch */ @@ -372,13 +372,13 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_mip(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_mip_type, { "Message Type", "mip.type", - FT_UINT8, BASE_DEC, VALS(mip_types), 0, + FT_UINT8, BASE_DEC, VALS(mip_types), 0, "Mobile IP Message type.", HFILL } }, { &hf_mip_flags, @@ -389,78 +389,78 @@ void proto_register_mip(void) { &hf_mip_s, {"Simultaneous Bindings", "mip.s", - FT_BOOLEAN, 8, NULL, 128, + FT_BOOLEAN, 8, NULL, 128, "Simultaneous Bindings Allowed", HFILL } }, { &hf_mip_b, {"Broadcast Datagrams", "mip.b", - FT_BOOLEAN, 8, NULL, 64, + FT_BOOLEAN, 8, NULL, 64, "Broadcast Datagrams requested", HFILL } }, { &hf_mip_d, { "Co-lcated Care-of Address", "mip.d", - FT_BOOLEAN, 8, NULL, 32, + FT_BOOLEAN, 8, NULL, 32, "MN using Co-located Care-of address", HFILL } }, { &hf_mip_m, {"Minimal Encapsulation", "mip.m", - FT_BOOLEAN, 8, NULL, 16, + FT_BOOLEAN, 8, NULL, 16, "MN wants Minimal encapsulation", HFILL } }, { &hf_mip_g, {"GRE", "mip.g", - FT_BOOLEAN, 8, NULL, 8, + FT_BOOLEAN, 8, NULL, 8, "MN wants GRE encapsulation", HFILL } }, { &hf_mip_v, { "Van Jacobson", "mip.v", - FT_BOOLEAN, 8, NULL, 4, + FT_BOOLEAN, 8, NULL, 4, "Van Jacobson", HFILL } }, { &hf_mip_t, { "Reverse Tunneling", "mip.t", - FT_BOOLEAN, 8, NULL, 2, + FT_BOOLEAN, 8, NULL, 2, "Reverse tunneling requested", HFILL } }, { &hf_mip_code, { "Reply Code", "mip.code", - FT_UINT8, BASE_DEC, VALS(mip_reply_codes), 0, + FT_UINT8, BASE_DEC, VALS(mip_reply_codes), 0, "Mobile IP Reply code.", HFILL } }, { &hf_mip_life, { "Lifetime", "mip.life", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Mobile IP Lifetime.", HFILL } }, { &hf_mip_homeaddr, { "Home Address", "mip.homeaddr", - FT_IPv4, BASE_NONE, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Mobile Node's home address.", HFILL } }, - + { &hf_mip_haaddr, { "Home Agent", "mip.haaddr", - FT_IPv4, BASE_NONE, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Home agent IP Address.", HFILL } }, { &hf_mip_coa, { "Care of Address", "mip.coa", - FT_IPv4, BASE_NONE, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Care of Address.", HFILL } }, { &hf_mip_ident, { "Identification", "mip.ident", - FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, + FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "MN Identification.", HFILL } }, { &hf_mip_ext_type, { "Extension Type", "mip.ext.type", - FT_UINT8, BASE_DEC, VALS(mip_ext_types), 0, + FT_UINT8, BASE_DEC, VALS(mip_ext_types), 0, "Mobile IP Extension Type.", HFILL } }, { &hf_mip_ext_stype, { "Gen Auth Ext SubType", "mip.ext.auth.subtype", - FT_UINT8, BASE_DEC, VALS(mip_ext_stypes), 0, + FT_UINT8, BASE_DEC, VALS(mip_ext_stypes), 0, "Mobile IP Auth Extension Sub Type.", HFILL } }, { &hf_mip_ext_len, diff --git a/packet-mount.c b/packet-mount.c index ba9ebbc350..592aeae7e2 100644 --- a/packet-mount.c +++ b/packet-mount.c @@ -1,7 +1,7 @@ /* packet-mount.c * Routines for mount dissection * - * $Id: packet-mount.c,v 1.32 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mount.c,v 1.33 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -80,9 +80,9 @@ static int group_names_len; /* RFC 1094, Page 24 */ /* This function dissects fhstatus for v1 and v2 of the mount protocol. * Formally, hf_mount3_status only define the status codes returned by version - * 3 of the protocol. - * Though not formally defined in the standard, we use the same - * value-to-string mappings as version 3 since we belive that this mapping + * 3 of the protocol. + * Though not formally defined in the standard, we use the same + * value-to-string mappings as version 3 since we belive that this mapping * is consistant with most v1 and v2 implementations. */ static int @@ -176,7 +176,7 @@ dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree lock_tree = proto_item_add_subtree(lock_item, ett_mount_mountlist); } - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_mount_mountlist_hostname, offset, &hostname); offset = dissect_rpc_string(tvb, lock_tree, hf_mount_mountlist_directory, offset, &directory); @@ -225,7 +225,7 @@ dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre } group_name_list[group_names_len]=0; - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_mount_groups_group, offset, NULL); return offset; @@ -386,7 +386,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_MAX_CANON|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_max_canon,tvb,offset+2,2, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -395,7 +395,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_MAX_INPUT|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_max_input,tvb,offset+2,2, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -404,7 +404,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_NAME_MAX|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_name_max,tvb,offset+2,2, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -413,7 +413,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_PATH_MAX|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_path_max,tvb,offset+2,2, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -422,7 +422,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_PIPE_BUF|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_pipe_buf,tvb,offset+2,2, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -433,7 +433,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (!(pc_mask & (PC_ERROR_VDISABLE|PC_ERROR_ALL))) { if (tree) { - proto_tree_add_item(tree, + proto_tree_add_item(tree, hf_mount_pathconf_vdisable,tvb,offset+3,1, tvb_get_ntohs(tvb,offset)&0xffff); } @@ -474,7 +474,7 @@ dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } /* RFC 1813, Page 107 */ -static const value_string mount3_mountstat3[] = +static const value_string mount3_mountstat3[] = { { 0, "OK" }, { 1, "ERR_PERM" }, @@ -511,7 +511,7 @@ dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr guint32 auth_flavors; guint32 auth_flavor; guint32 auth_flavor_i; - + offset = dissect_mountstat3(tvb,tree,offset,hf_mount3_status,&status); switch (status) { @@ -533,7 +533,7 @@ dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* void */ break; } - + return offset; } @@ -544,11 +544,11 @@ dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* Mount protocol version 1, RFC 1094 */ static const vsff mount1_proc[] = { { 0, "NULL", NULL, NULL }, - { MOUNTPROC_MNT, "MNT", + { MOUNTPROC_MNT, "MNT", dissect_mount_dirpath_call, dissect_mount1_mnt_reply }, { MOUNTPROC_DUMP, "DUMP", NULL, dissect_mount_dump_reply }, - { MOUNTPROC_UMNT, "UMNT", + { MOUNTPROC_UMNT, "UMNT", dissect_mount_dirpath_call, NULL }, { MOUNTPROC_UMNTALL, "UMNTALL", NULL, NULL }, @@ -566,11 +566,11 @@ static const vsff mount1_proc[] = { POSIX "pathconf()" call. */ static const vsff mount2_proc[] = { { 0, "NULL", NULL, NULL }, - { MOUNTPROC_MNT, "MNT", + { MOUNTPROC_MNT, "MNT", dissect_mount_dirpath_call, dissect_mount1_mnt_reply }, { MOUNTPROC_DUMP, "DUMP", NULL, dissect_mount_dump_reply }, - { MOUNTPROC_UMNT, "UMNT", + { MOUNTPROC_UMNT, "UMNT", dissect_mount_dirpath_call, NULL }, { MOUNTPROC_UMNTALL, "UMNTALL", NULL, NULL }, diff --git a/packet-mpeg1.c b/packet-mpeg1.c index 1f3901592d..0c2d8800f0 100644 --- a/packet-mpeg1.c +++ b/packet-mpeg1.c @@ -2,25 +2,25 @@ * * Routines for RFC 2250 MPEG-1 dissection * - * $Id: packet-mpeg1.c,v 1.8 2002/08/02 23:35:54 jmayer Exp $ - * - * Copyright 2001, + * $Id: packet-mpeg1.c,v 1.9 2002/08/28 21:00:22 jmayer Exp $ + * + * Copyright 2001, * Francisco Javier Cabello Torres, <fjcabello@vtools.es> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -87,7 +87,7 @@ static int hf_rtp_mpg_data = -1; /* MPEG-1 fields defining a sub tree */ static gint ett_mpg = -1; -static const value_string rtp_mpg_picture_types_vals[] = +static const value_string rtp_mpg_picture_types_vals[] = { { 0, "Forbidden" }, { 1, "I-Picture" }, @@ -109,40 +109,40 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint8 octet; guint16 word; - - + + guint16 mpg_mbz; guint16 mpg_T; - guint16 mpg_tr; + guint16 mpg_tr; guint16 mpg_an; guint16 mpg_n; - gboolean mpg_s; + gboolean mpg_s; gboolean mpg_b; gboolean mpg_e; - guint16 mpg_p; + guint16 mpg_p; guint16 mpg_fbv; guint16 mpg_bfc; guint16 mpg_ffv; - guint16 mpg_ffc; - - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) + guint16 mpg_ffc; + + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "MPEG-1" ); } - - if ( check_col( pinfo->cinfo, COL_INFO) ) + + if ( check_col( pinfo->cinfo, COL_INFO) ) { col_set_str( pinfo->cinfo, COL_INFO, "MPEG-1 message"); } - + /* Get MPEG-1 fields */ - + word = tvb_get_guint8( tvb, offset ); word = (word << 8) | tvb_get_guint8( tvb, offset +1 ); mpg_mbz = RTP_MPG_MBZ(word); mpg_T = RTP_MPG_T(word); mpg_tr = RTP_MPG_TR(word); - + octet = tvb_get_guint8( tvb, offset + 2 ); mpg_an = RTP_MPG_AN(octet); mpg_n = RTP_MPG_N(octet); @@ -150,20 +150,20 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) mpg_b = RTP_MPG_B(octet); mpg_e = RTP_MPG_E(octet); mpg_p = RTP_MPG_P(octet); - + octet = tvb_get_guint8( tvb, offset + 3 ); - + mpg_fbv = RTP_MPG_FBV(octet); mpg_bfc = RTP_MPG_BFC(octet); mpg_ffv = RTP_MPG_FFV(octet); - mpg_ffc = RTP_MPG_FFC(octet); + mpg_ffc = RTP_MPG_FFC(octet); - - if ( tree ) + + if ( tree ) { ti = proto_tree_add_item( tree, proto_mpg, tvb, offset, -1, FALSE ); mpg_tree = proto_item_add_subtree( ti, ett_mpg ); - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_mbz, tvb, offset, 1, mpg_mbz ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_T , tvb, offset, 1, mpg_T ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_tr , tvb, offset, 2, mpg_tr ); @@ -173,16 +173,16 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_s , tvb, offset, 1, mpg_s ); proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_b , tvb, offset, 1, mpg_b ); proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_e , tvb, offset, 1, mpg_e ); - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_p, tvb , offset, 1, mpg_p ); offset += 1; - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_fbv, tvb, offset, 1, mpg_fbv ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_bfc, tvb, offset, 1, mpg_bfc ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_ffv, tvb, offset, 1, mpg_ffv ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_ffc, tvb, offset, 1, mpg_ffc ); offset += 1; - + /* The rest of the packet is the MPEG-1 stream */ proto_tree_add_item( mpg_tree, hf_rtp_mpg_data, tvb, offset, -1, FALSE ); @@ -192,188 +192,188 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_register_mpeg1(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_rtp_mpg_mbz, - { - "MBZ", - "rtp.payload_mpeg_mbz", - FT_UINT16, - BASE_DEC, - NULL, + { + "MBZ", + "rtp.payload_mpeg_mbz", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_T, - { - "T", - "rtp.payload_mpeg_T", - FT_UINT16, - BASE_DEC, - NULL, + { + "T", + "rtp.payload_mpeg_T", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_tr, - { - "Temporal Reference", - "rtp.payload_mpeg_tr", - FT_UINT16, - BASE_DEC, - NULL, + { + "Temporal Reference", + "rtp.payload_mpeg_tr", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_an, - { - "AN", - "rtp.payload_mpeg_an", - FT_UINT16, - BASE_DEC, - NULL, + { + "AN", + "rtp.payload_mpeg_an", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_n, - { - "New Picture Header", - "rtp.payload_mpeg_n", - FT_UINT16, - BASE_DEC, - NULL, + { + "New Picture Header", + "rtp.payload_mpeg_n", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_s, - { - "Sequence Header", - "rtp.payload_mpeg_s", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "Sequence Header", + "rtp.payload_mpeg_s", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_b, - { - "Beginning-of-slice", - "rtp.payload_mpeg_b", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "Beginning-of-slice", + "rtp.payload_mpeg_b", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_e, - { - "End-of-slice", - "rtp.payload_mpeg_an", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "End-of-slice", + "rtp.payload_mpeg_an", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_p, - { - "Picture type", - "rtp.payload_mpeg_p", - FT_UINT16, - BASE_DEC, - VALS(rtp_mpg_picture_types_vals), + { + "Picture type", + "rtp.payload_mpeg_p", + FT_UINT16, + BASE_DEC, + VALS(rtp_mpg_picture_types_vals), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_fbv, - { - "FBV", - "rtp.payload_mpeg_fbv", - FT_UINT16, - BASE_DEC, - NULL, + { + "FBV", + "rtp.payload_mpeg_fbv", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_bfc, - { - "BFC", - "rtp.payload_mpeg_bfc", - FT_UINT16, - BASE_DEC, - NULL, + { + "BFC", + "rtp.payload_mpeg_bfc", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_ffv, - { - "FFV", - "rtp.payload_mpeg_ffv", - FT_UINT16, - BASE_DEC, - NULL, + { + "FFV", + "rtp.payload_mpeg_ffv", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - - { + + { &hf_rtp_mpg_ffc, - { - "FFC", - "rtp.payload_mpeg_ffc", - FT_UINT16, - BASE_DEC, - NULL, + { + "FFC", + "rtp.payload_mpeg_ffc", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_data, - { - "MPEG-1 stream", - "mpeg1.stream", - FT_BYTES, - BASE_NONE, - NULL, + { + "MPEG-1 stream", + "mpeg1.stream", + FT_BYTES, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_mpg, }; diff --git a/packet-mpls.c b/packet-mpls.c index 051c510acb..f6984aacce 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -1,24 +1,24 @@ /* packet-mpls.c * Routines for MPLS data packet disassembly - * + * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-mpls.c,v 1.27 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mpls.c,v 1.28 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -82,24 +82,24 @@ enum mpls_filter_keys { static int mpls_filter[MPLSF_MAX]; static hf_register_info mplsf_info[] = { -/* {&mpls_filter[MPLSF_PACKET], - {"MPLS Label Switched Packet", "mpls", FT_UINT8, BASE_DEC, NULL, 0x0, +/* {&mpls_filter[MPLSF_PACKET], + {"MPLS Label Switched Packet", "mpls", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},*/ - {&mpls_filter[MPLSF_LABEL], - {"MPLS Label", "mpls.label", FT_UINT32, BASE_DEC, VALS(special_labels), 0x0, + {&mpls_filter[MPLSF_LABEL], + {"MPLS Label", "mpls.label", FT_UINT32, BASE_DEC, VALS(special_labels), 0x0, "", HFILL }}, - {&mpls_filter[MPLSF_EXP], - {"MPLS Experimental Bits", "mpls.exp", FT_UINT8, BASE_DEC, NULL, 0x0, + {&mpls_filter[MPLSF_EXP], + {"MPLS Experimental Bits", "mpls.exp", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&mpls_filter[MPLSF_BOTTOM_OF_STACK], - {"MPLS Bottom Of Label Stack", "mpls.bottom", FT_UINT8, BASE_DEC, NULL, 0x0, + {&mpls_filter[MPLSF_BOTTOM_OF_STACK], + {"MPLS Bottom Of Label Stack", "mpls.bottom", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&mpls_filter[MPLSF_TTL], - {"MPLS TTL", "mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0, + {&mpls_filter[MPLSF_TTL], + {"MPLS TTL", "mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, }; @@ -128,7 +128,7 @@ void decode_mpls_label(tvbuff_t *tvb, int offset, } static void -dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; guint32 label; @@ -144,7 +144,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo,COL_PROTOCOL, "MPLS"); } - + if (check_col(pinfo->cinfo,COL_INFO)) { col_add_fstr(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet"); } @@ -160,18 +160,18 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (label <= MAX_RESERVED) proto_tree_add_uint_format(mpls_tree, mpls_filter[MPLSF_LABEL], tvb, - offset, 3, label, "Label: %u (%s)", - label, val_to_str(label, special_labels, + offset, 3, label, "Label: %u (%s)", + label, val_to_str(label, special_labels, "Reserved - Unknown")); else proto_tree_add_uint(mpls_tree, mpls_filter[MPLSF_LABEL], tvb, offset, 3, label); - proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_EXP], tvb, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_EXP], tvb, offset+2,1, exp); - proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_BOTTOM_OF_STACK], tvb, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_BOTTOM_OF_STACK], tvb, offset+2,1, bos); - proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_TTL], tvb, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_TTL], tvb, offset+3,1, ttl); } offset += 4; diff --git a/packet-mrdisc.c b/packet-mrdisc.c index c360059201..525fab1fa2 100644 --- a/packet-mrdisc.c +++ b/packet-mrdisc.c @@ -1,22 +1,22 @@ /* packet-mrdisc.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for IGMP/MRDISC packet disassembly * - * $Id: packet-mrdisc.c,v 1.8 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mrdisc.c,v 1.9 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,9 +25,9 @@ MRDISC - code + code - 0x24 x + 0x24 x 0x25 x 0x26 x @@ -113,7 +113,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i guint8 type,len; int old_offset = offset; - item = proto_tree_add_item(parent_tree, hf_options, + item = proto_tree_add_item(parent_tree, hf_options, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_options); @@ -161,7 +161,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i proto_item_set_len(item, offset-old_offset); } } - + return offset; } @@ -210,7 +210,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, - "%s",val_to_str(type, mrdisc_types, + "%s",val_to_str(type, mrdisc_types, "Unknown Type:0x%02x")); } diff --git a/packet-mrdisc.h b/packet-mrdisc.h index e640c884bd..f6054f9295 100644 --- a/packet-mrdisc.h +++ b/packet-mrdisc.h @@ -1,22 +1,22 @@ /* packet-mrdisc.h 2001 Ronnie Sahlberg <See AUTHORS for email> * Declarations of routines for IGMP/MRDISC packet disassembly * - * $Id: packet-mrdisc.h,v 1.2 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-mrdisc.h,v 1.3 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-msnip.c b/packet-msnip.c index 0f08292554..7a1a93fa2f 100644 --- a/packet-msnip.c +++ b/packet-msnip.c @@ -1,22 +1,22 @@ /* packet-msnip.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for IGMP/MSNIP packet disassembly * - * $Id: packet-msnip.c,v 1.7 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-msnip.c,v 1.8 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,10 +25,10 @@ MSNIP - code + code 0x23 x - 0x24 x + 0x24 x 0x25 x MSNIP " Multicast Source Notification of Interest Protocol @@ -104,7 +104,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in guint32 maddr; int old_offset = offset; - item = proto_tree_add_item(parent_tree, hf_groups, + item = proto_tree_add_item(parent_tree, hf_groups, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_groups); @@ -124,7 +124,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in if (item) { proto_item_set_text(item,"Group: %s %s", - ip_to_str((guint8 *)&maddr), + ip_to_str((guint8 *)&maddr), val_to_str(rec_type, msnip_rec_types, "Unknown Type:0x%02x")); @@ -183,7 +183,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int guint8 masklen; int old_offset = offset; - item = proto_tree_add_item(parent_tree, hf_groups, + item = proto_tree_add_item(parent_tree, hf_groups, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_groups); @@ -195,7 +195,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* mask length */ masklen = tvb_get_guint8(tvb, offset); - proto_tree_add_uint(tree, hf_mask, tvb, + proto_tree_add_uint(tree, hf_mask, tvb, offset, 1, masklen); offset += 1; @@ -209,7 +209,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int proto_item_set_len(item, offset-old_offset); } } - + return offset; } @@ -244,7 +244,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, - "%s",val_to_str(type, msnip_types, + "%s",val_to_str(type, msnip_types, "Unknown Type:0x%02x")); } diff --git a/packet-msnip.h b/packet-msnip.h index d7da588096..e7cad883aa 100644 --- a/packet-msnip.h +++ b/packet-msnip.h @@ -1,22 +1,22 @@ /* packet-msnip.h 2001 Ronnie Sahlberg <See AUTHORS for email> * Declarations of routines for IGMP/MSNIP packet disassembly * - * $Id: packet-msnip.h,v 1.2 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-msnip.h,v 1.3 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-msproxy.c b/packet-msproxy.c index 958c3c1fdf..84db4f44c3 100644 --- a/packet-msproxy.c +++ b/packet-msproxy.c @@ -2,30 +2,30 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-msproxy.c,v 1.31 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-msproxy.c,v 1.32 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * This was derived from the dante socks implementation source code. + * This was derived from the dante socks implementation source code. * Most of the information came from common.h and msproxy_clientprotocol.c * - * See http://www.inet.no/dante for more information + * See http://www.inet.no/dante for more information */ /************************************************************************ @@ -100,48 +100,48 @@ static dissector_handle_t msproxy_sub_handle; /*$$$ 0x0500 was dante value, I see 0x05ff and 0x0500 */ -#define MSPROXY_HELLO 0x0500 -#define MSPROXY_HELLO_2 0x05ff +#define MSPROXY_HELLO 0x0500 +#define MSPROXY_HELLO_2 0x05ff -#define MSPROXY_HELLO_ACK 0x1000 +#define MSPROXY_HELLO_ACK 0x1000 -#define MSPROXY_USERINFO 0x1000 -#define MSPROXY_USERINFO_ACK 0x0400 +#define MSPROXY_USERINFO 0x1000 +#define MSPROXY_USERINFO_ACK 0x0400 -#define MSPROXY_AUTH 0x4700 +#define MSPROXY_AUTH 0x4700 #define MSPROXY_AUTH_1_ACK 0x4714 #define MSPROXY_AUTH_2 0x4701 #define MSPROXY_AUTH_2_ACK 0x4715 #define MSPROXY_AUTH_2_ACK2 0x4716 -#define MSPROXY_RESOLVE 0x070d +#define MSPROXY_RESOLVE 0x070d #define MSPROXY_RESOLVE_ACK 0x070f -#define MSPROXY_BIND 0x0704 -#define MSPROXY_BIND_ACK 0x0706 +#define MSPROXY_BIND 0x0704 +#define MSPROXY_BIND_ACK 0x0706 #define MSPROXY_TCP_BIND 0x0707 -#define MSPROXY_TCP_BIND_ACK 0x0708 +#define MSPROXY_TCP_BIND_ACK 0x0708 -#define MSPROXY_LISTEN 0x0406 +#define MSPROXY_LISTEN 0x0406 #define MSPROXY_BINDINFO 0x0709 -#define MSPROXY_BINDINFO_ACK 0x070a +#define MSPROXY_BINDINFO_ACK 0x070a -#define MSPROXY_CONNECT 0x071e -#define MSPROXY_CONNECT_ACK 0x0703 +#define MSPROXY_CONNECT 0x071e +#define MSPROXY_CONNECT_ACK 0x0703 -#define MSPROXY_UDPASSOCIATE 0x0705 -#define MSPROXY_UDPASSOCIATE_ACK 0x0706 +#define MSPROXY_UDPASSOCIATE 0x0705 +#define MSPROXY_UDPASSOCIATE_ACK 0x0706 #define MSPROXY_UDP_BIND_REQ 0x070b -#define MSPROXY_CONNECTED 0x042c -#define MSPROXY_SESSIONEND 0x251e +#define MSPROXY_CONNECTED 0x042c +#define MSPROXY_SESSIONEND 0x251e -#define MSPROXY_BIND_AUTHFAILED 0x0804 -#define MSPROXY_CONNECT_AUTHFAILED 0x081e +#define MSPROXY_BIND_AUTHFAILED 0x0804 +#define MSPROXY_CONNECT_AUTHFAILED 0x081e #define MSPROXY_CONNREFUSED 0x4 /* low 12 bits seem to vary. */ #define FROM_SERVER 1 /* direction of packet data for get_msproxy_cmd_name */ @@ -203,7 +203,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, conversation_t *conversation; proto_tree *msp_tree; proto_item *ti; - + conversation = find_conversation( &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -231,25 +231,25 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_ipv4( msp_tree, hf_msproxy_dstaddr, tvb, 0, 0, redirect_info->remote_addr); - + } /* set pinfo->{src/dst port} and call the UDP sub-dissector lookup */ - if ( pinfo->srcport == redirect_info->clnt_port) + if ( pinfo->srcport == redirect_info->clnt_port) ptr = &pinfo->destport; else ptr = &pinfo->srcport; *ptr = redirect_info->remote_port; - + if ( redirect_info->proto == PT_TCP) decode_tcp_ports( tvb, 0, pinfo, tree, pinfo->srcport, pinfo->destport); else decode_udp_ports( tvb, 0, pinfo, tree, pinfo->srcport, pinfo->destport); - + *ptr = redirect_info->server_int_port; } @@ -271,7 +271,7 @@ static void add_msproxy_conversation( packet_info *pinfo, conversation_t *conversation; redirect_entry_t *new_conv_info; - + if (pinfo->fd->flags.visited) { /* * We've already processed this frame once, so we @@ -307,10 +307,10 @@ static void add_msproxy_conversation( packet_info *pinfo, static int display_application_name(tvbuff_t *tvb, int offset, proto_tree *tree) { - + /* display the application name in the proto tree. */ -/* NOTE: this routine assumes that the tree pointer is valid (not NULL) */ +/* NOTE: this routine assumes that the tree pointer is valid (not NULL) */ int length; @@ -328,12 +328,12 @@ static char *get_msproxy_cmd_name( int cmd, int direction) { switch (cmd){ case MSPROXY_HELLO_2: - case MSPROXY_HELLO: return "Hello"; + case MSPROXY_HELLO: return "Hello"; /* MSPROXY_HELLO_ACK & MSPROXY_USERINFO have the same value (0x1000). */ /* So use the direction flag to determine which to use. */ - case MSPROXY_USERINFO: + case MSPROXY_USERINFO: if ( direction == FROM_SERVER) return "Hello Acknowledge"; else @@ -359,7 +359,7 @@ static char *get_msproxy_cmd_name( int cmd, int direction) { case MSPROXY_CONNECTED: return "Connected"; case MSPROXY_SESSIONEND: return "Session End"; - default: return "Unknown"; + default: return "Unknown"; } } @@ -381,7 +381,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, "User name: %.*s", length, tvb_get_ptr( tvb, offset, length)); offset += length + 2; - + length = tvb_strnlen( tvb, offset, 255); if (length == -1) return; @@ -389,7 +389,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, "Application name: %.*s", length, tvb_get_ptr( tvb, offset, length)); offset += length + 1; - + length = tvb_strnlen( tvb, offset, 255); if (length == -1) return; @@ -431,12 +431,12 @@ static void dissect_bind(tvbuff_t *tvb, int offset, proto_tree_add_item( tree, hf_msproxy_bindport, tvb, offset, 2, FALSE); offset += 6; - + if ( tree) proto_tree_add_item( tree, hf_msproxy_clntport, tvb, offset, 2, FALSE); offset += 2; - + conv_info->clnt_port = tvb_get_ntohs( tvb, offset); offset += 6; @@ -505,14 +505,14 @@ static void dissect_request_connect(tvbuff_t *tvb, int offset, if ( tree) proto_tree_add_item( tree, hf_msproxy_dstport, tvb, offset, 2, FALSE); - + conv_info->dst_port = tvb_get_ntohs( tvb, offset); offset += 2; if ( tree) proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, FALSE); - + tvb_memcpy( tvb, (guint8 *)&conv_info->dst_addr, offset, sizeof( guint32)); offset += 12; @@ -522,7 +522,7 @@ static void dissect_request_connect(tvbuff_t *tvb, int offset, if ( tree){ proto_tree_add_uint( tree, hf_msproxy_clntport, tvb, offset, 2, conv_info->clnt_port); - + offset += 84; display_application_name( tvb, offset, tree); @@ -596,7 +596,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset, proto_tree_add_text( name_tree, tvb, offset, length, "String: %s", tvb_get_ptr( tvb, offset, length)); } -} +} @@ -623,16 +623,16 @@ static void dissect_udp_bind(tvbuff_t *tvb, int offset, FALSE); offset += 2; - if ( tree) + if ( tree) proto_tree_add_item( tree, hf_msproxy_dstaddr, tvb, offset, 4, FALSE); offset += 96; - + if ( tree) display_application_name( tvb, offset, tree); -} - +} + static void dissect_udp_assoc(tvbuff_t *tvb, int offset, proto_tree *tree, hash_entry_t *conv_info) { @@ -643,7 +643,7 @@ static void dissect_udp_assoc(tvbuff_t *tvb, int offset, offset += 28; - if ( tree) + if ( tree) proto_tree_add_item( tree, hf_msproxy_clntport, tvb, offset, 2, FALSE); @@ -651,10 +651,10 @@ static void dissect_udp_assoc(tvbuff_t *tvb, int offset, offset += 90; - if ( tree) + if ( tree) display_application_name( tvb, offset, tree); -} - +} + static void dissect_msproxy_request(tvbuff_t *tvb, proto_tree *tree, hash_entry_t *conv_info) { @@ -663,30 +663,30 @@ static void dissect_msproxy_request(tvbuff_t *tvb, int cmd; if ( tree) { - proto_tree_add_text( tree, tvb, offset, 4, "Client id: 0x%0x", + proto_tree_add_text( tree, tvb, offset, 4, "Client id: 0x%0x", tvb_get_letohl( tvb, offset)); offset += 4; - - proto_tree_add_text( tree, tvb, offset, 4, "Version: 0x%04x", + + proto_tree_add_text( tree, tvb, offset, 4, "Version: 0x%04x", tvb_get_letohl( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 4, "Server id: 0x%0x", + proto_tree_add_text( tree, tvb, offset, 4, "Server id: 0x%0x", tvb_get_letohl( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 1, "Server ack: %u", + proto_tree_add_text( tree, tvb, offset, 1, "Server ack: %u", tvb_get_guint8( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 1, "Sequence Number: %u", + proto_tree_add_text( tree, tvb, offset, 1, "Sequence Number: %u", tvb_get_guint8( tvb, offset)); offset += 8; proto_tree_add_text( tree, tvb, offset, 4, "RWSP signature: %.4s", tvb_get_ptr( tvb, offset, 4)); offset += 12; - } + } else /* no tree */ offset += 36; @@ -694,16 +694,16 @@ static void dissect_msproxy_request(tvbuff_t *tvb, if ( tree) proto_tree_add_uint_format( tree, hf_msproxy_cmd, tvb, offset, 2, - cmd, "Command: 0x%02x (%s)", cmd, + cmd, "Command: 0x%02x (%s)", cmd, get_msproxy_cmd_name( cmd, FROM_CLIENT)); offset += 2; - switch (cmd){ + switch (cmd){ case MSPROXY_AUTH: dissect_auth( tvb, offset, tree); break; - + case MSPROXY_BIND: dissect_bind( tvb, offset, tree, conv_info); break; @@ -711,22 +711,22 @@ static void dissect_msproxy_request(tvbuff_t *tvb, case MSPROXY_UDP_BIND_REQ: dissect_udp_bind( tvb, offset, tree, conv_info); break; - + case MSPROXY_AUTH_2: /*$$ this is probably wrong place for this */ case MSPROXY_TCP_BIND: dissect_tcp_bind( tvb, offset, tree, conv_info); break; - + case MSPROXY_RESOLVE: dissect_request_resolve( tvb, offset, tree); break; - + case MSPROXY_CONNECT: case MSPROXY_LISTEN: dissect_request_connect( tvb, offset, tree, conv_info); break; - + case MSPROXY_BINDINFO_ACK: dissect_bind_info_ack( tvb, offset, tree); break; @@ -758,7 +758,7 @@ static void dissect_hello_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { proto_tree_add_item( tree, hf_msproxy_serverport, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item( tree, hf_msproxy_serveraddr, tvb, offset, 4, FALSE); offset += 4; @@ -780,7 +780,7 @@ static void dissect_user_info_ack(tvbuff_t *tvb, int offset, -static void dissect_udpassociate_ack(tvbuff_t *tvb, int offset, +static void dissect_udpassociate_ack(tvbuff_t *tvb, int offset, proto_tree *tree) { offset += 6; @@ -845,7 +845,7 @@ static void dissect_connect_ack( tvbuff_t *tvb, int offset, packet_info *pinfo, conv_info->proto = PT_TCP; conv_info->server_int_port = tvb_get_ntohs( tvb, offset); offset += 2; - + if ( tree){ proto_tree_add_item( tree, hf_msproxy_server_int_addr, tvb, offset, 4, FALSE); @@ -904,14 +904,14 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 6; - if ( tree) + if ( tree) proto_tree_add_item( tree, hf_msproxy_bind_id, tvb, offset, 4, FALSE); offset += 14; conv_info->dst_port = tvb_get_ntohs( tvb, offset); - if ( tree) + if ( tree) proto_tree_add_uint( tree, hf_msproxy_dstport, tvb, offset, 2, conv_info->dst_port); offset += 2; @@ -923,11 +923,11 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 12; conv_info->server_int_port = tvb_get_ntohs( tvb, offset); - if ( tree) + if ( tree) proto_tree_add_uint( tree, hf_msproxy_server_int_port, tvb, offset, 2, conv_info->server_int_port); offset += 4; - + if ( tree) { proto_tree_add_item( tree, hf_msproxy_server_ext_port, tvb, offset, 2, FALSE); @@ -938,9 +938,9 @@ static void dissect_bind_info( tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 78; display_application_name( tvb, offset, tree); - + } - + add_msproxy_conversation( pinfo, conv_info); } @@ -956,21 +956,21 @@ static void dissect_resolve(tvbuff_t *tvb, int offset, proto_tree *tree) { if ( tree) { int addr_offset; - addr_offset = tvb_get_guint8( tvb, offset); - + addr_offset = tvb_get_guint8( tvb, offset); + proto_tree_add_text( tree, tvb, offset, 1, "Address offset: %d", addr_offset); ++offset; - + offset += 13; - offset += addr_offset; + offset += addr_offset; proto_tree_add_item( tree, hf_msproxy_resolvaddr, tvb, offset, 4, FALSE); } -} +} @@ -981,25 +981,25 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo, int cmd; if ( tree) { - proto_tree_add_text( tree, tvb, offset, 4, "Client id: 0x%0x", + proto_tree_add_text( tree, tvb, offset, 4, "Client id: 0x%0x", tvb_get_letohl( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 4, "Version: 0x%04x", + proto_tree_add_text( tree, tvb, offset, 4, "Version: 0x%04x", tvb_get_letohl( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 4, "Server id: 0x%04x", + proto_tree_add_text( tree, tvb, offset, 4, "Server id: 0x%04x", tvb_get_letohl( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 1, "Client ack: 0x%02x", + proto_tree_add_text( tree, tvb, offset, 1, "Client ack: 0x%02x", tvb_get_guint8( tvb, offset)); offset += 4; - proto_tree_add_text( tree, tvb, offset, 1, "Sequence Number: 0x%02x", + proto_tree_add_text( tree, tvb, offset, 1, "Sequence Number: 0x%02x", tvb_get_guint8( tvb, offset)); - + offset += 8; proto_tree_add_text( tree, tvb, offset, 4, "RWSP signature: %.4s", @@ -1011,32 +1011,32 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo, offset += 36; cmd = tvb_get_ntohs( tvb, offset); - + if ( tree) proto_tree_add_uint_format( tree, hf_msproxy_cmd, tvb, offset, 2, - cmd, "Command: 0x%02x (%s)", cmd, + cmd, "Command: 0x%02x (%s)", cmd, get_msproxy_cmd_name( cmd, FROM_SERVER)); offset += 2; - + switch (cmd) { case MSPROXY_HELLO_ACK: dissect_hello_ack( tvb, offset, tree); break; - + case MSPROXY_USERINFO_ACK: dissect_user_info_ack( tvb, offset, tree); break; - + case MSPROXY_AUTH_1_ACK: dissect_auth_1_ack( tvb, offset, tree); break; /* this also handle the MSPROXY_BIND_ACK ??? check this */ - case MSPROXY_UDPASSOCIATE_ACK: + case MSPROXY_UDPASSOCIATE_ACK: dissect_udpassociate_ack( tvb, offset, tree); break; - + case MSPROXY_AUTH_2_ACK: case MSPROXY_AUTH_2_ACK2: dissect_msproxy_response_4( tvb, offset, tree); @@ -1054,11 +1054,11 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo, case MSPROXY_BINDINFO: dissect_bind_info( tvb, offset, pinfo, tree, conv_info); break; - + case MSPROXY_RESOLVE_ACK: dissect_resolve( tvb, offset, tree); break; - + case MSPROXY_CONNECT_AUTHFAILED: case MSPROXY_BIND_AUTHFAILED: proto_tree_add_text( tree, tvb, offset, 0, "No know information (help wanted)"); @@ -1071,13 +1071,13 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo, ((cmd >> 12) == MSPROXY_CONNREFUSED))) proto_tree_add_text( tree, tvb, offset, 0, "No know information (help wanted)"); - + else if ( tree) proto_tree_add_text( tree, tvb, offset, 0, "Unhandled response command (report this, please)"); } - - + + } @@ -1092,7 +1092,7 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hash_entry_t *hash_info; conversation_t *conversation; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -1113,16 +1113,16 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)){ - + cmd = tvb_get_ntohs( tvb, 36); - + if ( pinfo->srcport == UDP_PORT_MSPROXY) col_add_fstr( pinfo->cinfo, COL_INFO, "Server message: %s", get_msproxy_cmd_name( cmd, FROM_SERVER)); else col_add_fstr(pinfo->cinfo, COL_INFO, "Client message: %s", get_msproxy_cmd_name( cmd, FROM_CLIENT)); - + } if (tree) { /* if proto tree, decode data */ @@ -1146,15 +1146,15 @@ static void msproxy_reinit( void){ /* performed. Reset the highest row seen counter and re-initialize the */ /* conversation memory chunks. */ - last_row = 0; - + last_row = 0; + if (vals) g_mem_chunk_destroy(vals); vals = g_mem_chunk_new("msproxy_vals", hash_val_length, hash_init_count * hash_val_length, G_ALLOC_AND_FREE); - + if (redirect_vals) g_mem_chunk_destroy(redirect_vals); @@ -1175,13 +1175,13 @@ proto_register_msproxy( void){ &ett_msproxy_name }; static hf_register_info hf[] = { - + { &hf_msproxy_cmd, { "Command", "msproxy.command", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, - + { &hf_msproxy_dstaddr, { "Destination Address", "msproxy.dstaddr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL @@ -1208,7 +1208,7 @@ proto_register_msproxy( void){ 0x0, "", HFILL } }, - + { &hf_msproxy_server_ext_port, { "Server External Port", "msproxy.server_ext_port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL @@ -1220,7 +1220,7 @@ proto_register_msproxy( void){ 0x0, "", HFILL } }, - + { &hf_msproxy_server_int_port, { "Server Internal Port", "msproxy.server_int_port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL @@ -1268,7 +1268,7 @@ proto_register_msproxy( void){ "MS Proxy", "msproxy"); proto_register_field_array(proto_msproxy, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); register_init_routine( &msproxy_reinit); /* register re-init routine */ @@ -1280,7 +1280,7 @@ proto_register_msproxy( void){ void proto_reg_handoff_msproxy(void) { - /* dissector install routine */ + /* dissector install routine */ dissector_handle_t msproxy_handle; diff --git a/packet-mtp2.c b/packet-mtp2.c index 08d18eb28d..8aa2aba410 100644 --- a/packet-mtp2.c +++ b/packet-mtp2.c @@ -5,24 +5,24 @@ * * Copyright 2001, Michael Tuexen <michael.tuexen[AT]icn.siemens.de> * - * $Id: packet-mtp2.c,v 1.3 2002/01/21 07:36:37 guy Exp $ + * $Id: packet-mtp2.c,v 1.4 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-m2pa.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -87,18 +87,18 @@ static const value_string status_field_vals[] = { { STATUS_OS, "Status Indication OS" }, { STATUS_PO, "Status Indication PO" }, { STATUS_B, "Status Indication BO" }, - { 0, NULL} + { 0, NULL} }; static void dissect_mtp2_header(tvbuff_t *su_tvb, proto_item *mtp2_tree) -{ +{ guint8 bsn_bib, fsn_fib, li; - + bsn_bib = tvb_get_guint8(su_tvb, BSN_BIB_OFFSET); fsn_fib = tvb_get_guint8(su_tvb, FSN_FIB_OFFSET); li = tvb_get_guint8(su_tvb, LI_OFFSET); - + if (mtp2_tree) { proto_tree_add_uint(mtp2_tree, hf_mtp2_bsn, su_tvb, BSN_BIB_OFFSET, BSN_BIB_LENGTH, bsn_bib); proto_tree_add_uint(mtp2_tree, hf_mtp2_bib, su_tvb, BSN_BIB_OFFSET, BSN_BIB_LENGTH, bsn_bib); @@ -111,14 +111,14 @@ dissect_mtp2_header(tvbuff_t *su_tvb, proto_item *mtp2_tree) static void dissect_mtp2_fisu(packet_info *pinfo) -{ +{ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "FISU"); } static void dissect_mtp2_lssu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_tree) -{ +{ guint8 li, sf; guint16 long_sf; @@ -139,17 +139,17 @@ dissect_mtp2_lssu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_tree) static void dissect_mtp2_msu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_item, proto_item *tree) -{ +{ gint sif_sio_length; tvbuff_t *sif_sio_tvb; if ((check_col(pinfo->cinfo, COL_INFO)) && (!proto_is_protocol_enabled(mtp3_proto_id))) col_append_str(pinfo->cinfo, COL_INFO, "MSU"); - + sif_sio_length = tvb_length(su_tvb) - HEADER_LENGTH; sif_sio_tvb = tvb_new_subset(su_tvb, SIO_OFFSET, sif_sio_length, sif_sio_length); call_dissector(mtp3_handle, sif_sio_tvb, pinfo, tree); - + if (tree) proto_item_set_len(mtp2_item, HEADER_LENGTH); @@ -159,7 +159,7 @@ static void dissect_mtp2_su(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_item, proto_item *mtp2_tree, proto_tree *tree) { guint8 li; - + dissect_mtp2_header(su_tvb, mtp2_tree); li = tvb_get_guint8(su_tvb, LI_OFFSET); switch(li & LI_MASK) { @@ -200,42 +200,42 @@ proto_register_mtp2(void) static hf_register_info hf[] = { { &hf_mtp2_bsn, { "Backward sequence number", "mtp2.bsn", - FT_UINT8, BASE_DEC, NULL, BSN_MASK, + FT_UINT8, BASE_DEC, NULL, BSN_MASK, "", HFILL } }, { &hf_mtp2_bib, { "Backward indicator bit", "mtp2.bib", - FT_UINT8, BASE_DEC, NULL, BIB_MASK, + FT_UINT8, BASE_DEC, NULL, BIB_MASK, "", HFILL } }, { &hf_mtp2_fsn, { "Forward sequence number", "mtp2.fsn", - FT_UINT8, BASE_DEC, NULL, FSN_MASK, + FT_UINT8, BASE_DEC, NULL, FSN_MASK, "", HFILL } }, { &hf_mtp2_fib, { "Forward indicator bit", "mtp2.fib", - FT_UINT8, BASE_DEC, NULL, FIB_MASK, + FT_UINT8, BASE_DEC, NULL, FIB_MASK, "", HFILL } }, { &hf_mtp2_li, { "Length Indicator", "mtp2.li", - FT_UINT8, BASE_DEC, NULL, LI_MASK, + FT_UINT8, BASE_DEC, NULL, LI_MASK, "", HFILL } }, { &hf_mtp2_spare, { "Spare", "mtp2.spare", - FT_UINT8, BASE_DEC, NULL, SPARE_MASK, + FT_UINT8, BASE_DEC, NULL, SPARE_MASK, "", HFILL } }, { &hf_mtp2_sf, { "Status field", "mtp2.sf", - FT_UINT8, BASE_DEC, VALS(status_field_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(status_field_vals), 0x0, "", HFILL } }, { &hf_mtp2_long_sf, { "Status field", "mtp2.long_sf", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } } }; diff --git a/packet-nbipx.c b/packet-nbipx.c index 59607a38cd..d21f08d5b7 100644 --- a/packet-nbipx.c +++ b/packet-nbipx.c @@ -2,22 +2,22 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-nbipx.c,v 1.47 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-nbipx.c,v 1.48 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -589,7 +589,7 @@ proto_reg_handoff_nbipx(void) * MAILSLOT_SOCKET (0x553) - used by the redirector and browser * for mailslot datagrams * MESSENGER_SOCKET (0x554) - used by the redirector to send - * messages from client to client + * messages from client to client * * Name claim/query packets, and mailslot datagrams, are: * diff --git a/packet-nbns.c b/packet-nbns.c index 284a15ece1..1926ad5db4 100644 --- a/packet-nbns.c +++ b/packet-nbns.c @@ -3,22 +3,22 @@ * to when it had only NBNS) * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-nbns.c,v 1.78 2002/08/07 00:43:13 tpot Exp $ + * $Id: packet-nbns.c,v 1.79 2002/08/28 21:00:22 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -239,7 +239,7 @@ nbns_type_name (int type) case T_NBSTAT: return "NBSTAT"; } - + return "unknown"; } @@ -350,7 +350,7 @@ get_nbns_name_type_class(tvbuff_t *tvb, int offset, int nbns_data_offset, name_len = get_nbns_name(tvb, offset, nbns_data_offset, name_ret, name_type_ret); offset += name_len; - + type = tvb_get_ntohs(tvb, offset); offset += 2; @@ -419,7 +419,7 @@ dissect_nbns_query(tvbuff_t *tvb, int offset, int nbns_data_offset, proto_tree_add_text(q_tree, tvb, offset, 2, "Class: %s", class_name); offset += 2; } - + return data_offset - data_start; } @@ -927,7 +927,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset, cur_offset += data_len; break; } - + return cur_offset - data_start; } @@ -938,7 +938,7 @@ dissect_query_records(tvbuff_t *tvb, int cur_off, int nbns_data_offset, int start_off, add_off; proto_tree *qatree = NULL; proto_item *ti = NULL; - + start_off = cur_off; if (nbns_tree != NULL) { ti = proto_tree_add_text(nbns_tree, tvb, start_off, -1, "Queries"); @@ -965,7 +965,7 @@ dissect_answer_records(tvbuff_t *tvb, int cur_off, int nbns_data_offset, int start_off, add_off; proto_tree *qatree = NULL; proto_item *ti = NULL; - + start_off = cur_off; if (nbns_tree != NULL) { ti = proto_tree_add_text(nbns_tree, tvb, start_off, -1, name); @@ -1052,7 +1052,7 @@ dissect_nbns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } cur_off = offset + NBNS_HDRLEN; - + if (quest > 0) { /* If this is a response, don't add information about the queries to the summary, just add information about the @@ -1131,7 +1131,7 @@ static const value_string nbds_msgtype_vals[] = { { 0, NULL } }; -static const true_false_string yesno = { +static const true_false_string yesno = { "Yes", "No" }; @@ -1172,7 +1172,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); header.msg_type = tvb_get_guint8(tvb, offset); - + flags = tvb_get_guint8(tvb, offset+1); header.flags.more = flags & 1; header.flags.first = (flags & 2) >> 1; @@ -1213,16 +1213,16 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nbdgm_tree = proto_item_add_subtree(ti, ett_nbdgm); proto_tree_add_uint(nbdgm_tree, hf_nbdgm_type, tvb, - offset, 1, + offset, 1, header.msg_type); proto_tree_add_boolean(nbdgm_tree, hf_nbdgm_fragment, tvb, - offset+1, 1, + offset+1, 1, header.flags.more); proto_tree_add_boolean(nbdgm_tree, hf_nbdgm_first, tvb, - offset+1, 1, + offset+1, 1, header.flags.first); proto_tree_add_uint(nbdgm_tree, hf_nbdgm_node_type, tvb, - offset+1, 1, + offset+1, 1, header.flags.node_type); proto_tree_add_uint(nbdgm_tree, hf_nbdgm_datagram_id, tvb, @@ -1425,12 +1425,12 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { ti = proto_tree_add_item(tree, proto_nbss, tvb, offset, length + 4, FALSE); nbss_tree = proto_item_add_subtree(ti, ett_nbss); - + proto_tree_add_uint_format(nbss_tree, hf_nbss_type, tvb, - offset, 1, + offset, 1, msg_type, "Message Type: %s", - val_to_str(msg_type, message_types, + val_to_str(msg_type, message_types, "Unknown (%x)")); } @@ -1469,9 +1469,9 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", to %s ", name); - + len = get_nbns_name(tvb, offset, offset, name, &name_type); - + if (tree) add_name_and_type(nbss_tree, tvb, offset, len, "Calling name", name, name_type); @@ -1482,7 +1482,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NEGATIVE_SESSION_RESPONSE: - if (tree) + if (tree) proto_tree_add_text(nbss_tree, tvb, offset, 1, "Error code: %s", val_to_str(tvb_get_guint8(tvb, offset), @@ -1500,7 +1500,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_text(nbss_tree, tvb, offset, 4, "Retarget IP address: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4))); - + offset += 4; if (tree) @@ -1715,7 +1715,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) goto continuation; } } - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, val_to_str(msg_type, message_types, "Unknown (%02x)")); @@ -1798,50 +1798,50 @@ proto_register_nbt(void) FT_UINT16, BASE_DEC, VALS(rcode_vals), F_RCODE, "Reply code", HFILL }}, { &hf_nbns_transaction_id, - { "Transaction ID", "nbns.id", + { "Transaction ID", "nbns.id", FT_UINT16, BASE_HEX, NULL, 0x0, "Identification of transaction", HFILL }}, { &hf_nbns_count_questions, - { "Questions", "nbns.count.queries", + { "Questions", "nbns.count.queries", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of queries in packet", HFILL }}, { &hf_nbns_count_answers, - { "Answer RRs", "nbns.count.answers", + { "Answer RRs", "nbns.count.answers", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of answers in packet", HFILL }}, { &hf_nbns_count_auth_rr, - { "Authority RRs", "nbns.count.auth_rr", + { "Authority RRs", "nbns.count.auth_rr", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of authoritative records in packet", HFILL }}, { &hf_nbns_count_add_rr, - { "Additional RRs", "nbns.count.add_rr", + { "Additional RRs", "nbns.count.add_rr", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of additional records in packet", HFILL }} }; static hf_register_info hf_nbdgm[] = { { &hf_nbdgm_type, - { "Message Type", "nbdgm.type", + { "Message Type", "nbdgm.type", FT_UINT8, BASE_DEC, VALS(nbds_msgtype_vals), 0x0, "NBDGM message type", HFILL }}, { &hf_nbdgm_fragment, - { "More fragments follow", "nbdgm.next", + { "More fragments follow", "nbdgm.next", FT_BOOLEAN, BASE_NONE, TFS(&yesno), 0x0, "TRUE if more fragments follow", HFILL }}, { &hf_nbdgm_first, - { "This is first fragment", "nbdgm.first", + { "This is first fragment", "nbdgm.first", FT_BOOLEAN, BASE_NONE, TFS(&yesno), 0x0, "TRUE if first fragment", HFILL }}, { &hf_nbdgm_node_type, - { "Node Type", "nbdgm.node_type", + { "Node Type", "nbdgm.node_type", FT_UINT8, BASE_DEC, VALS(node_type_vals), 0x0, "Node type", HFILL }}, { &hf_nbdgm_datagram_id, - { "Datagram ID", "nbdgm.dgram_id", + { "Datagram ID", "nbdgm.dgram_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Datagram identifier", HFILL }}, { &hf_nbdgm_src_ip, - { "Source IP", "nbdgm.src.ip", + { "Source IP", "nbdgm.src.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "Source IPv4 address", HFILL }}, { &hf_nbdgm_src_port, @@ -1852,11 +1852,11 @@ proto_register_nbt(void) static hf_register_info hf_nbss[] = { { &hf_nbss_type, - { "Message Type", "nbss.type", + { "Message Type", "nbss.type", FT_UINT8, BASE_DEC, NULL, 0x0, "NBSS message type", HFILL }}, { &hf_nbss_flags, - { "Flags", "nbss.flags", + { "Flags", "nbss.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "NBSS message flags", HFILL }} }; @@ -1877,7 +1877,7 @@ proto_register_nbt(void) proto_nbns = proto_register_protocol("NetBIOS Name Service", "NBNS", "nbns"); proto_register_field_array(proto_nbns, hf_nbns, array_length(hf_nbns)); - + proto_nbdgm = proto_register_protocol("NetBIOS Datagram Service", "NBDS", "nbdgm"); proto_register_field_array(proto_nbdgm, hf_nbdgm, array_length(hf_nbdgm)); diff --git a/packet-ncp-int.h b/packet-ncp-int.h index 1bee9bf700..2ed1a9e3b1 100644 --- a/packet-ncp-int.h +++ b/packet-ncp-int.h @@ -2,22 +2,22 @@ * Structures and functions for NetWare Core Protocol. * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-ncp-int.h,v 1.10 2002/08/23 17:47:31 gram Exp $ + * $Id: packet-ncp-int.h,v 1.11 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ncp.c b/packet-ncp.c index 946d5da7f8..50c7eafc97 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -2,31 +2,31 @@ * Routines for NetWare Core Protocol * Gilbert Ramirez <gram@alumni.rice.edu> * Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net> - * Modified to decode server op-lock + * Modified to decode server op-lock * & NDS packets by Greg Morris <gmorris@novell.com> * - * $Id: packet-ncp.c,v 1.67 2002/08/23 21:54:30 guy Exp $ + * $Id: packet-ncp.c,v 1.68 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -150,7 +150,7 @@ struct ncp_common_header { guint8 conn_low; guint8 task; guint8 conn_high; /* type=0x5555 doesn't have this */ -}; +}; static value_string ncp_type_vals[] = { @@ -405,7 +405,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tvb_get_guint8(tvb, commhdr+6) == 0x68) { ncp_nds_verb = tvb_get_ntohl(tvb, commhdr+4); if (tvb_get_guint8(tvb, commhdr+7) == 0x02) { /* NDS Packet to decode */ - dissect_nds_request(next_tvb, pinfo, nw_connection, + dissect_nds_request(next_tvb, pinfo, nw_connection, header.sequence, header.type, ncp_tree); } else { dissect_ncp_request(next_tvb, pinfo, nw_connection, @@ -519,7 +519,7 @@ get_ncp_pdu_len(tvbuff_t *tvb, int offset) signature = tvb_get_ntohl(tvb, offset); if (signature != NCPIP_RQST && signature != NCPIP_RPLY) return tvb_length_remaining(tvb, offset); - + /* * Get the length of the NCP-over-TCP packet. Strip off the "has * signature" flag. diff --git a/packet-ndmp.c b/packet-ndmp.c index 8dfe01c461..f2f3de494c 100644 --- a/packet-ndmp.c +++ b/packet-ndmp.c @@ -2,29 +2,29 @@ * Routines for NDMP dissection * 2001 Ronnie Sahlberg (see AUTHORS for email) * - * $Id: packet-ndmp.c,v 1.22 2002/08/20 22:33:16 guy Exp $ + * $Id: packet-ndmp.c,v 1.23 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* see www.ndmp.org for protocol specifications. - this file implements version 3 of ndmp + this file implements version 3 of ndmp */ #ifdef HAVE_CONFIG_H @@ -547,7 +547,7 @@ dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_) { guint type; - + type=tvb_get_ntohl(tvb,offset); /* auth type */ @@ -560,7 +560,7 @@ dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case NDMP_AUTH_TEXT: break; case NDMP_AUTH_MD5: - proto_tree_add_item(tree, hf_ndmp_auth_challenge, + proto_tree_add_item(tree, hf_ndmp_auth_challenge, tvb, offset, 64, FALSE); offset+=64; } @@ -1040,7 +1040,7 @@ dissect_execute_cdb_flags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, "Flags: 0x%08x", flags); tree = proto_item_add_subtree(item, ett_ndmp_execute_cdb_flags); } - + proto_tree_add_boolean(tree, hf_ndmp_execute_cdb_flags_data_in, tvb, offset, 4, flags); proto_tree_add_boolean(tree, hf_ndmp_execute_cdb_flags_data_out, @@ -1060,7 +1060,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, cdb_len = tvb_get_ntohl(tvb, offset); cdb_len_full = rpc_roundup(cdb_len); - + if (parent_tree) { item = proto_tree_add_text(parent_tree, tvb, offset, 4+cdb_len_full, "CDB"); @@ -1091,7 +1091,7 @@ dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto payload_len = tvb_get_ntohl(tvb, offset); payload_len_full = rpc_roundup(payload_len); - + if (parent_tree) { item = proto_tree_add_text(parent_tree, tvb, offset, 4+payload_len_full, "%s", name); @@ -1148,7 +1148,7 @@ dissect_execute_cdb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, task_key.conv_id = conversation->index; task_key.task_id = seq; pinfo->private_data = &task_key; - + /* flags */ offset = dissect_execute_cdb_flags(tvb, offset, pinfo, tree); @@ -1196,7 +1196,7 @@ dissect_execute_cdb_sns(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre sns_len = tvb_get_ntohl(tvb, offset); sns_len_full = rpc_roundup(sns_len); - + if (parent_tree) { item = proto_tree_add_text(parent_tree, tvb, offset, 4+sns_len_full, "Sense data"); @@ -1238,7 +1238,7 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* no conversation, meaning we didn't see the request */ pinfo->private_data = NULL; } - + /* error */ proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE); offset += 4; @@ -1556,11 +1556,11 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* IP addr */ proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, FALSE); offset+=4; - + /* TCP port */ proto_tree_add_item(tree, hf_ndmp_addr_tcp, tvb, offset, 4, FALSE); offset+=4; - + break; case NDMP_ADDR_FC: /* FCAL loop id */ @@ -1576,7 +1576,7 @@ dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, return offset; } - + static int dissect_mover_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq _U_) @@ -1819,7 +1819,7 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint type; - + type=tvb_get_ntohl(tvb,offset); /* auth type */ @@ -1838,7 +1838,7 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_rpc_string(tvb, tree, hf_ndmp_auth_password, offset, NULL); - + break; case NDMP_AUTH_MD5: /* auth id */ @@ -1846,7 +1846,7 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, hf_ndmp_auth_id, offset, NULL); /* digest */ - proto_tree_add_item(tree, hf_ndmp_auth_digest, + proto_tree_add_item(tree, hf_ndmp_auth_digest, tvb, offset, 16, FALSE); offset+=16; } @@ -1990,7 +1990,7 @@ dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *par val_to_str(type, file_fs_type_vals, "Unknown type") ); } - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -2120,7 +2120,7 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa proto_tree_add_item(tree, hf_ndmp_file_links, tvb, offset, 4, FALSE); offset += 4; - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -2154,7 +2154,7 @@ dissect_file(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_t proto_tree_add_item(tree, hf_ndmp_file_fh_info, tvb, offset, 8, FALSE); offset += 8; - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -2443,51 +2443,51 @@ typedef struct _ndmp_command { } ndmp_command; static const ndmp_command ndmp_commands[] = { - {NDMP_CONFIG_GET_HOST_INFO, + {NDMP_CONFIG_GET_HOST_INFO, NULL, dissect_ndmp_get_host_info_reply}, - {NDMP_CONFIG_GET_CONNECTION_TYPE, + {NDMP_CONFIG_GET_CONNECTION_TYPE, NULL, dissect_ndmp_config_get_connection_type_reply}, - {NDMP_CONFIG_GET_AUTH_ATTR, + {NDMP_CONFIG_GET_AUTH_ATTR, dissect_get_auth_type_request, dissect_auth_attr_msg}, - {NDMP_CONFIG_GET_BUTYPE_INFO, + {NDMP_CONFIG_GET_BUTYPE_INFO, NULL, dissect_get_butype_info_reply}, - {NDMP_CONFIG_GET_FS_INFO, + {NDMP_CONFIG_GET_FS_INFO, NULL, dissect_get_fs_info_reply}, - {NDMP_CONFIG_GET_TAPE_INFO, + {NDMP_CONFIG_GET_TAPE_INFO, NULL, dissect_get_tape_info_reply}, - {NDMP_CONFIG_GET_SCSI_INFO, + {NDMP_CONFIG_GET_SCSI_INFO, NULL, dissect_get_scsi_info_reply}, - {NDMP_CONFIG_GET_SERVER_INFO, + {NDMP_CONFIG_GET_SERVER_INFO, NULL, dissect_get_server_info_reply}, - {NDMP_SCSI_OPEN, + {NDMP_SCSI_OPEN, dissect_scsi_open_request, dissect_error}, - {NDMP_SCSI_CLOSE, + {NDMP_SCSI_CLOSE, NULL, dissect_error}, - {NDMP_SCSI_GET_STATE, + {NDMP_SCSI_GET_STATE, NULL, dissect_scsi_get_state_reply}, - {NDMP_SCSI_SET_TARGET, + {NDMP_SCSI_SET_TARGET, dissect_scsi_set_state_request, dissect_error}, - {NDMP_SCSI_RESET_DEVICE, + {NDMP_SCSI_RESET_DEVICE, NULL, dissect_error}, - {NDMP_SCSI_RESET_BUS, + {NDMP_SCSI_RESET_BUS, NULL, dissect_error}, {NDMP_SCSI_EXECUTE_CDB, dissect_execute_cdb_request_mc, dissect_execute_cdb_reply}, - {NDMP_TAPE_OPEN, + {NDMP_TAPE_OPEN, dissect_tape_open_request, dissect_error}, - {NDMP_TAPE_CLOSE, + {NDMP_TAPE_CLOSE, NULL, dissect_error}, - {NDMP_TAPE_GET_STATE, + {NDMP_TAPE_GET_STATE, NULL, dissect_tape_get_state_reply}, - {NDMP_TAPE_MTIO, + {NDMP_TAPE_MTIO, dissect_tape_mtio_request, dissect_tape_mtio_reply}, - {NDMP_TAPE_WRITE, + {NDMP_TAPE_WRITE, dissect_tape_write_request, dissect_tape_write_reply}, - {NDMP_TAPE_READ, + {NDMP_TAPE_READ, dissect_tape_read_request, dissect_tape_read_reply}, {NDMP_TAPE_EXECUTE_CDB, dissect_execute_cdb_request_tape, dissect_execute_cdb_reply}, - {NDMP_DATA_GET_STATE, + {NDMP_DATA_GET_STATE, NULL, dissect_data_get_state_reply}, {NDMP_DATA_START_BACKUP, dissect_data_start_backup_request, dissect_error }, @@ -2495,61 +2495,61 @@ static const ndmp_command ndmp_commands[] = { dissect_data_start_recover_request, dissect_error }, {NDMP_DATA_ABORT, NULL, dissect_error}, - {NDMP_DATA_GET_ENV, + {NDMP_DATA_GET_ENV, NULL, dissect_data_get_env_reply}, - {NDMP_DATA_STOP, + {NDMP_DATA_STOP, NULL, dissect_error}, - {NDMP_DATA_LISTEN, + {NDMP_DATA_LISTEN, dissect_ndmp_addr_msg, dissect_mover_listen_reply}, - {NDMP_DATA_CONNECT, + {NDMP_DATA_CONNECT, dissect_ndmp_addr_msg, dissect_error}, - {NDMP_NOTIFY_DATA_HALTED, + {NDMP_NOTIFY_DATA_HALTED, dissect_notify_data_halted_request, NULL}, - {NDMP_NOTIFY_CONNECTED, + {NDMP_NOTIFY_CONNECTED, dissect_notify_connected_request, NULL}, - {NDMP_NOTIFY_MOVER_HALTED, + {NDMP_NOTIFY_MOVER_HALTED, dissect_notify_data_halted_request, NULL}, - {NDMP_NOTIFY_MOVER_PAUSED, + {NDMP_NOTIFY_MOVER_PAUSED, dissect_notify_mover_paused_request, NULL}, - {NDMP_NOTIFY_DATA_READ, + {NDMP_NOTIFY_DATA_READ, dissect_mover_set_window_request, NULL}, - {NDMP_LOG_FILE, + {NDMP_LOG_FILE, dissect_log_file_request, NULL}, - {NDMP_LOG_MESSAGE, + {NDMP_LOG_MESSAGE, dissect_log_message_request, NULL}, - {NDMP_FH_ADD_FILE, + {NDMP_FH_ADD_FILE, dissect_fh_add_file_request, NULL}, - {NDMP_FH_ADD_DIR, + {NDMP_FH_ADD_DIR, dissect_fh_add_dir_request, NULL}, - {NDMP_FH_ADD_NODE, + {NDMP_FH_ADD_NODE, dissect_fh_add_node_request, NULL}, - {NDMP_CONNECT_OPEN, + {NDMP_CONNECT_OPEN, dissect_connect_open_request, dissect_error}, - {NDMP_CONNECT_CLIENT_AUTH, + {NDMP_CONNECT_CLIENT_AUTH, dissect_connect_client_auth_request, dissect_error}, - {NDMP_CONNECT_CLOSE, + {NDMP_CONNECT_CLOSE, NULL,NULL}, - {NDMP_CONNECT_SERVER_AUTH, + {NDMP_CONNECT_SERVER_AUTH, dissect_auth_attr_msg, dissect_connect_server_auth_reply}, - {NDMP_MOVER_GET_STATE, + {NDMP_MOVER_GET_STATE, NULL, dissect_mover_get_state_reply}, - {NDMP_MOVER_LISTEN, + {NDMP_MOVER_LISTEN, dissect_mover_listen_request, dissect_mover_listen_reply}, - {NDMP_MOVER_CONTINUE, + {NDMP_MOVER_CONTINUE, NULL, dissect_error}, - {NDMP_MOVER_ABORT, + {NDMP_MOVER_ABORT, NULL, dissect_error}, - {NDMP_MOVER_STOP, + {NDMP_MOVER_STOP, NULL, dissect_error}, - {NDMP_MOVER_SET_WINDOW, + {NDMP_MOVER_SET_WINDOW, dissect_mover_set_window_request, dissect_error}, - {NDMP_MOVER_READ, + {NDMP_MOVER_READ, dissect_mover_set_window_request, dissect_error}, - {NDMP_MOVER_CLOSE, + {NDMP_MOVER_CLOSE, NULL, dissect_error}, - {NDMP_MOVER_SET_RECORD_SIZE, + {NDMP_MOVER_SET_RECORD_SIZE, dissect_mover_set_record_size_request, dissect_error}, - {NDMP_MOVER_CONNECT, + {NDMP_MOVER_CONNECT, dissect_mover_connect_request, dissect_error}, {0, NULL,NULL} }; @@ -2629,7 +2629,7 @@ dissect_ndmp_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree } if(tree){ - cmd_item = proto_tree_add_text(tree, tvb, offset, -1, + cmd_item = proto_tree_add_text(tree, tvb, offset, -1, msg_vals[i].strptr); cmd_tree = proto_item_add_subtree(cmd_item, ett_ndmp); } @@ -2699,9 +2699,9 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return TRUE; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree) { @@ -3429,7 +3429,7 @@ proto_register_ndmp(void) proto_ndmp = proto_register_protocol("Network Data Management Protocol", "NDMP", "ndmp"); proto_register_field_array(proto_ndmp, hf_ndmp, array_length(hf_ndmp)); - + proto_register_subtree_array(ett, array_length(ett)); /* desegmentation */ diff --git a/packet-netbios.c b/packet-netbios.c index bf39a48fe4..431062ad8b 100644 --- a/packet-netbios.c +++ b/packet-netbios.c @@ -1,26 +1,26 @@ /* packet-netbios.c * Routines for NetBIOS protocol packet disassembly - * Jeff Foster <jfoste@woodward.com> + * Jeff Foster <jfoste@woodward.com> * Copyright 1999 Jeffrey C. Foster - * + * * derived from the packet-nbns.c * - * $Id: packet-netbios.c,v 1.50 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-netbios.c,v 1.51 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -122,9 +122,9 @@ static dissector_handle_t data_handle; static const value_string nb_name_type_vals[] = { {0x00, "Workstation/Redirector"}, {0x01, "Browser"}, - {0x02, "Workstation/Redirector"}, + {0x02, "Workstation/Redirector"}, /* not sure what 0x02 is, I'm seeing alot of them however */ - /* i'm seeing them with workstation/redirection host + /* i'm seeing them with workstation/redirection host announcements */ {0x03, "Messenger service/Main name"}, {0x05, "Forwarded name"}, @@ -156,7 +156,7 @@ static const value_string nb_name_type_vals[] = { }; /* See - + http://www.s390.ibm.com/bookmgr-cgi/bookmgr.cmd/BOOKS/BK8P7001/CCONTENTS and @@ -310,7 +310,7 @@ void netbios_add_name(char* label, tvbuff_t *tvb, int offset, proto_tree *tree) {/* add a name field display tree. Display the name and station type in sub-tree */ - + proto_tree *field_tree; proto_item *tf; char name_str[(NETBIOS_NAME_LEN - 1)*4 + 1]; @@ -445,7 +445,7 @@ static void nb_xmit_corrl( tvbuff_t *tvb, int offset, proto_tree *tree) {/* display the transmit correlator */ - proto_tree_add_item( tree, hf_netb_xmit_corrl, tvb, offset + NB_XMIT_CORL, + proto_tree_add_item( tree, hf_netb_xmit_corrl, tvb, offset + NB_XMIT_CORL, 2, TRUE); } @@ -473,7 +473,7 @@ static void nb_local_session( tvbuff_t *tvb, int offset, proto_tree *tree) {/* add the local session to tree */ - proto_tree_add_uint( tree, hf_netb_local_ses_no, tvb, offset + NB_LOCAL_SES, 1, + proto_tree_add_uint( tree, hf_netb_local_ses_no, tvb, offset + NB_LOCAL_SES, 1, tvb_get_guint8( tvb, offset + NB_LOCAL_SES)); } @@ -551,19 +551,19 @@ static void dissect_netb_add_group_name( tvbuff_t *tvb, int offset, {/* Handle the ADD GROUP NAME QUERY command */ - nb_resp_corrl( tvb, offset, tree); + nb_resp_corrl( tvb, offset, tree); netbios_add_name("Group name to add", tvb, offset + NB_SENDER_NAME, tree); } -static void dissect_netb_add_name( tvbuff_t *tvb, int offset, +static void dissect_netb_add_name( tvbuff_t *tvb, int offset, proto_tree *tree) {/* Handle the ADD NAME QUERY command */ - nb_resp_corrl( tvb, offset, tree); + nb_resp_corrl( tvb, offset, tree); netbios_add_name("Name to add", tvb, offset + NB_SENDER_NAME, tree); } @@ -605,7 +605,7 @@ static void dissect_netb_status_query( tvbuff_t *tvb, int offset, proto_tree *t break; } nb_data2( hf_netb_status_buffer_len, tvb, offset, tree); - nb_resp_corrl( tvb, offset, tree); + nb_resp_corrl( tvb, offset, tree); netbios_add_name("Receiver's Name", tvb, offset + NB_RECVER_NAME, tree); netbios_add_name("Sender's Name", tvb, offset + NB_SENDER_NAME, tree); } @@ -690,7 +690,7 @@ static void dissect_netb_add_name_resp( tvbuff_t *tvb, int offset, nb_data1( hf_netb_status, tvb, offset, tree); nb_data2( hf_netb_name_type, tvb, offset, tree); - nb_xmit_corrl( tvb, offset, tree); + nb_xmit_corrl( tvb, offset, tree); netbios_add_name("Name to be added", tvb, offset + NB_RECVER_NAME, tree); netbios_add_name("Name to be added", tvb, offset + NB_SENDER_NAME, @@ -768,7 +768,7 @@ static void dissect_netb_status_resp( tvbuff_t *tvb, int offset, proto_tree *tr proto_tree_add_text(data2_tree, tvb, offset, 2, "%s", decode_numeric_bitfield(data2, 0x3FFF, 2*8, "Status data length = %u")); - nb_xmit_corrl( tvb, offset, tree); + nb_xmit_corrl( tvb, offset, tree); netbios_add_name("Receiver's Name", tvb, offset + NB_RECVER_NAME, tree); netbios_add_name("Sender's Name", tvb, offset + NB_SENDER_NAME, tree); @@ -960,7 +960,7 @@ void (*dissect_netb[])(tvbuff_t *, int, proto_tree *) = { dissect_netb_unknown, /* unknown 0x1D */ dissect_netb_unknown, /* unknown 0x1E */ dissect_netb_session_alive, /* Session Alive 0x1f */ - dissect_netb_unknown, + dissect_netb_unknown, }; static heur_dissector_list_t netbios_heur_subdissector_list; @@ -1056,7 +1056,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( command < sizeof( dissect_netb)/ sizeof(void *)) /* branch to handle commands */ - (dissect_netb[ command])( tvb, offset, netb_tree); + (dissect_netb[ command])( tvb, offset, netb_tree); } offset += hdr_len; /* move past header */ @@ -1120,7 +1120,7 @@ void proto_register_netbios(void) "", HFILL }}, { &hf_netb_ack_with_data, - { "Acknowledge with data", "netbios.ack_with_data", FT_BOOLEAN, 8, TFS( &flags_allowed), 0x04, + { "Acknowledge with data", "netbios.ack_with_data", FT_BOOLEAN, 8, TFS( &flags_allowed), 0x04, "", HFILL }}, { &hf_netb_ack_expected, @@ -1185,7 +1185,7 @@ void proto_register_netbios(void) }; proto_netbios = proto_register_protocol("NetBIOS", "NetBIOS", "netbios"); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); proto_register_field_array(proto_netbios, hf_netb, array_length(hf_netb)); register_heur_dissector_list("netbios", &netbios_heur_subdissector_list); diff --git a/packet-netbios.h b/packet-netbios.h index 40ecbcc7f1..4c7bea8434 100644 --- a/packet-netbios.h +++ b/packet-netbios.h @@ -1,26 +1,26 @@ /* packet-netbios.h * Declarations of public routines for NetBIOS protocol packet disassembly - * Jeff Foster <foste@woodward.com> + * Jeff Foster <foste@woodward.com> * Copyright 1999 Jeffrey C. Foster - * + * * derived from the packet-nbns.c * - * $Id: packet-netbios.h,v 1.14 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-netbios.h,v 1.15 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-nfs.c b/packet-nfs.c index 4b330d004e..75f34f5cea 100644 --- a/packet-nfs.c +++ b/packet-nfs.c @@ -2,7 +2,7 @@ * Routines for nfs dissection * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 2000-2002, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding) - * $Id: packet-nfs.c,v 1.79 2002/08/08 22:15:07 guy Exp $ + * $Id: packet-nfs.c,v 1.80 2002/08/28 21:00:23 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -423,7 +423,7 @@ nfs_fhandle_data_free_all(gpointer key_arg _U_, gpointer value, gpointer user_da if(nns->fh){ tvb_free(nns->tvb); - nns->tvb=NULL; + nns->tvb=NULL; g_free((gpointer)nns->fh); nns->fh=NULL; nns->len=0; @@ -482,7 +482,7 @@ nfs_fhandle_reqrep_matching_init(void) nfs_fhandle_data_init_count * sizeof(nfs_fhandle_data_t), G_ALLOC_ONLY); } - + } @@ -629,7 +629,7 @@ nfs_name_snoop_init(void) nfs_name_snoop_key_init_count * sizeof(nfs_name_snoop_key_t), G_ALLOC_ONLY); } - + } void @@ -723,7 +723,7 @@ nfs_name_snoop_add_fh(int xid, tvbuff_t *tvb, int fh_offset, int fh_length) nns->fh=g_malloc(fh_length); memcpy(nns->fh, tvb_get_ptr(tvb, fh_offset, fh_length), fh_length); nns->fh_length=fh_length; - + key=g_mem_chunk_alloc(nfs_name_snoop_key_chunk); key->key=0; key->fh_length=nns->fh_length; @@ -833,18 +833,18 @@ nfs_name_snoop_fh(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int fh_of /* if we know the mapping, print the filename */ if(nns){ if(hidden){ - proto_tree_add_string_hidden(tree, hf_nfs_name, tvb, + proto_tree_add_string_hidden(tree, hf_nfs_name, tvb, fh_offset, 0, nns->name); }else { - proto_tree_add_string_format(tree, hf_nfs_name, tvb, + proto_tree_add_string_format(tree, hf_nfs_name, tvb, fh_offset, 0, nns->name, "Name: %s", nns->name); } if(nns->full_name){ if(hidden){ - proto_tree_add_string_hidden(tree, hf_nfs_full_name, tvb, + proto_tree_add_string_hidden(tree, hf_nfs_full_name, tvb, fh_offset, 0, nns->name); } else { - proto_tree_add_string_format(tree, hf_nfs_full_name, tvb, + proto_tree_add_string_format(tree, hf_nfs_full_name, tvb, fh_offset, 0, nns->name, "Full Name: %s", nns->full_name); } } @@ -894,12 +894,12 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, int offset, proto_tree *tree, if (tree) { proto_item* fsid_item = NULL; proto_tree* fsid_tree = NULL; - + fsid_item = proto_tree_add_text(tree, tvb, - fsid_O, fsid_L, + fsid_O, fsid_L, "file system ID: %d,%d", fsid_major, fsid_minor); if (fsid_item) { - fsid_tree = proto_item_add_subtree(fsid_item, + fsid_tree = proto_item_add_subtree(fsid_item, ett_nfs_fh_fsid); proto_tree_add_uint(fsid_tree, hf_nfs_fh_fsid_major, tvb, fsid_O, 2, fsid_major); @@ -940,7 +940,7 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, int offset, proto_tree *tree, guint32 fn_data_gen_L; guint32 gen; guint32 fn_L; - + fn_O = nof; fn_len_O = fn_O; fn_len_L = 2; @@ -956,11 +956,11 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, int offset, proto_tree *tree, if (tree) { proto_item* fn_item = NULL; proto_tree* fn_tree = NULL; - + fn_item = proto_tree_add_uint(tree, hf_nfs_fh_fn, tvb, fn_O, fn_L, inode); if (fn_item) { - fn_tree = proto_item_add_subtree(fn_item, + fn_tree = proto_item_add_subtree(fn_item, ett_nfs_fh_fn); proto_tree_add_uint(fn_tree, hf_nfs_fh_fn_len, tvb, fn_len_O, fn_len_L, fn_len); @@ -987,7 +987,7 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, int offset, proto_tree *tree, guint32 xfn_data_gen_L; guint32 xgen; guint32 xfn_L; - + xfn_O = nof; xfn_len_O = xfn_O; xfn_len_L = 2; @@ -1003,11 +1003,11 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, int offset, proto_tree *tree, if (tree) { proto_item* xfn_item = NULL; proto_tree* xfn_tree = NULL; - + xfn_item = proto_tree_add_uint(tree, hf_nfs_fh_xfn, tvb, xfn_O, xfn_L, xinode); if (xfn_item) { - xfn_tree = proto_item_add_subtree(xfn_item, + xfn_tree = proto_item_add_subtree(xfn_item, ett_nfs_fh_xfn); proto_tree_add_uint(xfn_tree, hf_nfs_fh_xfn_len, tvb, xfn_len_O, xfn_len_L, xfn_len); @@ -1064,10 +1064,10 @@ dissect_fhandle_data_LINUX_KNFSD_LE(tvbuff_t* tvb, int offset, proto_tree *tree, proto_tree* fsid_tree = NULL; fsid_item = proto_tree_add_text(tree, tvb, - offset+12, 4, + offset+12, 4, "file system ID: %d,%d", fsid_major, fsid_minor); if (fsid_item) { - fsid_tree = proto_item_add_subtree(fsid_item, + fsid_tree = proto_item_add_subtree(fsid_item, ett_nfs_fh_fsid); proto_tree_add_uint(fsid_tree, hf_nfs_fh_fsid_major, tvb, offset+13, 1, fsid_major); @@ -1082,10 +1082,10 @@ dissect_fhandle_data_LINUX_KNFSD_LE(tvbuff_t* tvb, int offset, proto_tree *tree, proto_tree* xfsid_tree = NULL; xfsid_item = proto_tree_add_text(tree, tvb, - offset+16, 4, + offset+16, 4, "exported file system ID: %d,%d", xfsid_major, xfsid_minor); if (xfsid_item) { - xfsid_tree = proto_item_add_subtree(xfsid_item, + xfsid_tree = proto_item_add_subtree(xfsid_item, ett_nfs_fh_xfsid); proto_tree_add_uint(xfsid_tree, hf_nfs_fh_xfsid_major, tvb, offset+17, 1, xfsid_major); @@ -1132,7 +1132,7 @@ dissect_fhandle_data_LINUX_NFSD_LE(tvbuff_t* tvb, int offset, proto_tree *tree, "hash path: %s", tvb_bytes_to_str(tvb,offset+5,hashlen)); if (hash_item) { - hash_tree = proto_item_add_subtree(hash_item, + hash_tree = proto_item_add_subtree(hash_item, ett_nfs_fh_hp); if (hash_tree) { proto_tree_add_uint(hash_tree, @@ -1219,7 +1219,7 @@ dissect_fhandle_data_LINUX_KNFSD_NEW(tvbuff_t* tvb, int offset, proto_tree *tree goto out; } } - + switch (auth_type) { case 0: { /* no authentication */ @@ -1246,11 +1246,11 @@ dissect_fhandle_data_LINUX_KNFSD_NEW(tvbuff_t* tvb, int offset, proto_tree *tree fsid_inode = tvb_get_letohl(tvb, offset + 4); if (tree) { proto_item* fsid_item = proto_tree_add_text(tree, tvb, - offset+0, 8, + offset+0, 8, "file system ID: %u,%u (inode %u)", fsid_major, fsid_minor, fsid_inode); if (fsid_item) { - proto_tree* fsid_tree = proto_item_add_subtree(fsid_item, + proto_tree* fsid_tree = proto_item_add_subtree(fsid_item, ett_nfs_fh_fsid); if (fsid_tree) { proto_tree_add_uint(fsid_tree, hf_nfs_fh_fsid_major, @@ -1394,7 +1394,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, /* first check if we have seen this fhandle before */ fhd.len=fhlen; fhd.fh=(unsigned char *)tvb_get_ptr(tvb, offset, fhlen); - old_fhd=g_hash_table_lookup(nfs_fhandle_data_table, + old_fhd=g_hash_table_lookup(nfs_fhandle_data_table, (gconstpointer)&fhd); if(!old_fhd){ /* oh, a new fhandle, alloc struct and store it in the table*/ @@ -1403,16 +1403,16 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, old_fhd->fh=g_malloc(fhlen); memcpy(old_fhd->fh, fhd.fh, fhlen); old_fhd->tvb=tvb_new_real_data(old_fhd->fh, old_fhd->len, old_fhd->len); - g_hash_table_insert(nfs_fhandle_data_table, + g_hash_table_insert(nfs_fhandle_data_table, (gpointer)old_fhd, (gpointer)old_fhd); } - + /* XXX here we should really check that we havent stored this fhandle for this frame number already. - We should also make sure we can handle when we have multiple + We should also make sure we can handle when we have multiple fhandles seen for the same frame, which WILL happen for certain nfs calls. For now, we dont handle this and those calls will - not work properly with this feature + not work properly with this feature */ g_hash_table_insert(nfs_fhandle_frame_table, (gpointer)pinfo->fd->num, @@ -1432,10 +1432,10 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, fhhash += val; } if(hidden){ - proto_tree_add_uint_hidden(tree, hf_nfs_fh_hash, tvb, offset, + proto_tree_add_uint_hidden(tree, hf_nfs_fh_hash, tvb, offset, fhlen, fhhash); } else { - proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset, + proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset, fhlen, fhhash); } } @@ -1443,7 +1443,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, nfs_name_snoop_fh(pinfo, tree, tvb, offset, fhlen, hidden); } - if(!hidden){ + if(!hidden){ /* calculate (heuristically) fhtype */ switch (fhlen) { case 12: @@ -1480,7 +1480,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, int wrong=0; for (len2=5+len1;len2<32;len2++) { if (tvb_get_guint8(tvb,offset+len2)) { - wrong=1; + wrong=1; break; } } @@ -1504,9 +1504,9 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, type_ready: if(!hidden){ - proto_tree_add_text(tree, tvb, offset, 0, + proto_tree_add_text(tree, tvb, offset, 0, "type: %s", val_to_str(fhtype, names_fhtype, "Unknown")); - + switch (fhtype) { case FHT_SVR4: @@ -1650,13 +1650,13 @@ dissect_stat_internal(tvbuff_t *tvb, int offset, guint32 stat; stat = tvb_get_ntohl(tvb, offset+0); - + if (tree) { /* this gives the right NFSv2 number<->message relation */ /* and makes it searchable via "nfs.status" */ proto_tree_add_uint_format(tree, hf_nfs_nfsstat3, tvb, - offset+0, 4, stat, "Status: %s (%u)", - val_to_str(stat, + offset+0, 4, stat, "Status: %s (%u)", + val_to_str(stat, (nfsvers != 4)? names_nfs_stat: names_nfs_stat4,"%u"), stat); } @@ -1717,7 +1717,7 @@ dissect_ftype(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) ftype = tvb_get_ntohl(tvb, offset+0); ftype_name = val_to_str(ftype, nfs2_ftype, "%u"); - + if (tree) { proto_tree_add_text(tree, tvb, offset, 4, "%s: %s (%u)", name, ftype_name, ftype); @@ -1753,7 +1753,7 @@ dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, &&(!civ->request) &&((civ->proc==4)||(civ->proc==9)||(civ->proc==14)) ) { - nfs_name_snoop_add_fh(civ->xid, tvb, + nfs_name_snoop_add_fh(civ->xid, tvb, offset, 32); } @@ -1763,7 +1763,7 @@ dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, &&((civ->vers==1)||(civ->vers==2)) &&(!civ->request) ) { - nfs_name_snoop_add_fh(civ->xid, tvb, + nfs_name_snoop_add_fh(civ->xid, tvb, offset, 32); } } @@ -1837,7 +1837,7 @@ dissect_mode(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) proto_tree* mode_tree = NULL; mode = tvb_get_ntohl(tvb, offset+0); - + if (tree) { mode_item = proto_tree_add_text(tree, tvb, offset, 4, "%s: 0%o", name, mode); @@ -2060,7 +2060,7 @@ dissect_diropargs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre &&(civ->request) &&((civ->proc==4)||(civ->proc==9)||(civ->proc==14)) ) { - nfs_name_snoop_add_name(civ->xid, tvb, + nfs_name_snoop_add_name(civ->xid, tvb, offset+36, tvb_get_ntohl(tvb, offset+32), offset, 32, NULL); } @@ -2120,7 +2120,7 @@ dissect_nfsdata(tvbuff_t *tvb, int offset, proto_tree *tree, int hf) /* RFC 1094, Page 18 */ static int -dissect_nfs2_diropres_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_diropres_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_diropres(tvb, offset, pinfo, tree); @@ -2130,7 +2130,7 @@ dissect_nfs2_diropres_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 6 */ static int -dissect_nfs2_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "file" ); @@ -2142,7 +2142,7 @@ dissect_nfs2_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 6 */ static int -dissect_nfs2_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_nfs2_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint32 status; @@ -2163,7 +2163,7 @@ dissect_nfs2_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1094, Page 7 */ static int -dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 offset_value; @@ -2175,11 +2175,11 @@ dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, count = tvb_get_ntohl(tvb, offset+4); totalcount = tvb_get_ntohl(tvb, offset+8); if (tree) { - proto_tree_add_uint(tree, hf_nfs_read_offset, tvb, + proto_tree_add_uint(tree, hf_nfs_read_offset, tvb, offset+0, 4, offset_value); - proto_tree_add_uint(tree, hf_nfs_read_count, tvb, + proto_tree_add_uint(tree, hf_nfs_read_count, tvb, offset+4, 4, count); - proto_tree_add_uint(tree, hf_nfs_read_totalcount, tvb, + proto_tree_add_uint(tree, hf_nfs_read_totalcount, tvb, offset+8, 4, totalcount); } offset += 12; @@ -2190,7 +2190,7 @@ dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 7 */ static int -dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) { guint32 status; @@ -2199,7 +2199,7 @@ dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, switch (status) { case 0: offset = dissect_fattr(tvb, offset, tree, "attributes"); - offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_data); + offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_data); break; default: /* do nothing */ @@ -2212,7 +2212,7 @@ dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1094, Page 8 */ static int -dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 beginoffset; @@ -2224,16 +2224,16 @@ dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, offset_value = tvb_get_ntohl(tvb, offset+4); totalcount = tvb_get_ntohl(tvb, offset+8); if (tree) { - proto_tree_add_uint(tree, hf_nfs_write_beginoffset, tvb, + proto_tree_add_uint(tree, hf_nfs_write_beginoffset, tvb, offset+0, 4, beginoffset); - proto_tree_add_uint(tree, hf_nfs_write_offset, tvb, + proto_tree_add_uint(tree, hf_nfs_write_offset, tvb, offset+4, 4, offset_value); - proto_tree_add_uint(tree, hf_nfs_write_totalcount, tvb, + proto_tree_add_uint(tree, hf_nfs_write_totalcount, tvb, offset+8, 4, totalcount); } offset += 12; - offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_data); + offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_data); return offset; } @@ -2241,7 +2241,7 @@ dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 8 */ static int -dissect_nfs2_createargs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_createargs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_diropargs(tvb, offset, pinfo, tree, "where" ); @@ -2253,7 +2253,7 @@ dissect_nfs2_createargs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 9 */ static int -dissect_nfs2_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_diropargs(tvb, offset, pinfo, tree, "from"); @@ -2265,7 +2265,7 @@ dissect_nfs2_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 9 */ static int -dissect_nfs2_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_fhandle (tvb, offset, pinfo, tree, "from"); @@ -2277,7 +2277,7 @@ dissect_nfs2_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 10 */ static int -dissect_nfs2_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_diropargs(tvb, offset, pinfo, tree, "from" ); @@ -2290,7 +2290,7 @@ dissect_nfs2_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 11 */ static int -dissect_nfs2_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 cookie; @@ -2313,7 +2313,7 @@ dissect_nfs2_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 11 */ static int -dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) { proto_item* entry_item = NULL; @@ -2341,7 +2341,7 @@ dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_item_set_text(entry_item, "Entry: file ID %u, name %s", fileid, name); g_free(name); - + cookie = tvb_get_ntohl(tvb, offset + 0); if (entry_tree) proto_tree_add_uint(entry_tree, hf_nfs_readdir_entry_cookie, tvb, @@ -2358,7 +2358,7 @@ dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1094, Page 11 */ static int -dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -2367,7 +2367,7 @@ dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_stat(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_readdir_entry); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) @@ -2535,7 +2535,7 @@ dissect_mode3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) proto_tree* mode3_tree = NULL; mode3 = tvb_get_ntohl(tvb, offset+0); - + if (tree) { mode3_item = proto_tree_add_text(tree, tvb, offset, 4, "%s: 0%o", name, mode3); @@ -2619,7 +2619,7 @@ dissect_nfsstat3(tvbuff_t *tvb, int offset, guint32 nfsstat3; nfsstat3 = tvb_get_ntohl(tvb, offset+0); - + if (tree) { proto_tree_add_uint(tree, hf_nfs_nfsstat3, tvb, offset, 4, nfsstat3); @@ -2652,7 +2652,7 @@ dissect_ftype3(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 type; type = tvb_get_ntohl(tvb, offset+0); - + if (tree) { proto_tree_add_uint(tree, hf, tvb, offset, 4, type); } @@ -2675,7 +2675,7 @@ dissect_specdata3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) specdata1 = tvb_get_ntohl(tvb, offset+0); specdata2 = tvb_get_ntohl(tvb, offset+4); - + if (tree) { specdata3_item = proto_tree_add_text(tree, tvb, offset, 8, "%s: %u,%u", name, specdata1, specdata2); @@ -2698,7 +2698,7 @@ dissect_specdata3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* RFC 1813, Page 21 */ int -dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *name) { guint fh3_len; @@ -2711,7 +2711,7 @@ dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, fh3_len = tvb_get_ntohl(tvb, offset+0); fh3_len_full = rpc_roundup(fh3_len); fh3_fill = fh3_len_full - fh3_len; - + if (tree) { fitem = proto_tree_add_text(tree, tvb, offset, 4+fh3_len_full, "%s", name); @@ -2731,7 +2731,7 @@ dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, ) { fh_length=tvb_get_ntohl(tvb, offset); fh_offset=offset+4; - nfs_name_snoop_add_fh(civ->xid, tvb, + nfs_name_snoop_add_fh(civ->xid, tvb, fh_offset, fh_length); } @@ -2743,7 +2743,7 @@ dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, ) { fh_length=tvb_get_ntohl(tvb, offset); fh_offset=offset+4; - nfs_name_snoop_add_fh(civ->xid, tvb, + nfs_name_snoop_add_fh(civ->xid, tvb, fh_offset, fh_length); } } @@ -2773,7 +2773,7 @@ dissect_nfstime3(tvbuff_t *tvb, int offset, nseconds = tvb_get_ntohl(tvb, offset+4); ts.secs = seconds; ts.nsecs = nseconds; - + if (tree) { time_item = proto_tree_add_time(tree, hf_time, tvb, offset, 8, &ts); @@ -2815,7 +2815,7 @@ dissect_fattr3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) offset); offset = dissect_rpc_uint32(tvb, fattr3_tree, hf_nfs_fattr3_gid, offset); - offset = dissect_rpc_uint64(tvb, fattr3_tree, hf_nfs_fattr3_size, + offset = dissect_rpc_uint64(tvb, fattr3_tree, hf_nfs_fattr3_size, offset); offset = dissect_rpc_uint64(tvb, fattr3_tree, hf_nfs_fattr3_used, offset); @@ -2857,13 +2857,13 @@ dissect_post_op_attr(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { post_op_attr_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - post_op_attr_tree = proto_item_add_subtree(post_op_attr_item, + post_op_attr_tree = proto_item_add_subtree(post_op_attr_item, ett_nfs_post_op_attr); } attributes_follow = tvb_get_ntohl(tvb, offset+0); proto_tree_add_text(post_op_attr_tree, tvb, offset, 4, - "attributes_follow: %s (%u)", + "attributes_follow: %s (%u)", val_to_str(attributes_follow,value_follows,"Unknown"), attributes_follow); offset += 4; switch (attributes_follow) { @@ -2875,7 +2875,7 @@ dissect_post_op_attr(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* void */ break; } - + /* now we know, that post_op_attr_tree is shorter */ if (post_op_attr_item) { proto_item_set_len(post_op_attr_item, offset - old_offset); @@ -2896,11 +2896,11 @@ dissect_wcc_attr(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { wcc_attr_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - wcc_attr_tree = proto_item_add_subtree(wcc_attr_item, + wcc_attr_tree = proto_item_add_subtree(wcc_attr_item, ett_nfs_wcc_attr); } - offset = dissect_rpc_uint64(tvb, wcc_attr_tree, hf_nfs_wcc_attr_size, + offset = dissect_rpc_uint64(tvb, wcc_attr_tree, hf_nfs_wcc_attr_size, offset); offset = dissect_nfstime3(tvb, offset, wcc_attr_tree, hf_nfs_mtime, hf_nfs_mtime_sec, hf_nfs_mtime_nsec); offset = dissect_nfstime3(tvb, offset, wcc_attr_tree, hf_nfs_ctime, hf_nfs_ctime_sec, hf_nfs_ctime_nsec); @@ -2925,13 +2925,13 @@ dissect_pre_op_attr(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { pre_op_attr_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - pre_op_attr_tree = proto_item_add_subtree(pre_op_attr_item, + pre_op_attr_tree = proto_item_add_subtree(pre_op_attr_item, ett_nfs_pre_op_attr); } attributes_follow = tvb_get_ntohl(tvb, offset+0); proto_tree_add_text(pre_op_attr_tree, tvb, offset, 4, - "attributes_follow: %s (%u)", + "attributes_follow: %s (%u)", val_to_str(attributes_follow,value_follows,"Unknown"), attributes_follow); offset += 4; switch (attributes_follow) { @@ -2943,7 +2943,7 @@ dissect_pre_op_attr(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* void */ break; } - + /* now we know, that pre_op_attr_tree is shorter */ if (pre_op_attr_item) { proto_item_set_len(pre_op_attr_item, offset - old_offset); @@ -2964,7 +2964,7 @@ dissect_wcc_data(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { wcc_data_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - wcc_data_tree = proto_item_add_subtree(wcc_data_item, + wcc_data_tree = proto_item_add_subtree(wcc_data_item, ett_nfs_wcc_data); } @@ -2982,7 +2982,7 @@ dissect_wcc_data(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* RFC 1813, Page 25 */ static int -dissect_post_op_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_post_op_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char* name) { proto_item* post_op_fh3_item = NULL; @@ -2993,13 +2993,13 @@ dissect_post_op_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { post_op_fh3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - post_op_fh3_tree = proto_item_add_subtree(post_op_fh3_item, + post_op_fh3_tree = proto_item_add_subtree(post_op_fh3_item, ett_nfs_post_op_fh3); } handle_follows = tvb_get_ntohl(tvb, offset+0); proto_tree_add_text(post_op_fh3_tree, tvb, offset, 4, - "handle_follows: %s (%u)", + "handle_follows: %s (%u)", val_to_str(handle_follows,value_follows,"Unknown"), handle_follows); offset += 4; switch (handle_follows) { @@ -3011,7 +3011,7 @@ dissect_post_op_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, /* void */ break; } - + /* now we know, that post_op_fh3_tree is shorter */ if (post_op_fh3_item) { proto_item_set_len(post_op_fh3_item, offset - old_offset); @@ -3037,7 +3037,7 @@ dissect_set_mode3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_mode3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_mode3_tree = proto_item_add_subtree(set_mode3_item, + set_mode3_tree = proto_item_add_subtree(set_mode3_item, ett_nfs_set_mode3); } @@ -3056,7 +3056,7 @@ dissect_set_mode3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* void */ break; } - + /* now we know, that set_mode3 is shorter */ if (set_mode3_item) { proto_item_set_len(set_mode3_item, offset - old_offset); @@ -3082,7 +3082,7 @@ dissect_set_uid3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_uid3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_uid3_tree = proto_item_add_subtree(set_uid3_item, + set_uid3_tree = proto_item_add_subtree(set_uid3_item, ett_nfs_set_uid3); } @@ -3127,7 +3127,7 @@ dissect_set_gid3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_gid3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_gid3_tree = proto_item_add_subtree(set_gid3_item, + set_gid3_tree = proto_item_add_subtree(set_gid3_item, ett_nfs_set_gid3); } @@ -3139,7 +3139,7 @@ dissect_set_gid3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) switch (set_it) { case 1: - offset = dissect_rpc_uint32(tvb, set_gid3_tree, + offset = dissect_rpc_uint32(tvb, set_gid3_tree, hf_nfs_gid3, offset); break; default: @@ -3172,7 +3172,7 @@ dissect_set_size3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_size3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_size3_tree = proto_item_add_subtree(set_size3_item, + set_size3_tree = proto_item_add_subtree(set_size3_item, ett_nfs_set_size3); } @@ -3231,7 +3231,7 @@ dissect_set_atime(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_atime_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_atime_tree = proto_item_add_subtree(set_atime_item, + set_atime_tree = proto_item_add_subtree(set_atime_item, ett_nfs_set_atime); } @@ -3278,7 +3278,7 @@ dissect_set_mtime(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) if (tree) { set_mtime_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, set_it_name); - set_mtime_tree = proto_item_add_subtree(set_mtime_item, + set_mtime_tree = proto_item_add_subtree(set_mtime_item, ett_nfs_set_mtime); } @@ -3341,7 +3341,7 @@ dissect_sattr3(tvbuff_t *tvb, int offset, proto_tree *tree, char* name) /* RFC 1813, Page 27 */ static int -dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char* name) { proto_item* diropargs3_item = NULL; @@ -3353,7 +3353,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { diropargs3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", name); - diropargs3_tree = proto_item_add_subtree(diropargs3_item, + diropargs3_tree = proto_item_add_subtree(diropargs3_item, ett_nfs_diropargs3); } @@ -3362,7 +3362,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_nfs_fh3(tvb, offset, pinfo, diropargs3_tree, "dir"); name_offset=offset+4; name_len=tvb_get_ntohl(tvb, offset); - offset = dissect_filename3(tvb, offset, diropargs3_tree, + offset = dissect_filename3(tvb, offset, diropargs3_tree, hf_nfs_name, NULL); /* are we snooping fh to filenames ?*/ @@ -3375,7 +3375,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, &&(civ->request) &&((civ->proc==3)||(civ->proc==8)||(civ->proc==9)) ) { - nfs_name_snoop_add_name(civ->xid, tvb, + nfs_name_snoop_add_name(civ->xid, tvb, name_offset, name_len, parent_offset, parent_len, NULL); } @@ -3393,7 +3393,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 27 */ static int -dissect_nfs3_diropargs3_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_diropargs3_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_diropargs3(tvb, offset, pinfo, tree, "object"); @@ -3412,7 +3412,7 @@ dissect_access(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree* access_tree = NULL; access = tvb_get_ntohl(tvb, offset+0); - + if (tree) { access_item = proto_tree_add_text(tree, tvb, offset, 4, "%s: 0x%02x", name, access); @@ -3442,7 +3442,7 @@ dissect_access(tvbuff_t *tvb, int offset, proto_tree *tree, /* NFS3 file handle dissector */ static int -dissect_nfs3_nfs_fh3_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_nfs_fh3_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "object"); @@ -3452,7 +3452,7 @@ dissect_nfs3_nfs_fh3_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 32,33 */ static int -dissect_nfs3_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "object"); @@ -3462,7 +3462,7 @@ dissect_nfs3_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 32,33 */ static int -dissect_nfs3_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_nfs3_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) { guint32 status; @@ -3476,7 +3476,7 @@ dissect_nfs3_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* void */ break; } - + return offset; } @@ -3497,7 +3497,7 @@ dissect_sattrguard3(tvbuff_t *tvb, int offset, proto_tree* tree, char *name) if (tree) { sattrguard3_item = proto_tree_add_text(tree, tvb, offset, -1, "%s: %s", name, check_name); - sattrguard3_tree = proto_item_add_subtree(sattrguard3_item, + sattrguard3_tree = proto_item_add_subtree(sattrguard3_item, ett_nfs_sattrguard3); } @@ -3528,7 +3528,7 @@ dissect_sattrguard3(tvbuff_t *tvb, int offset, proto_tree* tree, char *name) /* RFC 1813, Page 33..36 */ static int -dissect_nfs3_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3 (tvb, offset, pinfo, tree, "object"); @@ -3554,14 +3554,14 @@ dissect_nfs3_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_wcc_data(tvb, offset, tree, "obj_wcc"); break; } - + return offset; } /* RFC 1813, Page 37..39 */ static int -dissect_nfs3_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_diropargs3 (tvb, offset, pinfo, tree, "what"); @@ -3571,7 +3571,7 @@ dissect_nfs3_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 37..39 */ static int -dissect_nfs3_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -3580,24 +3580,24 @@ dissect_nfs3_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, switch (status) { case 0: offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "object"); - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); break; } - + return offset; } /* RFC 1813, Page 40..43 */ static int -dissect_nfs3_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "object"); @@ -3617,16 +3617,16 @@ dissect_nfs3_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); offset = dissect_access(tvb, offset, tree, "access"); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); break; } - + return offset; } @@ -3641,24 +3641,24 @@ dissect_nfs3_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "symlink_attributes"); - offset = dissect_nfspath3(tvb, offset, tree, + offset = dissect_nfspath3(tvb, offset, tree, hf_nfs_readlink_data); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "symlink_attributes"); break; } - + return offset; } /* RFC 1813, Page 46..48 */ static int -dissect_nfs3_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "file"); @@ -3679,20 +3679,20 @@ dissect_nfs3_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "file_attributes"); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3, + offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3, offset); - offset = dissect_rpc_bool(tvb, tree, hf_nfs_read_eof, + offset = dissect_rpc_bool(tvb, tree, hf_nfs_read_eof, offset); offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_data); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "file_attributes"); break; } - + return offset; } @@ -3715,7 +3715,7 @@ dissect_stable_how(tvbuff_t *tvb, int offset, proto_tree* tree, int hfindex) stable_how = tvb_get_ntohl(tvb,offset+0); if (tree) { proto_tree_add_uint(tree, hfindex, tvb, - offset, 4, stable_how); + offset, 4, stable_how); } offset += 4; @@ -3725,7 +3725,7 @@ dissect_stable_how(tvbuff_t *tvb, int offset, proto_tree* tree, int hfindex) /* RFC 1813, Page 49..54 */ static int -dissect_nfs3_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3 (tvb, offset, pinfo, tree, "file"); @@ -3749,7 +3749,7 @@ dissect_nfs3_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, switch (status) { case 0: offset = dissect_wcc_data (tvb, offset, tree, "file_wcc"); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3, + offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3, offset); offset = dissect_stable_how(tvb, offset, tree, hf_nfs_write_committed); @@ -3759,7 +3759,7 @@ dissect_nfs3_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_wcc_data(tvb, offset, tree, "file_wcc"); break; } - + return offset; } @@ -3778,7 +3778,7 @@ static int dissect_createmode3(tvbuff_t *tvb, int offset, proto_tree* tree, guint32* mode) { guint32 mode_value; - + mode_value = tvb_get_ntohl(tvb, offset + 0); if (tree) { proto_tree_add_uint(tree, hf_nfs_createmode3, tvb, @@ -3793,7 +3793,7 @@ dissect_createmode3(tvbuff_t *tvb, int offset, proto_tree* tree, guint32* mode) /* RFC 1813, Page 54..58 */ static int -dissect_nfs3_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 mode; @@ -3809,14 +3809,14 @@ dissect_nfs3_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_createverf3(tvb, offset, tree); break; } - + return offset; } /* RFC 1813, Page 54..58 */ static int -dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -3825,7 +3825,7 @@ dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, switch (status) { case 0: offset = dissect_post_op_fh3 (tvb, offset, pinfo, tree, "obj"); - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); offset = dissect_wcc_data(tvb, offset, tree, "dir_wcc"); break; @@ -3833,39 +3833,39 @@ dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_wcc_data(tvb, offset, tree, "dir_wcc"); break; } - + return offset; } /* RFC 1813, Page 58..60 */ static int -dissect_nfs3_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_diropargs3(tvb, offset, pinfo, tree, "where"); offset = dissect_sattr3 (tvb, offset, tree, "attributes"); - + return offset; } /* RFC 1813, Page 61..63 */ static int -dissect_nfs3_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_diropargs3(tvb, offset, pinfo, tree, "where"); offset = dissect_sattr3 (tvb, offset, tree, "symlink_attributes"); offset = dissect_nfspath3 (tvb, offset, tree, hf_nfs_symlink_to); - + return offset; } /* RFC 1813, Page 63..66 */ static int -dissect_nfs3_mknod_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_mknod_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 type; @@ -3886,7 +3886,7 @@ dissect_nfs3_mknod_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* nothing to do */ break; } - + return offset; } @@ -3907,19 +3907,19 @@ dissect_nfs3_remove_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_wcc_data(tvb, offset, tree, "dir_wcc"); break; } - + return offset; } /* RFC 1813, Page 71..74 */ static int -dissect_nfs3_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_diropargs3(tvb, offset, pinfo, tree, "from"); offset = dissect_diropargs3(tvb, offset, pinfo, tree, "to"); - + return offset; } @@ -3942,19 +3942,19 @@ dissect_nfs3_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_wcc_data(tvb, offset, tree, "todir_wcc"); break; } - + return offset; } /* RFC 1813, Page 74..76 */ static int -dissect_nfs3_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3 (tvb, offset, pinfo, tree, "file"); offset = dissect_diropargs3(tvb, offset, pinfo, tree, "link"); - + return offset; } @@ -3969,31 +3969,31 @@ dissect_nfs3_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "file_attributes"); offset = dissect_wcc_data(tvb, offset, tree, "linkdir_wcc"); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "file_attributes"); offset = dissect_wcc_data(tvb, offset, tree, "linkdir_wcc"); break; } - + return offset; } /* RFC 1813, Page 76..80 */ static int -dissect_nfs3_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3 (tvb, offset, pinfo, tree, "dir"); offset = dissect_rpc_uint64(tvb, tree, hf_nfs_cookie3, offset); offset = dissect_cookieverf3(tvb, offset, tree); offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3, offset); - + return offset; } @@ -4023,7 +4023,7 @@ dissect_entry3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_item_set_text(entry_item, "Entry: name %s", name); g_free(name); - offset = dissect_rpc_uint64(tvb, entry_tree, hf_nfs_readdir_entry3_cookie, + offset = dissect_rpc_uint64(tvb, entry_tree, hf_nfs_readdir_entry3_cookie, offset); /* now we know, that a readdir entry is shorter */ @@ -4037,7 +4037,7 @@ dissect_entry3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1813, Page 76..80 */ static int -dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -4046,10 +4046,10 @@ dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_stat(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); offset = dissect_cookieverf3(tvb, offset, tree); - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_entry3); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) @@ -4058,7 +4058,7 @@ dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); break; } @@ -4069,7 +4069,7 @@ dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 80..83 */ static int -dissect_nfs3_readdirplus_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_readdirplus_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3 (tvb, offset, pinfo, tree, "dir"); @@ -4079,14 +4079,14 @@ dissect_nfs3_readdirplus_call(tvbuff_t *tvb, int offset, packet_info *pinfo, offset); offset = dissect_rpc_uint32(tvb, tree, hf_nfs_count3_maxcount, offset); - + return offset; } /* RFC 1813, Page 80..83 */ static int -dissect_entryplus3(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_entryplus3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { proto_item* entry_item = NULL; @@ -4112,7 +4112,7 @@ dissect_entryplus3(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_rpc_uint64(tvb, entry_tree, hf_nfs_readdirplus_entry_cookie, offset); - offset = dissect_post_op_attr(tvb, offset, entry_tree, + offset = dissect_post_op_attr(tvb, offset, entry_tree, "name_attributes"); offset = dissect_post_op_fh3(tvb, offset, pinfo, entry_tree, "name_handle"); @@ -4127,7 +4127,7 @@ dissect_entryplus3(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1813, Page 80..83 */ static int -dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -4136,10 +4136,10 @@ dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_stat(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); offset = dissect_cookieverf3(tvb, offset, tree); - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_entryplus3); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) @@ -4148,7 +4148,7 @@ dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "dir_attributes"); break; } @@ -4168,7 +4168,7 @@ dissect_nfs3_fsstat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); offset = dissect_rpc_uint64(tvb, tree, hf_nfs_fsstat3_resok_tbytes, offset); @@ -4189,7 +4189,7 @@ dissect_nfs3_fsstat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 4; break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); break; } @@ -4224,7 +4224,7 @@ dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); rtmax = tvb_get_ntohl(tvb, offset+0); if (tree) @@ -4262,7 +4262,7 @@ dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset+0, 4, dtpref); offset += 4; - offset = dissect_rpc_uint64(tvb, tree, + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_fsinfo_maxfilesize, offset); offset = dissect_nfstime3(tvb, offset, tree, hf_nfs_dtime, hf_nfs_dtime_sec, hf_nfs_dtime_nsec); properties = tvb_get_ntohl(tvb, offset+0); @@ -4270,8 +4270,8 @@ dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, properties_item = proto_tree_add_uint(tree, hf_nfs_fsinfo_properties, tvb, offset+0, 4, properties); - if (properties_item) - properties_tree = proto_item_add_subtree(properties_item, + if (properties_item) + properties_tree = proto_item_add_subtree(properties_item, ett_nfs_fsinfo_properties); if (properties_tree) { proto_tree_add_text(properties_tree, tvb, @@ -4306,7 +4306,7 @@ dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 4; break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); break; } @@ -4327,7 +4327,7 @@ dissect_nfs3_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_nfsstat3(tvb, offset, tree, &status); switch (status) { case 0: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); linkmax = tvb_get_ntohl(tvb, offset + 0); if (tree) @@ -4339,17 +4339,17 @@ dissect_nfs3_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_uint(tree, hf_nfs_pathconf_name_max, tvb, offset+0, 4, name_max); offset += 4; - offset = dissect_rpc_bool(tvb, tree, + offset = dissect_rpc_bool(tvb, tree, hf_nfs_pathconf_no_trunc, offset); - offset = dissect_rpc_bool(tvb, tree, + offset = dissect_rpc_bool(tvb, tree, hf_nfs_pathconf_chown_restricted, offset); - offset = dissect_rpc_bool(tvb, tree, + offset = dissect_rpc_bool(tvb, tree, hf_nfs_pathconf_case_insensitive, offset); - offset = dissect_rpc_bool(tvb, tree, + offset = dissect_rpc_bool(tvb, tree, hf_nfs_pathconf_case_preserving, offset); break; default: - offset = dissect_post_op_attr(tvb, offset, tree, + offset = dissect_post_op_attr(tvb, offset, tree, "obj_attributes"); break; } @@ -4360,7 +4360,7 @@ dissect_nfs3_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1813, Page 92..95 */ static int -dissect_nfs3_commit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs3_commit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_fh3(tvb, offset, pinfo, tree, "file"); @@ -4387,7 +4387,7 @@ dissect_nfs3_commit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_wcc_data(tvb, offset, tree, "file_wcc"); break; } - + return offset; } @@ -4433,11 +4433,11 @@ dissect_nfs_lock_owner4(tvbuff_t *tvb, int offset, proto_tree *tree) fitem = proto_tree_add_text(tree, tvb, offset, 4, "Owner"); - if (fitem) + if (fitem) { newftree = proto_item_add_subtree(fitem, ett_nfs_lock_owner4); - if (newftree) + if (newftree) { offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs_data); @@ -4455,18 +4455,18 @@ dissect_nfs_pathname4(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree *newftree = NULL; comp_count=tvb_get_ntohl(tvb, offset); - fitem = proto_tree_add_text(tree, tvb, offset, 4, + fitem = proto_tree_add_text(tree, tvb, offset, 4, "pathname components (%u)", comp_count); offset += 4; - if (fitem) + if (fitem) { newftree = proto_item_add_subtree(fitem, ett_nfs_pathname4); - if (newftree) + if (newftree) { for (i = 0; i < comp_count; i++) - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); } } @@ -4498,13 +4498,13 @@ dissect_nfs_settime4(tvbuff_t *tvb, int offset, guint32 set_it; set_it = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint(tree, hf_nfs_time_how4, tvb, offset+0, + proto_tree_add_uint(tree, hf_nfs_time_how4, tvb, offset+0, 4, set_it); offset += 4; if (set_it == SET_TO_CLIENT_TIME4) offset = dissect_nfs_nfstime4(tvb, offset, tree); - + return offset; } @@ -4570,7 +4570,7 @@ dissect_nfs_acemask4(tvbuff_t *tvb, int offset, proto_tree *tree) acemask = tvb_get_ntohl(tvb, offset); - acemask_item = proto_tree_add_text(tree, tvb, offset, 4, + acemask_item = proto_tree_add_text(tree, tvb, offset, 4, "acemask: 0x%08x", acemask); if (acemask_item) @@ -4579,7 +4579,7 @@ dissect_nfs_acemask4(tvbuff_t *tvb, int offset, proto_tree *tree) if (acemask_tree) { if (acemask & ACE4_READ_DATA) - proto_tree_add_text(acemask_tree, tvb, offset, 4, + proto_tree_add_text(acemask_tree, tvb, offset, 4, "ACE4_READ_DATA/ACE4_LIST_DIRECTORY (0x%08x)", ACE4_READ_DATA); @@ -4612,7 +4612,7 @@ dissect_nfs_acemask4(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_text(acemask_tree, tvb, offset, 4, "ACE4_DELETE_CHILD (0x%08x)", ACE4_DELETE_CHILD); - + if (acemask & ACE4_READ_ATTRIBUTES) proto_tree_add_text(acemask_tree, tvb, offset, 4, "ACE4_READ_ATTRIBUTES (0x%08x)", @@ -4665,7 +4665,7 @@ dissect_nfs_acemask4(tvbuff_t *tvb, int offset, proto_tree *tree) static int -dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { proto_item* ace_item = NULL; @@ -4675,7 +4675,7 @@ dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 aceflag4; if (tree) { - ace_item = proto_tree_add_text(tree, tvb, offset, 4, + ace_item = proto_tree_add_text(tree, tvb, offset, 4, "ACE"); if (ace_item) @@ -4687,7 +4687,7 @@ dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, aceflag4 = tvb_get_ntohl(tvb, offset); - aceflag_item = proto_tree_add_text(ace_tree, tvb, offset, 4, + aceflag_item = proto_tree_add_text(ace_tree, tvb, offset, 4, "aceflag: 0x%08x", aceflag4); if (aceflag_item) @@ -4697,7 +4697,7 @@ dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (aceflag_tree) { if (aceflag4 & ACE4_FILE_INHERIT_ACE) - proto_tree_add_text(aceflag_tree, tvb, offset, 4, + proto_tree_add_text(aceflag_tree, tvb, offset, 4, "ACE4_FILE_INHERIT_ACE (0x%08x)", ACE4_FILE_INHERIT_ACE); if (aceflag4 & ACE4_DIRECTORY_INHERIT_ACE) @@ -4706,8 +4706,8 @@ dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, ACE4_DIRECTORY_INHERIT_ACE); if (aceflag4 & ACE4_INHERIT_ONLY_ACE) - proto_tree_add_text(aceflag_tree, tvb, offset, 4, - "ACE4_INHERIT_ONLY_ACE (0x%08x)", + proto_tree_add_text(aceflag_tree, tvb, offset, 4, + "ACE4_INHERIT_ONLY_ACE (0x%08x)", ACE4_INHERIT_ONLY_ACE); if (aceflag4 & ACE4_SUCCESSFUL_ACCESS_ACE_FLAG) @@ -4730,7 +4730,7 @@ dissect_nfs_ace4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 4; offset = dissect_nfs_acemask4(tvb, offset, ace_tree); - + offset = dissect_nfs_utf8string(tvb, offset, ace_tree, hf_nfs_who, NULL); } @@ -4789,7 +4789,7 @@ dissect_nfs_fs_locations4(tvbuff_t *tvb, packet_info *pinfo, int offset, offset = dissect_nfs_pathname4(tvb, offset, newftree); - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_nfs_fs_location4); return offset; @@ -4831,7 +4831,7 @@ dissect_nfs_fattr4_fh_expire_type(tvbuff_t *tvb, int offset, proto_tree *tree) expire_type_item = proto_tree_add_text(tree, tvb, offset, 4, "fattr4_fh_expire_type: 0x%08x", expire_type); if (expire_type_item) - expire_type_tree = proto_item_add_subtree(expire_type_item, + expire_type_tree = proto_item_add_subtree(expire_type_item, ett_nfs_fattr4_fh_expire_type); } @@ -4840,7 +4840,7 @@ dissect_nfs_fattr4_fh_expire_type(tvbuff_t *tvb, int offset, proto_tree *tree) if (expire_type == FH4_PERSISTENT) { proto_tree_add_text(expire_type_tree, tvb, offset, 4, "%s", - decode_enumerated_bitfield(expire_type, FH4_PERSISTENT, 8, + decode_enumerated_bitfield(expire_type, FH4_PERSISTENT, 8, nfs4_fattr4_fh_expire_type_names, "%s")); } else @@ -5016,7 +5016,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, attr_vals_offset = offset + 4 + bitmap_len * 4; - bitmap = g_malloc(bitmap_len * sizeof(guint32)); + bitmap = g_malloc(bitmap_len * sizeof(guint32)); if (bitmap == NULL) return offset; for (i = 0; i < bitmap_len; i++) @@ -5038,8 +5038,8 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, if (bitmap[i] & sl) { /* switch label if attribute is recommended vs. mandatory */ - attr_fitem = proto_tree_add_uint(newftree, - (fattr < FATTR4_ACL)? hf_nfs_mand_attr: hf_nfs_recc_attr, + attr_fitem = proto_tree_add_uint(newftree, + (fattr < FATTR4_ACL)? hf_nfs_mand_attr: hf_nfs_recc_attr, tvb, offset, 4, fattr); if (attr_fitem == NULL) break; @@ -5054,11 +5054,11 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, switch(fattr) { case FATTR4_SUPPORTED_ATTRS: - attr_vals_offset = dissect_nfs_attributes(tvb, - attr_vals_offset, pinfo, attr_newftree, + attr_vals_offset = dissect_nfs_attributes(tvb, + attr_vals_offset, pinfo, attr_newftree, FATTR4_BITMAP_ONLY); break; - + case FATTR4_TYPE: attr_vals_offset = dissect_rpc_uint32(tvb, attr_newftree, hf_nfs_ftype4, attr_vals_offset); @@ -5070,7 +5070,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case FATTR4_CHANGE: - attr_vals_offset = dissect_rpc_uint64(tvb, attr_newftree, + attr_vals_offset = dissect_rpc_uint64(tvb, attr_newftree, hf_nfs_changeid4, attr_vals_offset); break; @@ -5081,13 +5081,13 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_LINK_SUPPORT: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_link_support, + attr_newftree, hf_nfs_fattr4_link_support, attr_vals_offset); break; case FATTR4_SYMLINK_SUPPORT: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_symlink_support, + attr_newftree, hf_nfs_fattr4_symlink_support, attr_vals_offset); break; @@ -5103,35 +5103,35 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_UNIQUE_HANDLES: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_unique_handles, + attr_newftree, hf_nfs_fattr4_unique_handles, attr_vals_offset); break; case FATTR4_LEASE_TIME: attr_vals_offset = dissect_rpc_uint32(tvb, - attr_newftree, hf_nfs_fattr4_lease_time, + attr_newftree, hf_nfs_fattr4_lease_time, attr_vals_offset); break; case FATTR4_RDATTR_ERROR: - attr_vals_offset = dissect_nfs_nfsstat4(tvb, + attr_vals_offset = dissect_nfs_nfsstat4(tvb, attr_vals_offset, attr_newftree, NULL); break; case FATTR4_ACL: - attr_vals_offset = dissect_nfs_fattr4_acl(tvb, + attr_vals_offset = dissect_nfs_fattr4_acl(tvb, attr_vals_offset, pinfo, attr_newftree); break; case FATTR4_ACLSUPPORT: attr_vals_offset = dissect_rpc_uint32(tvb, - attr_newftree, hf_nfs_fattr4_aclsupport, + attr_newftree, hf_nfs_fattr4_aclsupport, attr_vals_offset); break; case FATTR4_ARCHIVE: - attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_archive, + attr_vals_offset = dissect_rpc_bool(tvb, + attr_newftree, hf_nfs_fattr4_archive, attr_vals_offset); break; @@ -5142,19 +5142,19 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_CASE_INSENSITIVE: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_case_insensitive, + attr_newftree, hf_nfs_fattr4_case_insensitive, attr_vals_offset); break; case FATTR4_CASE_PRESERVING: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_case_preserving, + attr_newftree, hf_nfs_fattr4_case_preserving, attr_vals_offset); break; case FATTR4_CHOWN_RESTRICTED: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_chown_restricted, + attr_newftree, hf_nfs_fattr4_chown_restricted, attr_vals_offset); break; @@ -5165,7 +5165,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_FILES_AVAIL: attr_vals_offset = dissect_rpc_uint64(tvb, - attr_newftree, hf_nfs_fattr4_files_avail, + attr_newftree, hf_nfs_fattr4_files_avail, attr_vals_offset); break; @@ -5181,13 +5181,13 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_FILES_TOTAL: attr_vals_offset = dissect_rpc_uint64(tvb, - attr_newftree, hf_nfs_fattr4_files_total, + attr_newftree, hf_nfs_fattr4_files_total, attr_vals_offset); break; case FATTR4_FS_LOCATIONS: attr_vals_offset = dissect_nfs_fs_locations4(tvb, pinfo, - attr_vals_offset, attr_newftree, + attr_vals_offset, attr_newftree, "fattr4_fs_locations"); break; @@ -5198,13 +5198,13 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_HOMOGENEOUS: attr_vals_offset = dissect_rpc_bool(tvb, - attr_newftree, hf_nfs_fattr4_homogeneous, + attr_newftree, hf_nfs_fattr4_homogeneous, attr_vals_offset); break; case FATTR4_MAXFILESIZE: attr_vals_offset = dissect_rpc_uint64(tvb, - attr_newftree, hf_nfs_fattr4_maxfilesize, + attr_newftree, hf_nfs_fattr4_maxfilesize, attr_vals_offset); break; @@ -5229,11 +5229,11 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case FATTR4_MIMETYPE: - attr_vals_offset = dissect_nfs_utf8string(tvb, - attr_vals_offset, attr_newftree, + attr_vals_offset = dissect_nfs_utf8string(tvb, + attr_vals_offset, attr_newftree, hf_nfs_fattr4_mimetype, NULL); break; - + case FATTR4_MODE: attr_vals_offset = dissect_nfs_mode4(tvb, attr_vals_offset, attr_newftree, "fattr4_mode"); @@ -5250,15 +5250,15 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case FATTR4_OWNER: - attr_vals_offset = dissect_nfs_utf8string(tvb, - attr_vals_offset, attr_newftree, + attr_vals_offset = dissect_nfs_utf8string(tvb, + attr_vals_offset, attr_newftree, hf_nfs_fattr4_owner, NULL); break; case FATTR4_OWNER_GROUP: - attr_vals_offset = dissect_nfs_utf8string(tvb, - attr_vals_offset, attr_newftree, + attr_vals_offset = dissect_nfs_utf8string(tvb, + attr_vals_offset, attr_newftree, hf_nfs_fattr4_owner_group, NULL); break; @@ -5278,13 +5278,13 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case FATTR4_RAWDEV: - attr_vals_offset = dissect_nfs_specdata4(tvb, + attr_vals_offset = dissect_nfs_specdata4(tvb, attr_vals_offset, attr_newftree); break; case FATTR4_SPACE_AVAIL: attr_vals_offset = dissect_rpc_uint64(tvb, - attr_newftree, hf_nfs_fattr4_space_avail, + attr_newftree, hf_nfs_fattr4_space_avail, attr_vals_offset); break; @@ -5295,7 +5295,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_SPACE_TOTAL: attr_vals_offset = dissect_rpc_uint64(tvb, - attr_newftree, hf_nfs_fattr4_space_total, + attr_newftree, hf_nfs_fattr4_space_total, attr_vals_offset); break; @@ -5303,7 +5303,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, attr_vals_offset = dissect_rpc_uint64(tvb, attr_newftree, hf_nfs_fattr4_space_used, attr_vals_offset); break; - + case FATTR4_SYSTEM: attr_vals_offset = dissect_rpc_bool(tvb, attr_newftree, hf_nfs_fattr4_system, attr_vals_offset); @@ -5321,7 +5321,7 @@ dissect_nfs_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, case FATTR4_TIME_ACCESS_SET: case FATTR4_TIME_MODIFY_SET: - attr_vals_offset = dissect_nfs_settime4(tvb, + attr_vals_offset = dissect_nfs_settime4(tvb, attr_vals_offset, attr_newftree, "settime4"); break; @@ -5357,7 +5357,7 @@ dissect_nfs_fattr4(tvbuff_t *tvb, int offset, packet_info *pinfo, if (newftree == NULL) return offset; - offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, + offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_FULL_DISSECT); offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_attrlist4); @@ -5367,7 +5367,7 @@ dissect_nfs_fattr4(tvbuff_t *tvb, int offset, packet_info *pinfo, static const value_string names_open4_share_access[] = { #define OPEN4_SHARE_ACCESS_READ 0x00000001 - { OPEN4_SHARE_ACCESS_READ, "OPEN4_SHARE_ACCESS_READ" }, + { OPEN4_SHARE_ACCESS_READ, "OPEN4_SHARE_ACCESS_READ" }, #define OPEN4_SHARE_ACCESS_WRITE 0x00000002 { OPEN4_SHARE_ACCESS_WRITE, "OPEN4_SHARE_ACCESS_WRITE" }, #define OPEN4_SHARE_ACCESS_BOTH 0x00000003 @@ -5382,7 +5382,7 @@ dissect_nfs_open4_share_access(tvbuff_t *tvb, int offset, guint share_access; share_access = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint(tree, hf_nfs_open4_share_access, tvb, offset, 4, + proto_tree_add_uint(tree, hf_nfs_open4_share_access, tvb, offset, 4, share_access); offset += 4; @@ -5428,7 +5428,7 @@ static int dissect_nfs_open_claim_delegate_cur4(tvbuff_t *tvb, int offset, proto_tree *tree) { - offset = dissect_rpc_uint64(tvb, tree, + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_stateid4_delegate_stateid, offset); offset = dissect_nfs_utf8string(tvb, offset, tree, hf_nfs_component4, NULL); @@ -5473,7 +5473,7 @@ dissect_nfs_open_claim4(tvbuff_t *tvb, int offset, break; case CLAIM_PREVIOUS: - offset = dissect_rpc_uint32(tvb, newftree, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_delegate_type, offset); break; @@ -5505,7 +5505,7 @@ dissect_nfs_createhow4(tvbuff_t *tvb, int offset, packet_info *pinfo, mode = tvb_get_ntohl(tvb, offset); proto_tree_add_uint(tree, hf_nfs_createmode3, tvb, offset, 4, mode); offset += 4; - + switch(mode) { case UNCHECKED: /* UNCHECKED4 */ @@ -5516,7 +5516,7 @@ dissect_nfs_createhow4(tvbuff_t *tvb, int offset, packet_info *pinfo, case EXCLUSIVE: /* EXCLUSIVE4 */ offset = dissect_rpc_uint64(tvb, tree, hf_nfs_verifier4, offset); break; - + default: break; } @@ -5573,7 +5573,7 @@ dissect_nfs_clientaddr4(tvbuff_t *tvb, int offset, proto_tree *tree) return offset; } - + static int dissect_nfs_cb_client4(tvbuff_t *tvb, int offset, proto_tree *tree) @@ -5585,10 +5585,10 @@ dissect_nfs_cb_client4(tvbuff_t *tvb, int offset, proto_tree *tree) fitem = proto_tree_add_text(tree, tvb, offset, 0, "cb_location"); - if (fitem) + if (fitem) { cb_location = proto_item_add_subtree(fitem, ett_nfs_clientaddr4); - + offset = dissect_nfs_clientaddr4(tvb, offset, cb_location); } @@ -5697,7 +5697,7 @@ gint *nfsv4_operation_ett[] = &ett_nfs_setclientid4 , &ett_nfs_setclientid_confirm4 , &ett_nfs_verify4 , - &ett_nfs_write4 + &ett_nfs_write4 }; static int @@ -5739,11 +5739,11 @@ dissect_nfs_change_info4(tvbuff_t *tvb, int offset, newftree = proto_item_add_subtree(fitem, ett_nfs_change_info4); if (newftree) { - offset = dissect_rpc_bool(tvb, newftree, + offset = dissect_rpc_bool(tvb, newftree, hf_nfs_change_info4_atomic, offset); - offset = dissect_rpc_uint64(tvb, tree, hf_nfs_changeid4_before, + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_changeid4_before, offset); - offset = dissect_rpc_uint64(tvb, tree, hf_nfs_changeid4_after, + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_changeid4_after, offset); } } @@ -5780,13 +5780,13 @@ dissect_nfs_lock4denied(tvbuff_t *tvb, int offset, proto_tree *tree) static const value_string names_open4_result_flags[] = { #define OPEN4_RESULT_MLOCK 0x00000001 - { OPEN4_RESULT_MLOCK, "OPEN4_RESULT_MLOCK" }, + { OPEN4_RESULT_MLOCK, "OPEN4_RESULT_MLOCK" }, #define OPEN4_RESULT_CONFIRM 0x00000002 { OPEN4_RESULT_CONFIRM, "OPEN4_RESULT_CONFIRM" }, { 0, NULL } }; -static int +static int dissect_nfs_open4_rflags(tvbuff_t *tvb, int offset, proto_tree *tree, char *name) { @@ -5803,7 +5803,7 @@ dissect_nfs_open4_rflags(tvbuff_t *tvb, int offset, if (rflags_item) { - rflags_tree = proto_item_add_subtree(rflags_item, + rflags_tree = proto_item_add_subtree(rflags_item, ett_nfs_open4_result_flags); if (rflags_tree) @@ -5818,7 +5818,7 @@ dissect_nfs_open4_rflags(tvbuff_t *tvb, int offset, } } } - + offset += 4; return offset; @@ -5839,7 +5839,7 @@ dissect_nfs_stateid4(tvbuff_t *tvb, int offset, if (fitem) { newftree = proto_item_add_subtree(fitem, ett_nfs_stateid4); if (newftree) { - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset); bytes_left = 12; @@ -5866,7 +5866,7 @@ dissect_nfs_stateid4(tvbuff_t *tvb, int offset, } static int -dissect_nfs_open_read_delegation4(tvbuff_t *tvb, int offset, +dissect_nfs_open_read_delegation4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_nfs_stateid4(tvb, offset, tree); @@ -5906,7 +5906,7 @@ dissect_nfs_space_limit4(tvbuff_t *tvb, int offset, switch(limitby) { case NFS_LIMIT_SIZE: - offset = dissect_rpc_uint64(tvb, tree, hf_nfs_filesize, + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_filesize, offset); break; @@ -5922,7 +5922,7 @@ dissect_nfs_space_limit4(tvbuff_t *tvb, int offset, } static int -dissect_nfs_open_write_delegation4(tvbuff_t *tvb, int offset, +dissect_nfs_open_write_delegation4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_nfs_stateid4(tvb, offset, tree); @@ -5952,7 +5952,7 @@ dissect_nfs_open_delegation4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item *fitem = NULL; delegation_type = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint(tree, hf_nfs_open_delegation_type4, tvb, offset+0, + proto_tree_add_uint(tree, hf_nfs_open_delegation_type4, tvb, offset+0, 4, delegation_type); offset += 4; @@ -5985,9 +5985,9 @@ dissect_nfs_open_delegation4(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs_rpcsec_gss_info(tvbuff_t *tvb, int offset, proto_tree *tree) { - offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_sec_oid4); + offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_sec_oid4); offset = dissect_rpc_uint32(tvb, tree, hf_nfs_qop4, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nfs_secinfo_rpcsec_gss_info_service, offset); return offset; @@ -6020,7 +6020,7 @@ dissect_nfs_locker4(tvbuff_t *tvb, int offset, proto_tree *tree) new_lock_owner = tvb_get_ntohl(tvb, offset); offset = dissect_rpc_bool(tvb, tree, hf_nfs_new_lock_owner, offset); - + if (new_lock_owner) offset = dissect_nfs_open_to_lock_owner4(tvb, offset, tree); else @@ -6039,7 +6039,7 @@ dissect_nfs_client_id4(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 ops, ops_counter; @@ -6050,7 +6050,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, ops = tvb_get_ntohl(tvb, offset+0); - fitem = proto_tree_add_text(tree, tvb, offset, 4, + fitem = proto_tree_add_text(tree, tvb, offset, 4, "Operations (count: %u)", ops); offset += 4; @@ -6064,7 +6064,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, { opcode = tvb_get_ntohl(tvb, offset); - fitem = proto_tree_add_uint(ftree, hf_nfs_argop4, tvb, offset, 4, + fitem = proto_tree_add_uint(ftree, hf_nfs_argop4, tvb, offset, 4, opcode); offset += 4; @@ -6100,16 +6100,16 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, guint create_type; create_type = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_ftype4, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_ftype4, offset); switch(create_type) { case NF4LNK: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_linktext4, NULL); break; - + case NF4BLK: case NF4CHR: offset = dissect_nfs_specdata4(tvb, offset, newftree); @@ -6139,7 +6139,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_GETATTR: - offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, + offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_BITMAP_ONLY); break; @@ -6147,7 +6147,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_LINK: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); break; @@ -6175,7 +6175,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_LOOKUP: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); break; @@ -6187,7 +6187,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_OPEN: - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset); offset = dissect_nfs_open4_share_access(tvb, offset, newftree); offset = dissect_nfs_open4_share_deny(tvb, offset, newftree); @@ -6203,13 +6203,13 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, case NFS4_OP_OPEN_CONFIRM: offset = dissect_nfs_stateid4(tvb, offset, newftree); - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset); break; case NFS4_OP_OPEN_DOWNGRADE: offset = dissect_nfs_stateid4(tvb, offset, newftree); - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset); offset = dissect_nfs_open4_share_access(tvb, offset, newftree); offset = dissect_nfs_open4_share_deny(tvb, offset, newftree); @@ -6236,11 +6236,11 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, offset); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_cookieverf4, offset); - offset = dissect_rpc_uint32(tvb, newftree, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_count4_dircount, offset); offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_count4_maxcount, offset); - offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, + offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_BITMAP_ONLY); break; @@ -6248,27 +6248,27 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_REMOVE: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); break; case NFS4_OP_RENAME: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); break; case NFS4_OP_RENEW: offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); break; - + case NFS4_OP_RESTOREFH: case NFS4_OP_SAVEFH: break; case NFS4_OP_SECINFO: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); break; @@ -6292,16 +6292,16 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, } fitem = proto_tree_add_text(newftree, tvb, offset, 0, "callback"); - if (fitem) + if (fitem) { - callback_tree = proto_item_add_subtree(fitem, + callback_tree = proto_item_add_subtree(fitem, ett_nfs_cb_client4); if (callback_tree) offset = dissect_nfs_cb_client4(tvb, offset, callback_tree); } - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_callback_ident, + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_callback_ident, offset); } break; @@ -6309,7 +6309,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, case NFS4_OP_SETCLIENTID_CONFIRM: offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); break; - + case NFS4_OP_VERIFY: offset = dissect_nfs_fattr4(tvb, offset, pinfo, newftree); break; @@ -6320,7 +6320,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_nfs_stable_how4(tvb, offset, newftree, "stable"); offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs_data); break; - + default: break; } @@ -6330,7 +6330,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_nfs4_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs4_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { offset = dissect_nfs_utf8string(tvb, offset, tree, hf_nfs_tag4, NULL); @@ -6347,13 +6347,13 @@ dissect_nfs_secinfo4_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint flavor; proto_item *fitem; proto_tree *secftree; - + flavor = tvb_get_ntohl(tvb, offset); - fitem = proto_tree_add_uint(tree, hf_nfs_secinfo_flavor, tvb, offset, 4, + fitem = proto_tree_add_uint(tree, hf_nfs_secinfo_flavor, tvb, offset, 4, flavor); offset += 4; - if (fitem) + if (fitem) { switch(flavor) { @@ -6372,7 +6372,7 @@ dissect_nfs_secinfo4_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 ops, ops_counter; @@ -6384,7 +6384,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, ops = tvb_get_ntohl(tvb, offset+0); - fitem = proto_tree_add_text(tree, tvb, offset, 4, + fitem = proto_tree_add_text(tree, tvb, offset, 4, "Operations (count: %u)", ops); offset += 4; @@ -6401,7 +6401,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, /* sanity check for bogus packets */ if (opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_WRITE) break; - fitem = proto_tree_add_uint(ftree, hf_nfs_resop4, tvb, offset, 4, + fitem = proto_tree_add_uint(ftree, hf_nfs_resop4, tvb, offset, 4, opcode); offset += 4; @@ -6415,7 +6415,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status); /* - * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and + * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and * NFS4_OP_SETATTR, all other ops do *not* return data with the * failed status code. */ @@ -6437,12 +6437,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_COMMIT: - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_verifier4, + offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_verifier4, offset); break; case NFS4_OP_CREATE: - offset = dissect_nfs_change_info4(tvb, offset, newftree, + offset = dissect_nfs_change_info4(tvb, offset, newftree, "change_info"); offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_BITMAP_ONLY); @@ -6457,7 +6457,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_LINK: - offset = dissect_nfs_change_info4(tvb, offset, newftree, + offset = dissect_nfs_change_info4(tvb, offset, newftree, "change_info"); break; @@ -6479,11 +6479,11 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, case NFS4_OP_OPEN: offset = dissect_nfs_stateid4(tvb, offset, newftree); - offset = dissect_nfs_change_info4(tvb, offset, newftree, + offset = dissect_nfs_change_info4(tvb, offset, newftree, "change_info"); - offset = dissect_nfs_open4_rflags(tvb, offset, newftree, + offset = dissect_nfs_open4_rflags(tvb, offset, newftree, "result_flags"); - offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, + offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_BITMAP_ONLY); offset = dissect_nfs_open_delegation4(tvb, offset, pinfo, newftree); break; @@ -6504,35 +6504,35 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, break; case NFS4_OP_READLINK: - offset = dissect_nfs_utf8string(tvb, offset, newftree, + offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_linktext4, NULL); break; case NFS4_OP_REMOVE: - offset = dissect_nfs_change_info4(tvb, offset, newftree, + offset = dissect_nfs_change_info4(tvb, offset, newftree, "change_info"); break; case NFS4_OP_RENAME: - offset = dissect_nfs_change_info4(tvb, offset, newftree, + offset = dissect_nfs_change_info4(tvb, offset, newftree, "source_cinfo"); offset = dissect_nfs_change_info4(tvb, offset, newftree, "target_cinfo"); break; case NFS4_OP_SECINFO: - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_nfs_secinfo4_res); break; case NFS4_OP_SETATTR: - offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, + offset = dissect_nfs_attributes(tvb, offset, pinfo, newftree, FATTR4_BITMAP_ONLY); break; case NFS4_OP_SETCLIENTID: if (status == NFS4_OK) - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, + offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4, offset); else if (status == NFS4ERR_CLID_INUSE) @@ -6542,9 +6542,9 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, case NFS4_OP_WRITE: offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_count4, offset); - offset = dissect_nfs_stable_how4(tvb, offset, newftree, + offset = dissect_nfs_stable_how4(tvb, offset, newftree, "committed"); - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_verifier4, + offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_verifier4, offset); break; @@ -6557,7 +6557,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_nfs4_compound_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +dissect_nfs4_compound_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) { guint32 status; @@ -6875,13 +6875,13 @@ proto_register_nfs(void) "no_trunc", "nfs.pathconf.no_trunc", FT_BOOLEAN, BASE_NONE, &yesno, 0, "No long file name truncation", HFILL }}, { &hf_nfs_pathconf_chown_restricted, { - "chown_restricted", "nfs.pathconf.chown_restricted", FT_BOOLEAN, + "chown_restricted", "nfs.pathconf.chown_restricted", FT_BOOLEAN, BASE_NONE, &yesno, 0, "chown is restricted to root", HFILL }}, { &hf_nfs_pathconf_case_insensitive, { - "case_insensitive", "nfs.pathconf.case_insensitive", FT_BOOLEAN, + "case_insensitive", "nfs.pathconf.case_insensitive", FT_BOOLEAN, BASE_NONE, &yesno, 0, "file names are treated case insensitive", HFILL }}, { &hf_nfs_pathconf_case_preserving, { - "case_preserving", "nfs.pathconf.case_preserving", FT_BOOLEAN, + "case_preserving", "nfs.pathconf.case_preserving", FT_BOOLEAN, BASE_NONE, &yesno, 0, "file name cases are preserved", HFILL }}, { &hf_nfs_fattr_type, { @@ -7111,11 +7111,11 @@ proto_register_nfs(void) NULL, 0, "attr_vals", HFILL }}, { &hf_nfs_fattr4_link_support, { - "fattr4_link_support", "nfs.fattr4_link_support", FT_BOOLEAN, + "fattr4_link_support", "nfs.fattr4_link_support", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_link_support", HFILL }}, { &hf_nfs_fattr4_symlink_support, { - "fattr4_symlink_support", "nfs.fattr4_symlink_support", FT_BOOLEAN, + "fattr4_symlink_support", "nfs.fattr4_symlink_support", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_symlink_support", HFILL }}, { &hf_nfs_fattr4_named_attr, { @@ -7123,35 +7123,35 @@ proto_register_nfs(void) &yesno, 0, "nfs.fattr4_named_attr", HFILL }}, { &hf_nfs_fattr4_unique_handles, { - "fattr4_unique_handles", "nfs.fattr4_unique_handles", FT_BOOLEAN, + "fattr4_unique_handles", "nfs.fattr4_unique_handles", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_unique_handles", HFILL }}, { &hf_nfs_fattr4_archive, { - "fattr4_archive", "nfs.fattr4_archive", FT_BOOLEAN, + "fattr4_archive", "nfs.fattr4_archive", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_archive", HFILL }}, { &hf_nfs_fattr4_cansettime, { - "fattr4_cansettime", "nfs.fattr4_cansettime", FT_BOOLEAN, + "fattr4_cansettime", "nfs.fattr4_cansettime", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_cansettime", HFILL }}, { &hf_nfs_fattr4_case_insensitive, { - "fattr4_case_insensitive", "nfs.fattr4_case_insensitive", FT_BOOLEAN, + "fattr4_case_insensitive", "nfs.fattr4_case_insensitive", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_case_insensitive", HFILL }}, { &hf_nfs_fattr4_case_preserving, { - "fattr4_case_preserving", "nfs.fattr4_case_preserving", FT_BOOLEAN, + "fattr4_case_preserving", "nfs.fattr4_case_preserving", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_case_preserving", HFILL }}, { &hf_nfs_fattr4_chown_restricted, { - "fattr4_chown_restricted", "nfs.fattr4_chown_restricted", FT_BOOLEAN, + "fattr4_chown_restricted", "nfs.fattr4_chown_restricted", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_chown_restricted", HFILL }}, { &hf_nfs_fattr4_hidden, { - "fattr4_hidden", "nfs.fattr4_hidden", FT_BOOLEAN, + "fattr4_hidden", "nfs.fattr4_hidden", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_hidden", HFILL }}, { &hf_nfs_fattr4_homogeneous, { - "fattr4_homogeneous", "nfs.fattr4_homogeneous", FT_BOOLEAN, + "fattr4_homogeneous", "nfs.fattr4_homogeneous", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_homogeneous", HFILL }}, { &hf_nfs_fattr4_mimetype, { @@ -7159,11 +7159,11 @@ proto_register_nfs(void) NULL, 0, "nfs.fattr4_mimetype", HFILL }}, { &hf_nfs_fattr4_no_trunc, { - "fattr4_no_trunc", "nfs.fattr4_no_trunc", FT_BOOLEAN, + "fattr4_no_trunc", "nfs.fattr4_no_trunc", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_no_trunc", HFILL }}, { &hf_nfs_fattr4_system, { - "fattr4_system", "nfs.fattr4_system", FT_BOOLEAN, + "fattr4_system", "nfs.fattr4_system", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.fattr4_system", HFILL }}, { &hf_nfs_who, { @@ -7211,7 +7211,7 @@ proto_register_nfs(void) VALS(names_nfs_lock_type4), 0, "nfs.locktype4", HFILL }}, { &hf_nfs_reclaim4, { - "reclaim", "nfs.reclaim4", FT_BOOLEAN, + "reclaim", "nfs.reclaim4", FT_BOOLEAN, BASE_NONE, &yesno, 0, "Reclaim", HFILL }}, { &hf_nfs_length4, { @@ -7383,7 +7383,7 @@ proto_register_nfs(void) NULL, 0, "nfs.cb_program", HFILL }}, { &hf_nfs_recall4, { - "recall", "nfs.recall4", FT_BOOLEAN, + "recall", "nfs.recall4", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.recall4", HFILL }}, { &hf_nfs_filesize, { @@ -7479,15 +7479,15 @@ proto_register_nfs(void) BASE_DEC, VALS(rpc_authgss_svc), 0, "service", HFILL }}, { &hf_nfs_attrdircreate, { - "attribute dir create", "nfs.openattr4.createdir", FT_BOOLEAN, + "attribute dir create", "nfs.openattr4.createdir", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.openattr4.createdir", HFILL }}, { &hf_nfs_new_lock_owner, { - "new lock owner?", "nfs.lock.locker.new_lock_owner", FT_BOOLEAN, + "new lock owner?", "nfs.lock.locker.new_lock_owner", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.lock.locker.new_lock_owner", HFILL }}, { &hf_nfs_lock4_reclaim, { - "reclaim?", "nfs.lock.reclaim", FT_BOOLEAN, + "reclaim?", "nfs.lock.reclaim", FT_BOOLEAN, BASE_NONE, &yesno, 0, "nfs.lock.reclaim", HFILL }}, { &hf_nfs_sec_oid4, { @@ -7495,7 +7495,7 @@ proto_register_nfs(void) BASE_DEC, NULL, 0, "oid", HFILL }}, { &hf_nfs_qop4, { - "qop", "nfs.secinfo.flavor_info.rpcsec_gss_info.qop", FT_UINT32, + "qop", "nfs.secinfo.flavor_info.rpcsec_gss_info.qop", FT_UINT32, BASE_DEC, NULL, 0, "qop", HFILL }}, { &hf_nfs_client_id4_id, { @@ -7515,7 +7515,7 @@ proto_register_nfs(void) NULL, 0, "Callback Identifier", HFILL }}, { &hf_nfs_r_netid, { - "r_netid", "nfs.r_netid", FT_BYTES, BASE_DEC, NULL, 0, + "r_netid", "nfs.r_netid", FT_BYTES, BASE_DEC, NULL, 0, "r_netid", HFILL }}, { &hf_nfs_r_addr, { diff --git a/packet-nisplus.c b/packet-nisplus.c index 033246bcaf..827a4a6c12 100644 --- a/packet-nisplus.c +++ b/packet-nisplus.c @@ -1,7 +1,7 @@ /* packet-nisplus.c * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-nisplus.c,v 1.12 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-nisplus.c,v 1.13 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -277,7 +277,7 @@ dissect_nisplus_time(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) static int dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_group_name, offset, NULL); return offset; @@ -296,7 +296,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_group_flags, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -355,7 +355,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_col_name, offset, NULL); @@ -364,19 +364,19 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre FALSE); mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_table_col_mask); mask = tvb_get_ntohl(tvb, offset); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_encrypted, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_encrypted, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_xdr, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_xdr, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_searchable, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_searchable, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_casesensitive, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_casesensitive, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_modified, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_modified, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_asn, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_asn, tvb, offset, 4, mask); offset += 4; @@ -399,19 +399,19 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_type, offset, NULL); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_table_maxcol, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_table_sep, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_table, hf_nisplus_table_cols); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_path, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -446,7 +446,7 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre proto_tree_add_boolean(mask_tree, hf_nisplus_entry_mask_asn, tvb, offset, 4, mask); offset += 4; - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_entry_val, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -465,7 +465,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_entry_type, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -487,10 +487,10 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_attr_name, offset, NULL); - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_attr_val, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -509,7 +509,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -517,7 +517,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_object_name, offset, NULL); - + proto_item_set_len(lock_item, offset-old_offset); return offset; } @@ -535,13 +535,13 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_uaddr, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_family, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_proto, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -561,16 +561,16 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_server_name, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_endpoint, hf_nisplus_endpoints); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_key_type, offset); - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_key_data, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -592,7 +592,7 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ offset = dissect_access_rights(tvb, offset, lock_tree); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -614,13 +614,13 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_directory_name, offset, NULL); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_directory_type, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_directory_server, hf_nisplus_servers); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_directory_ttl, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -642,10 +642,10 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree) lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_object_ctime); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_object_mtime); proto_item_set_len(lock_item, offset-old_offset); @@ -681,11 +681,11 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_access_rights(tvb, offset, lock_tree); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_ttl, offset); type = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); switch (type) { case NIS_DIRECTORY_OBJ: @@ -704,7 +704,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_link_obj(tvb, offset, pinfo, lock_tree); break; case NIS_PRIVATE_OBJ: - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_object_private, offset); break; case NIS_NO_OBJ: @@ -719,18 +719,18 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree return offset; } /* xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - end of nis object, thats right, all this was the definition of + end of nis object, thats right, all this was the definition of ONE SINGLE struct. -*/ +*/ static int dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_nisplus_object, hf_nisplus_object); @@ -740,13 +740,13 @@ dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_attr, hf_nisplus_attrs_array); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_ib_flags, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -755,10 +755,10 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_directory_server, hf_nisplus_cbservers); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_ib_bufsize, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); return offset; @@ -767,15 +767,15 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_dirname, offset, NULL); - - offset = dissect_rpc_string(tvb, tree, + + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_requester, offset, NULL); return offset; } - + static int dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { @@ -788,16 +788,16 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_tag_type, offset); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_tag_val, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); return offset; } - + static int dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -810,10 +810,10 @@ dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre static int dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_dump_dir, offset, NULL); - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_dump_time); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -825,7 +825,7 @@ dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_dummy, offset); return offset; @@ -834,19 +834,19 @@ dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr static int dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + return offset; } static int dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_ping_dir, offset, NULL); - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_ping_time); return offset; @@ -956,25 +956,25 @@ static const value_string nis_error[] = { static int dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_nisplus_object, hf_nisplus_object); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_zticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_dticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_aticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cticks, offset); return offset; @@ -983,16 +983,16 @@ dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_dirname, offset, NULL); - - offset = dissect_rpc_data(tvb, tree, + + offset = dissect_rpc_data(tvb, tree, hf_nisplus_dir_data, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_signature, offset); return offset; @@ -1031,16 +1031,16 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_log_time); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_log_type, offset); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_log_principal, offset, NULL); - - offset = dissect_rpc_string(tvb, lock_tree, + + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_directory_name, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -1055,10 +1055,10 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -1079,7 +1079,7 @@ dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto static int dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_log_time); return offset; @@ -1088,13 +1088,13 @@ dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre static int dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_status, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_zticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_dticks, offset); return offset; @@ -1103,7 +1103,7 @@ dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); return offset; diff --git a/packet-nisplus.h b/packet-nisplus.h index 01f4c8d26a..8bee35a213 100644 --- a/packet-nisplus.h +++ b/packet-nisplus.h @@ -1,22 +1,22 @@ /* packet-nisplus.h * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-nisplus.h,v 1.3 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-nisplus.h,v 1.4 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-nlm.c b/packet-nlm.c index 17154de517..5cc8fadbaf 100644 --- a/packet-nlm.c +++ b/packet-nlm.c @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c,v 1.28 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-nlm.c,v 1.29 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,7 +89,7 @@ static gint ett_nlm_lock = -1; -/* +/* * stuff to match MSG and RES packets for async NLM */ @@ -97,9 +97,9 @@ static gboolean nlm_match_msgres = FALSE; static GHashTable *nlm_msg_res_unmatched = NULL; static GHashTable *nlm_msg_res_matched = NULL; -/* XXX when matching the packets we should really check the conversation (only address +/* XXX when matching the packets we should really check the conversation (only address NOT ports) and command type as well. I am lazy and thinks the cookie itself is - good enough for now + good enough for now */ typedef struct _nlm_msg_res_unmatched_data { int req_frame; @@ -235,7 +235,7 @@ nlm_match_fhandle_reply(packet_info *pinfo, proto_tree *tree) if(md && md->rep_frame){ nfs_fhandle_data_t *fhd; fhd=(nfs_fhandle_data_t *)g_hash_table_lookup( - nfs_fhandle_frame_table, + nfs_fhandle_frame_table, (gconstpointer)md->req_frame); if(fhd){ dissect_fhandle_hidden(pinfo, @@ -252,7 +252,7 @@ nlm_match_fhandle_request(packet_info *pinfo, proto_tree *tree) if(md && md->rep_frame){ nfs_fhandle_data_t *fhd; fhd=(nfs_fhandle_data_t *)g_hash_table_lookup( - nfs_fhandle_frame_table, + nfs_fhandle_frame_table, (gconstpointer)md->rep_frame); if(fhd){ dissect_fhandle_hidden(pinfo, @@ -429,14 +429,14 @@ dissect_nlm_test(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { nlm_print_msgres_request(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_request(pinfo, tree); } } } - + offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset); dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset); offset += 4; @@ -456,14 +456,14 @@ dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { nlm_print_msgres_request(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_request(pinfo, tree); } } } - + offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset); offset = dissect_rpc_bool(tvb, tree, hf_nlm_block, offset); offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset); @@ -485,7 +485,7 @@ dissect_nlm_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { nlm_print_msgres_request(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_request(pinfo, tree); @@ -512,14 +512,14 @@ dissect_nlm_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { nlm_print_msgres_request(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_request(pinfo, tree); } } } - + offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset); offset = dissect_lock(tvb, pinfo, tree, version, offset); return offset; @@ -537,7 +537,7 @@ dissect_nlm_granted(tvbuff_t *tvb, int offset, packet_info *pinfo, } else { nlm_print_msgres_request(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_request(pinfo, tree); @@ -567,7 +567,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } else { nlm_print_msgres_reply(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_reply(pinfo, tree); @@ -581,7 +581,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb, offset, -1, FALSE); if (lock_item) - lock_tree = proto_item_add_subtree(lock_item, + lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); } @@ -597,7 +597,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, lock_item = proto_tree_add_item(lock_tree, hf_nlm_holder, tvb, offset, -1, FALSE); if (lock_item) - lock_tree = proto_item_add_subtree(lock_item, + lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); } @@ -638,13 +638,13 @@ dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo, lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb, offset, -1, FALSE); if (lock_item) - lock_tree = proto_item_add_subtree(lock_item, + lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); } offset = dissect_rpc_string(tvb,lock_tree, hf_nlm_lock_caller_name, offset, NULL); - + offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree, "fh"); offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner, offset); @@ -699,7 +699,7 @@ dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } else { nlm_print_msgres_reply(pinfo, tree, tvb); } - /* for the fhandle matching that finds both request and + /* for the fhandle matching that finds both request and response packet */ if(nfs_fhandle_reqrep_matching){ nlm_match_fhandle_reply(pinfo, tree); @@ -850,11 +850,11 @@ dissect_nlm4_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NULL as function pointer means: type of arguments is "void". */ /* NLM protocol version 1 */ static const vsff nlm1_proc[] = { - { NLM_NULL, "NULL", + { NLM_NULL, "NULL", NULL, NULL }, { NLM_TEST, "TEST", dissect_nlm1_test, dissect_nlm1_test_res }, - { NLM_LOCK, "LOCK", + { NLM_LOCK, "LOCK", dissect_nlm1_lock, dissect_nlm_gen_reply }, { NLM_CANCEL, "CANCEL", dissect_nlm1_cancel, dissect_nlm_gen_reply }, @@ -868,19 +868,19 @@ static const vsff nlm1_proc[] = { dissect_nlm1_lock, NULL }, { NLM_CANCEL_MSG, "CANCEL_MSG", dissect_nlm1_cancel, NULL }, - { NLM_UNLOCK_MSG, "UNLOCK_MSG", + { NLM_UNLOCK_MSG, "UNLOCK_MSG", dissect_nlm1_unlock, NULL }, { NLM_GRANTED_MSG, "GRANTED_MSG", dissect_nlm1_granted, NULL }, { NLM_TEST_RES, "TEST_RES", dissect_nlm1_test_res, NULL }, - { NLM_LOCK_RES, "LOCK_RES", + { NLM_LOCK_RES, "LOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_CANCEL_RES, "CANCEL_RES", + { NLM_CANCEL_RES, "CANCEL_RES", dissect_nlm_gen_reply, NULL }, - { NLM_UNLOCK_RES, "UNLOCK_RES", + { NLM_UNLOCK_RES, "UNLOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_GRANTED_RES, "GRANTED_RES", + { NLM_GRANTED_RES, "GRANTED_RES", dissect_nlm_gen_reply, NULL }, { 0, NULL, NULL, NULL } @@ -889,11 +889,11 @@ static const vsff nlm1_proc[] = { /* NLM protocol version 2 */ static const vsff nlm2_proc[] = { - { NLM_NULL, "NULL", + { NLM_NULL, "NULL", NULL, NULL }, { NLM_TEST, "TEST", dissect_nlm1_test, dissect_nlm1_test_res }, - { NLM_LOCK, "LOCK", + { NLM_LOCK, "LOCK", dissect_nlm1_lock, dissect_nlm_gen_reply }, { NLM_CANCEL, "CANCEL", dissect_nlm1_cancel, dissect_nlm_gen_reply }, @@ -907,19 +907,19 @@ static const vsff nlm2_proc[] = { dissect_nlm1_lock, NULL }, { NLM_CANCEL_MSG, "CANCEL_MSG", dissect_nlm1_cancel, NULL }, - { NLM_UNLOCK_MSG, "UNLOCK_MSG", + { NLM_UNLOCK_MSG, "UNLOCK_MSG", dissect_nlm1_unlock, NULL }, { NLM_GRANTED_MSG, "GRANTED_MSG", dissect_nlm1_granted, NULL }, { NLM_TEST_RES, "TEST_RES", dissect_nlm1_test_res, NULL }, - { NLM_LOCK_RES, "LOCK_RES", + { NLM_LOCK_RES, "LOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_CANCEL_RES, "CANCEL_RES", + { NLM_CANCEL_RES, "CANCEL_RES", dissect_nlm_gen_reply, NULL }, - { NLM_UNLOCK_RES, "UNLOCK_RES", + { NLM_UNLOCK_RES, "UNLOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_GRANTED_RES, "GRANTED_RES", + { NLM_GRANTED_RES, "GRANTED_RES", dissect_nlm_gen_reply, NULL }, { 0, NULL, NULL, NULL } @@ -928,11 +928,11 @@ static const vsff nlm2_proc[] = { /* NLM protocol version 3 */ static const vsff nlm3_proc[] = { - { NLM_NULL, "NULL", + { NLM_NULL, "NULL", NULL, NULL }, { NLM_TEST, "TEST", dissect_nlm1_test, dissect_nlm1_test_res }, - { NLM_LOCK, "LOCK", + { NLM_LOCK, "LOCK", dissect_nlm1_lock, dissect_nlm_gen_reply }, { NLM_CANCEL, "CANCEL", dissect_nlm1_cancel, dissect_nlm_gen_reply }, @@ -946,27 +946,27 @@ static const vsff nlm3_proc[] = { dissect_nlm1_lock, NULL }, { NLM_CANCEL_MSG, "CANCEL_MSG", dissect_nlm1_cancel, NULL }, - { NLM_UNLOCK_MSG, "UNLOCK_MSG", + { NLM_UNLOCK_MSG, "UNLOCK_MSG", dissect_nlm1_unlock, NULL }, { NLM_GRANTED_MSG, "GRANTED_MSG", dissect_nlm1_granted, NULL }, { NLM_TEST_RES, "TEST_RES", dissect_nlm1_test_res, NULL }, - { NLM_LOCK_RES, "LOCK_RES", + { NLM_LOCK_RES, "LOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_CANCEL_RES, "CANCEL_RES", + { NLM_CANCEL_RES, "CANCEL_RES", dissect_nlm_gen_reply, NULL }, - { NLM_UNLOCK_RES, "UNLOCK_RES", + { NLM_UNLOCK_RES, "UNLOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_GRANTED_RES, "GRANTED_RES", + { NLM_GRANTED_RES, "GRANTED_RES", dissect_nlm_gen_reply, NULL }, - { NLM_SHARE, "SHARE", + { NLM_SHARE, "SHARE", dissect_nlm3_share, dissect_nlm3_shareres }, - { NLM_UNSHARE, "UNSHARE", + { NLM_UNSHARE, "UNSHARE", dissect_nlm3_share, dissect_nlm3_shareres }, - { NLM_NM_LOCK, "NM_LOCK", + { NLM_NM_LOCK, "NM_LOCK", dissect_nlm1_lock, dissect_nlm_gen_reply }, - { NLM_FREE_ALL, "FREE_ALL", + { NLM_FREE_ALL, "FREE_ALL", dissect_nlm3_freeall, NULL }, { 0, NULL, NULL, NULL } @@ -976,43 +976,43 @@ static const vsff nlm3_proc[] = { /* NLM protocol version 4 */ static const vsff nlm4_proc[] = { - { NLM_NULL, "NULL", + { NLM_NULL, "NULL", NULL, NULL }, - { NLM_TEST, "TEST", + { NLM_TEST, "TEST", dissect_nlm4_test, dissect_nlm4_test_res }, - { NLM_LOCK, "LOCK", + { NLM_LOCK, "LOCK", dissect_nlm4_lock, dissect_nlm_gen_reply }, - { NLM_CANCEL, "CANCEL", + { NLM_CANCEL, "CANCEL", dissect_nlm4_cancel, dissect_nlm_gen_reply }, - { NLM_UNLOCK, "UNLOCK", + { NLM_UNLOCK, "UNLOCK", dissect_nlm4_unlock, dissect_nlm_gen_reply }, - { NLM_GRANTED, "GRANTED", + { NLM_GRANTED, "GRANTED", dissect_nlm4_granted, dissect_nlm_gen_reply }, - { NLM_TEST_MSG, "TEST_MSG", + { NLM_TEST_MSG, "TEST_MSG", dissect_nlm4_test, NULL }, - { NLM_LOCK_MSG, "LOCK_MSG", + { NLM_LOCK_MSG, "LOCK_MSG", dissect_nlm4_lock, NULL }, - { NLM_CANCEL_MSG, "CANCEL_MSG", + { NLM_CANCEL_MSG, "CANCEL_MSG", dissect_nlm4_cancel, NULL }, - { NLM_UNLOCK_MSG, "UNLOCK_MSG", + { NLM_UNLOCK_MSG, "UNLOCK_MSG", dissect_nlm4_unlock, NULL }, - { NLM_GRANTED_MSG, "GRANTED_MSG", + { NLM_GRANTED_MSG, "GRANTED_MSG", dissect_nlm4_granted, NULL }, { NLM_TEST_RES, "TEST_RES", dissect_nlm4_test_res, NULL }, - { NLM_LOCK_RES, "LOCK_RES", + { NLM_LOCK_RES, "LOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_CANCEL_RES, "CANCEL_RES", + { NLM_CANCEL_RES, "CANCEL_RES", dissect_nlm_gen_reply, NULL }, - { NLM_UNLOCK_RES, "UNLOCK_RES", + { NLM_UNLOCK_RES, "UNLOCK_RES", dissect_nlm_gen_reply, NULL }, - { NLM_GRANTED_RES, "GRANTED_RES", + { NLM_GRANTED_RES, "GRANTED_RES", dissect_nlm_gen_reply, NULL }, { NLM_SHARE, "SHARE", dissect_nlm4_share, dissect_nlm4_shareres }, { NLM_UNSHARE, "UNSHARE", dissect_nlm4_share, dissect_nlm4_shareres }, - { NLM_NM_LOCK, "NM_LOCK", + { NLM_NM_LOCK, "NM_LOCK", dissect_nlm4_lock, dissect_nlm_gen_reply }, { NLM_FREE_ALL, "FREE_ALL", dissect_nlm4_freeall, NULL }, diff --git a/packet-nntp.c b/packet-nntp.c index f492f5791f..1311546d87 100644 --- a/packet-nntp.c +++ b/packet-nntp.c @@ -2,7 +2,7 @@ * Routines for nntp packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-nntp.c,v 1.26 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-nntp.c,v 1.27 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -132,7 +132,7 @@ proto_register_nntp(void) &ett_nntp, }; - proto_nntp = proto_register_protocol("Network News Transfer Protocol", + proto_nntp = proto_register_protocol("Network News Transfer Protocol", "NNTP", "nntp"); proto_register_field_array(proto_nntp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/packet-ntlmssp.c b/packet-ntlmssp.c index f966016898..83b23b0694 100644 --- a/packet-ntlmssp.c +++ b/packet-ntlmssp.c @@ -2,22 +2,22 @@ * Routines for NTLM Secure Service Provider * Devin Heitmueller <dheitmueller@netilla.com> * - * $Id: packet-ntlmssp.c,v 1.8 2002/08/21 21:25:23 tpot Exp $ + * $Id: packet-ntlmssp.c,v 1.9 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -47,8 +47,8 @@ static const value_string ntlmssp_message_types[] = { { 0, NULL } }; -/* - * NTLMSSP negotiation flags +/* + * NTLMSSP negotiation flags * Taken from Samba */ #define NTLMSSP_NEGOTIATE_UNICODE 0x00000001 @@ -162,7 +162,7 @@ static gint ett_ntlmssp = -1; static gint ett_ntlmssp_negotiate_flags = -1; static int -dissect_ntlmssp_negotiate_flags (tvbuff_t *tvb, int offset, +dissect_ntlmssp_negotiate_flags (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree, guint32 negotiate_flags) { @@ -170,115 +170,115 @@ dissect_ntlmssp_negotiate_flags (tvbuff_t *tvb, int offset, proto_item *tf = NULL; if (ntlmssp_tree) { - tf = proto_tree_add_uint (ntlmssp_tree, - hf_ntlmssp_negotiate_flags, + tf = proto_tree_add_uint (ntlmssp_tree, + hf_ntlmssp_negotiate_flags, tvb, offset, 4, negotiate_flags); negotiate_flags_tree = proto_item_add_subtree (tf, ett_ntlmssp_negotiate_flags); } - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_80000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_80000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_40000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_40000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_20000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_20000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_10000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_10000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_8000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_8000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_4000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_4000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_2000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_2000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_1000000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_1000000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_800000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_800000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_400000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_400000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_200000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_200000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_100000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_100000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_80000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_80000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_40000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_40000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_20000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_20000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_10000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_10000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_8000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_8000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_4000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_4000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_2000, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_2000, tvb, offset, 4, negotiate_flags); proto_tree_add_boolean (negotiate_flags_tree, hf_ntlmssp_negotiate_flags_1000, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_800, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_800, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_400, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_400, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_200, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_200, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_100, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_100, tvb, offset, 4, negotiate_flags); proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_80, + hf_ntlmssp_negotiate_flags_80, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_40, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_40, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_20, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_20, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, + proto_tree_add_boolean (negotiate_flags_tree, hf_ntlmssp_negotiate_flags_10, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_08, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_08, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_04, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_04, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_02, + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_02, + tvb, offset, 4, negotiate_flags); + proto_tree_add_boolean (negotiate_flags_tree, + hf_ntlmssp_negotiate_flags_01, tvb, offset, 4, negotiate_flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_ntlmssp_negotiate_flags_01, - tvb, offset, 4, negotiate_flags); return (offset + 4); } static int -dissect_ntlmssp_negotiate (tvbuff_t *tvb, int offset, +dissect_ntlmssp_negotiate (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) { guint32 negotiate_flags; @@ -365,7 +365,7 @@ dissect_ntlmssp_challenge (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) hf_ntlmssp_ntlm_challenge, tvb, offset, 8, FALSE); offset += 8; - + /* Reserved (function not completely known) */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_reserved, tvb, offset, 8, FALSE); @@ -506,7 +506,7 @@ dissect_ntlmssp_auth (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) return offset; } - proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_domain, tvb, + proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_domain, tvb, offset, result_length, domain); offset += domain_length; } @@ -522,7 +522,7 @@ dissect_ntlmssp_auth (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) return offset; } - proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_username, tvb, + proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_username, tvb, offset, result_length, username); offset += username_length; } @@ -538,7 +538,7 @@ dissect_ntlmssp_auth (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) return offset; } - proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_hostname, tvb, + proto_tree_add_string(ntlmssp_tree, hf_ntlmssp_auth_hostname, tvb, offset, result_length, hostname); offset += hostname_length; } @@ -551,12 +551,12 @@ dissect_ntlmssp_auth (tvbuff_t *tvb, int offset, proto_tree *ntlmssp_tree) /* NTLM Response */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth_ntresponse, tvb, offset, ntresponse_length, FALSE); - offset += ntresponse_length; + offset += ntresponse_length; /* Unknown1 */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth_unknown1, tvb, offset, unknown1_length, FALSE); - offset += unknown1_length; + offset += unknown1_length; return offset; } @@ -572,19 +572,19 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) /* Compute the total size of the data to be parsed */ payloadsize = tvb_length_remaining(tvb, 0); - + /* Setup a new tree for the NTLMSSP payload */ if (tree) { - tf = proto_tree_add_item (tree, + tf = proto_tree_add_item (tree, hf_ntlmssp, tvb, offset, payloadsize, FALSE); - - ntlmssp_tree = proto_item_add_subtree (tf, + + ntlmssp_tree = proto_item_add_subtree (tf, ett_ntlmssp); } - + /* NTLMSSP constant */ - proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth, + proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth, tvb, offset, 8, FALSE); offset += 8; @@ -611,8 +611,8 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) default: /* Unrecognized message type */ - proto_tree_add_text (ntlmssp_tree, tvb, offset, - (payloadsize - 12), + proto_tree_add_text (ntlmssp_tree, tvb, offset, + (payloadsize - 12), "Unrecognized NTLMSSP Message"); break; } @@ -625,17 +625,17 @@ proto_register_ntlmssp(void) static hf_register_info hf[] = { { &hf_ntlmssp, { "NTLMSSP", "ntlmssp", FT_NONE, BASE_NONE, NULL, 0x0, "NTLMSSP", HFILL }}, - - { &hf_ntlmssp_auth, + + { &hf_ntlmssp_auth, { "NTLMSSP identifier", "ntlmssp.identifier", FT_STRING, BASE_NONE, NULL, 0x0, "NTLMSSP Identifier", HFILL }}, - + { &hf_ntlmssp_message_type, { "NTLM Message Type", "ntlmssp.messagetype", FT_UINT32, BASE_HEX, VALS(ntlmssp_message_types), 0x0, "", HFILL }}, - + { &hf_ntlmssp_negotiate_flags, { "Flags", "dcerpc.negotiateflags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_ntlmssp_negotiate_flags_01, - + { "Negotiate UNICODE", "ntlmssp.negotiateunicode", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_UNICODE, "", HFILL }}, { &hf_ntlmssp_negotiate_flags_02, { "Negotiate OEM", "ntlmssp.negotiateoem", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM, "", HFILL }}, @@ -786,6 +786,6 @@ proto_register_ntlmssp(void) ); proto_register_field_array (proto_ntlmssp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + register_dissector("ntlmssp", dissect_ntlmssp, proto_ntlmssp); } diff --git a/packet-ntp.c b/packet-ntp.c index 4ca885e1f2..6524f1f03f 100644 --- a/packet-ntp.c +++ b/packet-ntp.c @@ -2,24 +2,24 @@ * Routines for NTP packet dissection * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-ntp.c,v 1.36 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-ntp.c,v 1.37 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -239,7 +239,7 @@ ntp_fmt_ts(const guint8 *reftime, char* buff) } return buff; } - + /* dissect_ntp - dissects NTP packet data * tvb - tvbuff for packet data (IN) * pinfo - packet info @@ -310,7 +310,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ppoll = tvb_get_guint8(tvb, 2); proto_tree_add_uint_format(ntp_tree, hf_ntp_ppoll, tvb, 2, 1, ppoll, - (((ppoll >= 4) && (ppoll <= 16)) ? + (((ppoll >= 4) && (ppoll <= 16)) ? "Peer Polling Interval: %u (%u sec)" : "Peer Polling Interval: invalid (%u)"), ppoll, @@ -384,7 +384,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reftime = tvb_get_ptr(tvb, 16, 8); proto_tree_add_bytes_format(ntp_tree, hf_ntp_reftime, tvb, 16, 8, reftime, - "Reference Clock Update Time: %s", + "Reference Clock Update Time: %s", ntp_fmt_ts(reftime, buff)); /* Originate Timestamp: This is the time at which the request departed @@ -393,7 +393,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) org = tvb_get_ptr(tvb, 24, 8); proto_tree_add_bytes_format(ntp_tree, hf_ntp_org, tvb, 24, 8, org, - "Originate Time Stamp: %s", + "Originate Time Stamp: %s", ntp_fmt_ts(org, buff)); /* Receive Timestamp: This is the time at which the request arrived at * the server. @@ -401,7 +401,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rec = tvb_get_ptr(tvb, 32, 8); proto_tree_add_bytes_format(ntp_tree, hf_ntp_rec, tvb, 32, 8, rec, - "Receive Time Stamp: %s", + "Receive Time Stamp: %s", ntp_fmt_ts(rec, buff)); /* Transmit Timestamp: This is the time at which the reply departed the * server for the client. @@ -409,7 +409,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) xmt = tvb_get_ptr(tvb, 40, 8); proto_tree_add_bytes_format(ntp_tree, hf_ntp_xmt, tvb, 40, 8, xmt, - "Transmit Time Stamp: %s", + "Transmit Time Stamp: %s", ntp_fmt_ts(xmt, buff)); /* When the NTP authentication scheme is implemented, the @@ -432,8 +432,8 @@ void proto_register_ntp(void) { static hf_register_info hf[] = { - { &hf_ntp_flags, { - "Flags", "ntp.flags", FT_UINT8, BASE_HEX, + { &hf_ntp_flags, { + "Flags", "ntp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Flags (Leap/Version/Mode)", HFILL }}, { &hf_ntp_flags_li, { "Leap Indicator", "ntp.flags.li", FT_UINT8, BASE_DEC, @@ -444,41 +444,41 @@ proto_register_ntp(void) { &hf_ntp_flags_mode, { "Mode", "ntp.flags.mode", FT_UINT8, BASE_DEC, VALS(mode_types), NTP_MODE_MASK, "Mode", HFILL }}, - { &hf_ntp_stratum, { + { &hf_ntp_stratum, { "Peer Clock Stratum", "ntp.stratum", FT_UINT8, BASE_DEC, NULL, 0, "Peer Clock Stratum", HFILL }}, - { &hf_ntp_ppoll, { - "Peer Polling Interval", "ntp.ppoll", FT_UINT8, BASE_DEC, + { &hf_ntp_ppoll, { + "Peer Polling Interval", "ntp.ppoll", FT_UINT8, BASE_DEC, NULL, 0, "Peer Polling Interval", HFILL }}, - { &hf_ntp_precision, { - "Peer Clock Precision", "ntp.precision", FT_UINT8, BASE_DEC, + { &hf_ntp_precision, { + "Peer Clock Precision", "ntp.precision", FT_UINT8, BASE_DEC, NULL, 0, "Peer Clock Precision", HFILL }}, - { &hf_ntp_rootdelay, { + { &hf_ntp_rootdelay, { "Root Delay", "ntp.rootdelay", FT_DOUBLE, BASE_DEC, NULL, 0, "Root Delay", HFILL }}, - { &hf_ntp_rootdispersion, { - "Clock Dispersion", "ntp.rootdispersion", FT_DOUBLE, BASE_DEC, + { &hf_ntp_rootdispersion, { + "Clock Dispersion", "ntp.rootdispersion", FT_DOUBLE, BASE_DEC, NULL, 0, "Clock Dispersion", HFILL }}, - { &hf_ntp_refid, { - "Reference Clock ID", "ntp.refid", FT_BYTES, BASE_NONE, + { &hf_ntp_refid, { + "Reference Clock ID", "ntp.refid", FT_BYTES, BASE_NONE, NULL, 0, "Reference Clock ID", HFILL }}, - { &hf_ntp_reftime, { - "Reference Clock Update Time", "ntp.reftime", FT_BYTES, BASE_NONE, + { &hf_ntp_reftime, { + "Reference Clock Update Time", "ntp.reftime", FT_BYTES, BASE_NONE, NULL, 0, "Reference Clock Update Time", HFILL }}, - { &hf_ntp_org, { - "Originate Time Stamp", "ntp.org", FT_BYTES, BASE_NONE, + { &hf_ntp_org, { + "Originate Time Stamp", "ntp.org", FT_BYTES, BASE_NONE, NULL, 0, "Originate Time Stamp", HFILL }}, - { &hf_ntp_rec, { - "Receive Time Stamp", "ntp.rec", FT_BYTES, BASE_NONE, + { &hf_ntp_rec, { + "Receive Time Stamp", "ntp.rec", FT_BYTES, BASE_NONE, NULL, 0, "Receive Time Stamp", HFILL }}, - { &hf_ntp_xmt, { - "Transmit Time Stamp", "ntp.xmt", FT_BYTES, BASE_NONE, + { &hf_ntp_xmt, { + "Transmit Time Stamp", "ntp.xmt", FT_BYTES, BASE_NONE, NULL, 0, "Transmit Time Stamp", HFILL }}, - { &hf_ntp_keyid, { - "Key ID", "ntp.keyid", FT_BYTES, BASE_HEX, + { &hf_ntp_keyid, { + "Key ID", "ntp.keyid", FT_BYTES, BASE_HEX, NULL, 0, "Key ID", HFILL }}, - { &hf_ntp_mac, { - "Message Authentication Code", "ntp.mac", FT_BYTES, BASE_HEX, + { &hf_ntp_mac, { + "Message Authentication Code", "ntp.mac", FT_BYTES, BASE_HEX, NULL, 0, "Message Authentication Code", HFILL }}, }; static gint *ett[] = { diff --git a/packet-ntp.h b/packet-ntp.h index 2ab7f2f148..74e55a053b 100644 --- a/packet-ntp.h +++ b/packet-ntp.h @@ -1,24 +1,24 @@ /* packet-ntp.h * Definitions for packet disassembly structures and routines * - * $Id: packet-ntp.h,v 1.7 2001/04/17 00:46:03 guy Exp $ + * $Id: packet-ntp.h,v 1.8 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * Joerg Mayer <jmayer@loplof.de> * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-null.c b/packet-null.c index 851e5e79d2..f659a0e590 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,24 +1,24 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.55 2002/08/03 19:49:30 guy Exp $ + * $Id: packet-null.c,v 1.56 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * * This file created by Mike Hall <mlh@io.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -60,7 +60,7 @@ static const value_string family_vals[] = { {BSD_AF_IPX, "Netware IPX/SPX"}, {BSD_AF_INET6_BSD, "IPv6" }, {BSD_AF_INET6_FREEBSD, "IPv6" }, - {BSD_AF_INET6_DARWIN, "IPv6" }, + {BSD_AF_INET6_DARWIN, "IPv6" }, {0, NULL } }; diff --git a/packet-null.h b/packet-null.h index ebfbacdb26..9d3945fd90 100644 --- a/packet-null.h +++ b/packet-null.h @@ -1,21 +1,21 @@ /* packet-null.h * - * $Id: packet-null.h,v 1.6 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-null.h,v 1.7 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-osi-options.c b/packet-osi-options.c index 46bba99d42..84ffdbc097 100644 --- a/packet-osi-options.c +++ b/packet-osi-options.c @@ -1,27 +1,27 @@ /* packet-osi-options.c - * Routines for the decode of ISO/OSI option part + * Routines for the decode of ISO/OSI option part * Covers: * ISO 8473 CLNP (ConnectionLess Mode Network Service Protocol) * ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol) * ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol) * - * $Id: packet-osi-options.c,v 1.13 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-osi-options.c,v 1.14 2002/08/28 21:00:24 jmayer Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -70,7 +70,7 @@ #define OSI_OPT_QOS_SRC_ADR_SPEC 0x40 #define OSI_OPT_QOS_DST_ADR_SPEC 0x80 #define OSI_OPT_QOS_GLOBAL_UNIQUE 0xc0 - + #define OSI_OPT_QOS_SUB_MASK 0x3f #define OSI_OPT_QOS_SUB_RSVD 0x20 #define OSI_OPT_QOS_SUB_SEQ_VS_TRS 0x10 @@ -103,14 +103,14 @@ static const value_string osi_opt_sec_vals[] = { { OSI_OPT_SEC_DST_ADR_SPEC, "Destination Address Specific"}, { OSI_OPT_SEC_GLOBAL_UNIQUE, "Globally Unique"}, { 0, NULL} }; - + static const value_string osi_opt_qos_vals[] = { { OSI_OPT_QOS_RESERVED, "Reserved"}, { OSI_OPT_QOS_SRC_ADR_SPEC, "Source Address Specific"}, { OSI_OPT_QOS_DST_ADR_SPEC, "Destination Address Specific"}, { OSI_OPT_QOS_GLOBAL_UNIQUE, "Globally Unique"}, { 0, NULL} }; - + static const value_string osi_opt_qos_sub_vals[] = { { 0x20, " xx10 0000 Reserved"}, { 0x10, " xx01 0000 Sequencing versus transit delay"}, @@ -119,7 +119,7 @@ static const value_string osi_opt_qos_sub_vals[] = { { 0x02, " xx00 0010 Residual error probability versus transit delay"}, { 0x01, " xx00 0001 Residual error probability versus cost"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_general[] = { { 0x00, "Reason not specified"}, { 0x01, "Protocol procedure error"}, @@ -130,24 +130,24 @@ static const value_string osi_opt_rfd_general[] = { { 0x06, "Incomplete PDU received"}, { 0x07, "Duplicate option"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_address[] = { { 0x00, "Destination Address unreachable"}, { 0x01, "Destination Address unknown"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_src_route[] = { { 0x00, "Unspecified source routing error"}, { 0x01, "Syntax error in source routing field"}, { 0x02, "Unknown address in source routing field"}, { 0x03, "Path not acceptable"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_lifetime[] = { { 0x00, "Lifetime expired while data unit in transit"}, { 0x01, "Lifetime expired during reassembly"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_discarded[] = { { 0x00, "Unsupported option not specified"}, { 0x01, "Unsupported protocol version"}, @@ -155,11 +155,11 @@ static const value_string osi_opt_rfd_discarded[] = { { 0x03, "Unsupported source routing option"}, { 0x04, "Unsupported recording of route option"}, { 0, NULL} }; - + static const value_string osi_opt_rfd_reassembly[] = { { 0x00, "Reassembly interference"}, { 0, NULL} }; - + static void dissect_option_qos( const guchar type, const guchar sub_type, int offset, @@ -168,14 +168,14 @@ dissect_option_qos( const guchar type, const guchar sub_type, int offset, guchar tmp_type = 0; proto_item *ti; proto_tree *osi_qos_tree = NULL; - - + + ti = proto_tree_add_text( tree, tvb, offset, len, "Quality of service maintenance: %s", val_to_str( type, osi_opt_qos_vals, "Unknown (0x%x)") ); - + osi_qos_tree = proto_item_add_subtree( ti, ott_osi_qos ); - + if ( OSI_OPT_SEC_MASK == type ) { /* Analye BIT field to get all Values */ tmp_type = sub_type & OSI_OPT_QOS_SUB_RSVD; @@ -194,7 +194,7 @@ dissect_option_qos( const guchar type, const guchar sub_type, int offset, val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type & OSI_OPT_QOS_SUB_TSD_VS_COST; - + if ( tmp_type ) { proto_tree_add_text( osi_qos_tree, tvb, offset, len, val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); @@ -213,7 +213,7 @@ dissect_option_qos( const guchar type, const guchar sub_type, int offset, } static void -dissect_option_route( guchar parm_type, guchar offset, guchar parm_len, +dissect_option_route( guchar parm_type, guchar offset, guchar parm_len, tvbuff_t *tvb, proto_tree *tree ) { guchar next_hop = 0; @@ -221,7 +221,7 @@ dissect_option_route( guchar parm_type, guchar offset, guchar parm_len, guchar netl = 0; guchar last_hop = 0; guchar cnt_hops = 0; - + proto_item *ti; proto_tree *osi_route_tree = NULL; @@ -235,10 +235,10 @@ dissect_option_route( guchar parm_type, guchar offset, guchar parm_len, netl = tvb_get_guint8(tvb, next_hop + 2 ); this_hop = offset + 3; /* points to first netl */ - ti = proto_tree_add_text( tree, tvb, offset + next_hop, netl, + ti = proto_tree_add_text( tree, tvb, offset + next_hop, netl, "Source Routing: %s ( Next Hop Highlighted In Data Buffer )", (tvb_get_guint8(tvb, offset) == 0) ? "Partial Source Routing" : - "Complete Source Routing" ); + "Complete Source Routing" ); } else { last_hop = tvb_get_guint8(tvb, offset + 1 ); @@ -251,13 +251,13 @@ dissect_option_route( guchar parm_type, guchar offset, guchar parm_len, (tvb_get_guint8(tvb, offset) == 0) ? "Partial Source Routing" : "Complete Source Routing" , val_to_str( last_hop, osi_opt_route, "Unknown (0x%x" ) ); - if ( 255 == last_hop ) + if ( 255 == last_hop ) this_hop = parm_len + 1; /* recording terminated, nothing to show */ else this_hop = offset + 3; } osi_route_tree = proto_item_add_subtree( ti, ott_osi_route ); - + while ( this_hop < parm_len ) { netl = tvb_get_guint8(tvb, this_hop + 1); proto_tree_add_text( osi_route_tree, tvb, offset + this_hop, netl, @@ -277,7 +277,7 @@ static void dissect_option_rfd( const guchar error, const guchar field, guchar offset, guchar len, tvbuff_t *tvb, proto_tree *tree ) { guchar error_class = 0; - char *format_string[] = + char *format_string[] = { "Reason for discard {General} : %s, in field %u", "Reason for discard {Address} : %s, in field %u", "Reason for discard {Source Routing}: %s, in field %u", @@ -285,7 +285,7 @@ dissect_option_rfd( const guchar error, const guchar field, guchar offset, "Reason for discard {PDU discarded} : %s, in field %u", "Reason for discard {Reassembly} : %s, in field %u" }; - + error_class = error & OSI_OPT_RFD_MASK; if ( OSI_OPT_RFD_GENERAL == error_class ) { @@ -321,20 +321,20 @@ dissect_option_rfd( const guchar error, const guchar field, guchar offset, else { proto_tree_add_text( tree, tvb, offset, len, "Reason for discard: UNKNOWN Error Class" ); - } + } } /* ############################## Dissection Functions ###################### */ /* * Name: dissect_osi_options() - * + * * Description: * Main entry area for esis de-mangling. This will build the * main esis tree data and call the sub-protocols as needed. * * Input: - * guchar : length of option section + * guchar : length of option section * tvbuff_t * : tvbuff containing packet data * int : offset into packet where we are (packet_data[offset]== start * of what we care about) @@ -344,7 +344,7 @@ dissect_option_rfd( const guchar error, const guchar field, guchar offset, * void, but we will add to the proto_tree if it is not NULL. */ void -dissect_osi_options( guchar opt_len, tvbuff_t *tvb, +dissect_osi_options( guchar opt_len, tvbuff_t *tvb, int offset, proto_tree *tree) { proto_item *ti; proto_tree *osi_option_tree = NULL; @@ -354,11 +354,11 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb, if (tree) { if ( 0 == opt_len ) { - proto_tree_add_text( tree, tvb, offset, 0, + proto_tree_add_text( tree, tvb, offset, 0, "### No Options for this PDU ###" ); return; } - + ti = proto_tree_add_text( tree, tvb, offset, opt_len, "### Option Section ###" ); osi_option_tree = proto_item_add_subtree( ti, ott_osi_options ); @@ -368,7 +368,7 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb, offset++; parm_len = (int) tvb_get_guint8(tvb, offset); offset++; - + switch ( parm_type ) { case OSI_OPT_QOS_MAINTANANCE: octet = tvb_get_guint8(tvb, offset); @@ -385,15 +385,15 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb, break; case OSI_OPT_PRIORITY: octet = tvb_get_guint8(tvb, offset); - if ( OSI_OPT_MAX_PRIORITY >= octet ) { + if ( OSI_OPT_MAX_PRIORITY >= octet ) { proto_tree_add_text( osi_option_tree, tvb, offset, parm_len, "Priority : %u", octet ); } else { proto_tree_add_text( osi_option_tree, tvb, offset, parm_len, - "Priority : %u ( Invalid )", + "Priority : %u ( Invalid )", octet ); - } + } break; case OSI_OPT_ADDRESS_MASK: proto_tree_add_text( osi_option_tree, tvb, offset, parm_len, @@ -407,7 +407,7 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb, break; case OSI_OPT_ES_CONFIG_TIMER: proto_tree_add_text( osi_option_tree, tvb, offset, parm_len, - "ESCT : %u seconds", tvb_get_ntohs( tvb, offset ) ); + "ESCT : %u seconds", tvb_get_ntohs( tvb, offset ) ); break; case OSI_OPT_PADDING: proto_tree_add_text( osi_option_tree, tvb, offset, parm_len, @@ -427,7 +427,7 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb, opt_len -= parm_len + 2; offset += parm_len; } - } + } } /* dissect-osi-options */ diff --git a/packet-osi-options.h b/packet-osi-options.h index afe5ef7850..45ff907aeb 100644 --- a/packet-osi-options.h +++ b/packet-osi-options.h @@ -1,23 +1,23 @@ /* packet-osi-options.h - * Defines for OSI options part decode + * Defines for OSI options part decode * - * $Id: packet-osi-options.h,v 1.5 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-osi-options.h,v 1.6 2002/08/28 21:00:24 jmayer Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -28,7 +28,7 @@ /* * published API functions - */ + */ extern void dissect_osi_options( guchar, tvbuff_t *, int, proto_tree *); extern void proto_register_osi_options(void); diff --git a/packet-osi.c b/packet-osi.c index 643bba0a41..a4668936a9 100644 --- a/packet-osi.c +++ b/packet-osi.c @@ -2,24 +2,24 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: packet-osi.c,v 1.54 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-osi.c,v 1.55 2002/08/28 21:00:24 jmayer Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -131,7 +131,7 @@ const value_string nlpid_vals[] = { dissector_table_t osinl_subdissector_table; static dissector_handle_t data_handle; -static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 nlpid; diff --git a/packet-osi.h b/packet-osi.h index b929e02cfc..f7ca6fa04e 100644 --- a/packet-osi.h +++ b/packet-osi.h @@ -1,21 +1,21 @@ /* packet-osi.h * - * $Id: packet-osi.h,v 1.11 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-osi.h,v 1.12 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,10 +42,10 @@ -#define PROTO_STRING_ISIS "ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol" -#define PROTO_STRING_IDRP "ISO 10747 IDRP InTER Domain Routeing Information Exchange Protocol" +#define PROTO_STRING_ISIS "ISO 10589 ISIS InTRA Domain Routeing Information Exchange Protocol" +#define PROTO_STRING_IDRP "ISO 10747 IDRP InTER Domain Routeing Information Exchange Protocol" #define PROTO_STRING_ESIS "ISO 9542 ESIS Routeing Information Exchange Protocol" -#define PROTO_STRING_CLNP "ISO 8473 CLNP ConnectionLess Network Protocol" +#define PROTO_STRING_CLNP "ISO 8473 CLNP ConnectionLess Network Protocol" #define PROTO_STRING_COTP "ISO 8073 COTP Connection-Oriented Transport Protocol" #define PROTO_STRING_CLTP "ISO 8602 CLTP ConnectionLess Transport Protocol" #define PROTO_STRING_LSP "ISO 10589 ISIS Link State Protocol Data Unit" @@ -54,7 +54,7 @@ #define OSI_PDU_TYPE_MASK 0x1f #define BIS_PDU_TYPE MASK 0xff - + #define BIT_1 0x01 #define BIT_2 0x02 diff --git a/packet-ospf.c b/packet-ospf.c index 5059a01d79..e196502041 100644 --- a/packet-ospf.c +++ b/packet-ospf.c @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-ospf.c,v 1.69 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-ospf.c,v 1.70 2002/08/28 21:00:24 jmayer Exp $ * * At this time, this module is able to analyze OSPF * packets as specified in RFC2328. MOSPF (RFC1584) and other @@ -12,26 +12,26 @@ * - (c) 2001 Palle Lyckegaard <palle[AT]lyckegaard.dk> * * TOS - support is not fully implemented - * + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -84,7 +84,7 @@ static const value_string auth_vals[] = { #define OSPF_V2_OPTIONS_DC 0x20 #define OSPF_V2_OPTIONS_O 0x40 #define OSPF_V2_OPTIONS_DN 0x01 -#define OSPF_V3_OPTIONS_V6 0x01 +#define OSPF_V3_OPTIONS_V6 0x01 #define OSPF_V3_OPTIONS_E 0x02 #define OSPF_V3_OPTIONS_MC 0x04 #define OSPF_V3_OPTIONS_N 0x08 @@ -111,7 +111,7 @@ static const value_string auth_vals[] = { #define OSPF_V3_LSTYPE_INTER_AREA_PREFIX 0x2003 #define OSPF_V3_LSTYPE_INTER_AREA_ROUTER 0x2004 #define OSPF_V3_LSTYPE_AS_EXTERNAL 0x4005 -#define OSPF_V3_LSTYPE_GROUP_MEMBERSHIP 0x2006 +#define OSPF_V3_LSTYPE_GROUP_MEMBERSHIP 0x2006 #define OSPF_V3_LSTYPE_TYPE_7 0x2007 #define OSPF_V3_LSTYPE_LINK 0x0008 #define OSPF_V3_LSTYPE_INTRA_AREA_PREFIX 0x2009 @@ -160,13 +160,13 @@ static const value_string ls_opaque_type_vals[] = { }; static const value_string v3_ls_type_vals[] = { - {OSPF_V3_LSTYPE_ROUTER, "Router-LSA" }, - {OSPF_V3_LSTYPE_NETWORK, "Network-LSA" }, - {OSPF_V3_LSTYPE_INTER_AREA_PREFIX, "Inter-Area-Prefix-LSA" }, - {OSPF_V3_LSTYPE_INTER_AREA_ROUTER, "Inter-Area-Router-LSA" }, - {OSPF_V3_LSTYPE_AS_EXTERNAL, "AS-External-LSA" }, - {OSPF_V3_LSTYPE_GROUP_MEMBERSHIP, "Group-Membership-LSA" }, - {OSPF_V3_LSTYPE_TYPE_7, "Type-LSA" }, + {OSPF_V3_LSTYPE_ROUTER, "Router-LSA" }, + {OSPF_V3_LSTYPE_NETWORK, "Network-LSA" }, + {OSPF_V3_LSTYPE_INTER_AREA_PREFIX, "Inter-Area-Prefix-LSA" }, + {OSPF_V3_LSTYPE_INTER_AREA_ROUTER, "Inter-Area-Router-LSA" }, + {OSPF_V3_LSTYPE_AS_EXTERNAL, "AS-External-LSA" }, + {OSPF_V3_LSTYPE_GROUP_MEMBERSHIP, "Group-Membership-LSA" }, + {OSPF_V3_LSTYPE_TYPE_7, "Type-LSA" }, {OSPF_V3_LSTYPE_LINK, "Link-LSA" }, {OSPF_V3_LSTYPE_INTRA_AREA_PREFIX, "Intra-Area-Prefix-LSA" }, {0, NULL } @@ -220,7 +220,7 @@ enum { OSPFF_MSG_LS_REQ, OSPFF_MSG_LS_UPD, OSPFF_MSG_LS_ACK, - + OSPFF_LS_TYPE, OSPFF_LS_OPAQUE_TYPE, @@ -256,101 +256,101 @@ static int ospf_filter[OSPFF_MAX]; static hf_register_info ospff_info[] = { /* Message type number */ - {&ospf_filter[OSPFF_MSG_TYPE], + {&ospf_filter[OSPFF_MSG_TYPE], { "Message Type", "ospf.msg", FT_UINT8, BASE_DEC, VALS(pt_vals), 0x0, "", HFILL }}, /* Message types */ - {&ospf_filter[OSPFF_MSG_HELLO], + {&ospf_filter[OSPFF_MSG_HELLO], { "Hello", "ospf.msg.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_MSG_DB_DESC], + {&ospf_filter[OSPFF_MSG_DB_DESC], { "Database Description", "ospf.msg.dbdesc", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_MSG_LS_REQ], + {&ospf_filter[OSPFF_MSG_LS_REQ], { "Link State Adv Request", "ospf.msg.lsreq", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_MSG_LS_UPD], + {&ospf_filter[OSPFF_MSG_LS_UPD], { "Link State Adv Update", "ospf.msg.lsupdate", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_MSG_LS_ACK], - { "Link State Adv Acknowledgement", "ospf.msg.lsack", FT_BOOLEAN, + {&ospf_filter[OSPFF_MSG_LS_ACK], + { "Link State Adv Acknowledgement", "ospf.msg.lsack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, /* LS Types */ - {&ospf_filter[OSPFF_LS_TYPE], - { "Link-State Advertisement Type", "ospf.lsa", FT_UINT8, BASE_DEC, + {&ospf_filter[OSPFF_LS_TYPE], + { "Link-State Advertisement Type", "ospf.lsa", FT_UINT8, BASE_DEC, VALS(ls_type_vals), 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_OPAQUE_TYPE], - { "Link State ID Opaque Type", "ospf.lsid_opaque_type", FT_UINT8, BASE_DEC, + {&ospf_filter[OSPFF_LS_OPAQUE_TYPE], + { "Link State ID Opaque Type", "ospf.lsid_opaque_type", FT_UINT8, BASE_DEC, VALS(ls_opaque_type_vals), 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE], - { "Link State ID TE-LSA Instance", "ospf.lsid_te_lsa.instance", FT_UINT16, BASE_DEC, + {&ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE], + { "Link State ID TE-LSA Instance", "ospf.lsid_te_lsa.instance", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_ROUTER], + {&ospf_filter[OSPFF_LS_ROUTER], { "Router LSA", "ospf.lsa.router", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_NETWORK], + {&ospf_filter[OSPFF_LS_NETWORK], { "Network LSA", "ospf.lsa.network", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_SUMMARY], - { "Summary LSA (IP Network)", "ospf.lsa.summary", FT_BOOLEAN, BASE_NONE, + {&ospf_filter[OSPFF_LS_SUMMARY], + { "Summary LSA (IP Network)", "ospf.lsa.summary", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_ASBR], + {&ospf_filter[OSPFF_LS_ASBR], { "Summary LSA (ASBR)", "ospf.lsa.asbr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_ASEXT], + {&ospf_filter[OSPFF_LS_ASEXT], { "AS-External LSA (ASBR)", "ospf.lsa.asext", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_GRPMEMBER], + {&ospf_filter[OSPFF_LS_GRPMEMBER], { "Group Membership LSA", "ospf.lsa.member", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_ASEXT7], + {&ospf_filter[OSPFF_LS_ASEXT7], { "NSSA AS-External LSA", "ospf.lsa.nssa", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_EXTATTR], + {&ospf_filter[OSPFF_LS_EXTATTR], { "External Attributes LSA", "ospf.lsa.attr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_OPAQUE], + {&ospf_filter[OSPFF_LS_OPAQUE], { "Opaque LSA", "ospf.lsa.opaque", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, /* Other interesting OSPF values */ - {&ospf_filter[OSPFF_SRC_ROUTER], - { "Source OSPF Router", "ospf.srcrouter", FT_IPv4, BASE_NONE, NULL, 0x0, - "", HFILL }}, + {&ospf_filter[OSPFF_SRC_ROUTER], + { "Source OSPF Router", "ospf.srcrouter", FT_IPv4, BASE_NONE, NULL, 0x0, + "", HFILL }}, - {&ospf_filter[OSPFF_ADV_ROUTER], - { "Advertising Router", "ospf.advrouter", FT_IPv4, BASE_NONE, NULL, 0x0, - "", HFILL }}, + {&ospf_filter[OSPFF_ADV_ROUTER], + { "Advertising Router", "ospf.advrouter", FT_IPv4, BASE_NONE, NULL, 0x0, + "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS], - { "MPLS Traffic Engineering LSA", "ospf.lsa.mpls", FT_BOOLEAN, + {&ospf_filter[OSPFF_LS_MPLS], + { "MPLS Traffic Engineering LSA", "ospf.lsa.mpls", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_ROUTERID], - { "MPLS/TE Router ID", "ospf.mpls.routerid", FT_IPv4, BASE_NONE, NULL, 0x0, + {&ospf_filter[OSPFF_LS_MPLS_ROUTERID], + { "MPLS/TE Router ID", "ospf.mpls.routerid", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_LINKID], - { "MPLS/TE Link ID", "ospf.mpls.linkid", FT_IPv4, BASE_NONE, NULL, 0x0, + {&ospf_filter[OSPFF_LS_MPLS_LINKID], + { "MPLS/TE Link ID", "ospf.mpls.linkid", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR], - { "MPLS/TE Local Interface Address", "ospf.mpls.local_addr", FT_IPv4, + {&ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR], + { "MPLS/TE Local Interface Address", "ospf.mpls.local_addr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR], - { "MPLS/TE Remote Interface Address", "ospf.mpls.remote_addr", FT_IPv4, + {&ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR], + { "MPLS/TE Remote Interface Address", "ospf.mpls.remote_addr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID], - { "MPLS/TE Local Interface Index", "ospf.mpls.local_id", FT_UINT32, + {&ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID], + { "MPLS/TE Local Interface Index", "ospf.mpls.local_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID], - { "MPLS/TE Remote Interface Index", "ospf.mpls.remote_id", FT_UINT32, + {&ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID], + { "MPLS/TE Remote Interface Index", "ospf.mpls.remote_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, @@ -359,18 +359,18 @@ static hf_register_info ospff_info[] = { static guint8 ospf_msg_type_to_filter (guint8 msg_type) { - if (msg_type >= OSPF_HELLO && - msg_type <= OSPF_LS_ACK) + if (msg_type >= OSPF_HELLO && + msg_type <= OSPF_LS_ACK) return msg_type + OSPFF_MSG_MIN; return -1; } static guint8 ospf_ls_type_to_filter (guint8 ls_type) { - if (ls_type >= OSPF_LSTYPE_ROUTER && - ls_type <= OSPF_LSTYPE_EXTATTR) + if (ls_type >= OSPF_LSTYPE_ROUTER && + ls_type <= OSPF_LSTYPE_EXTATTR) return OSPFF_LS_MIN + ls_type; - else if (ls_type >= OSPF_LSTYPE_OP_LINKLOCAL && + else if (ls_type >= OSPF_LSTYPE_OP_LINKLOCAL && ls_type <= OSPF_LSTYPE_OP_ASWIDE) return OSPFF_LS_OPAQUE; else @@ -380,18 +380,18 @@ static guint8 ospf_ls_type_to_filter (guint8 ls_type) static dissector_handle_t data_handle; static void dissect_ospf_hello(tvbuff_t*, int, proto_tree*, guint8); -static void dissect_ospf_db_desc(tvbuff_t*, int, proto_tree*, guint8); -static void dissect_ospf_ls_req(tvbuff_t*, int, proto_tree*, guint8); -static void dissect_ospf_ls_upd(tvbuff_t*, int, proto_tree*, guint8); -static void dissect_ospf_ls_ack(tvbuff_t*, int, proto_tree*, guint8); +static void dissect_ospf_db_desc(tvbuff_t*, int, proto_tree*, guint8); +static void dissect_ospf_ls_req(tvbuff_t*, int, proto_tree*, guint8); +static void dissect_ospf_ls_upd(tvbuff_t*, int, proto_tree*, guint8); +static void dissect_ospf_ls_ack(tvbuff_t*, int, proto_tree*, guint8); /* dissect_ospf_v[23]lsa returns the offset of the next LSA - * if disassemble_body is set to FALSE (e.g. in LSA ACK + * if disassemble_body is set to FALSE (e.g. in LSA ACK * packets), the offset is set to the offset of the next * LSA header */ -static int dissect_ospf_v2_lsa(tvbuff_t*, int, proto_tree*, gboolean disassemble_body); -static int dissect_ospf_v3_lsa(tvbuff_t*, int, proto_tree*, gboolean disassemble_body); +static int dissect_ospf_v2_lsa(tvbuff_t*, int, proto_tree*, gboolean disassemble_body); +static int dissect_ospf_v3_lsa(tvbuff_t*, int, proto_tree*, gboolean disassemble_body); static void dissect_ospf_options(tvbuff_t *, int, proto_tree *, guint8); @@ -399,11 +399,11 @@ static void dissect_ospf_v3_prefix_options(tvbuff_t *, int, proto_tree *); static void dissect_ospf_v3_address_prefix(tvbuff_t *, int, int, proto_tree *); -static void +static void dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ospf_tree = NULL; - proto_item *ti; + proto_item *ti; proto_tree *ospf_header_tree; guint8 version; guint8 packet_type; @@ -444,7 +444,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, pt_vals, "Unknown (%u)")); - } + } if (tree) { ospflen = tvb_get_ntohs(tvb, 2); @@ -453,19 +453,19 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ospf_tree = proto_item_add_subtree(ti, ett_ospf); ti = proto_tree_add_text(ospf_tree, tvb, 0, ospf_header_length, - "OSPF Header"); + "OSPF Header"); ospf_header_tree = proto_item_add_subtree(ti, ett_ospf_hdr); proto_tree_add_text(ospf_header_tree, tvb, 0, 1, "OSPF Version: %u", - version); - proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_MSG_TYPE], + version); + proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_MSG_TYPE], tvb, 1, 1, FALSE); - proto_tree_add_item_hidden(ospf_header_tree, + proto_tree_add_item_hidden(ospf_header_tree, ospf_filter[ospf_msg_type_to_filter(packet_type)], tvb, 1, 1, FALSE); proto_tree_add_text(ospf_header_tree, tvb, 2, 2, "Packet Length: %u", ospflen); - proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_SRC_ROUTER], + proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_SRC_ROUTER], tvb, 4, 4, FALSE); areaid=tvb_get_ntohl(tvb,8); proto_tree_add_text(ospf_header_tree, tvb, 8, 4, "Area ID: %s%s", @@ -544,7 +544,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Authentication is only valid for OSPFv2 */ - if ( version == OSPF_VERSION_2 ) { + if ( version == OSPF_VERSION_2 ) { auth_type = tvb_get_ntohs(tvb, 14); proto_tree_add_text(ospf_header_tree, tvb, 14, 2, "Auth Type: %s", val_to_str(auth_type, auth_vals, "Unknown (%u)")); @@ -567,7 +567,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) crypto_len); proto_tree_add_text(ospf_header_tree, tvb, 20, 4, "Auth Crypto Sequence Number: 0x%x", tvb_get_ntohl(tvb, 20)); - + /* Show the message digest that was appended to the end of the OSPF message - but only if it's present (we don't want to get an exception before we've tried dissecting OSPF @@ -637,11 +637,11 @@ static void dissect_ospf_hello(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) { proto_tree *ospf_hello_tree; - proto_item *ti; + proto_item *ti; ti = proto_tree_add_text(tree, tvb, offset, -1, "OSPF Hello Packet"); ospf_hello_tree = proto_item_add_subtree(ti, ett_ospf_hello); - + switch (version ) { case OSPF_VERSION_2: proto_tree_add_text(ospf_hello_tree, tvb, offset, 4, "Network Mask: %s", @@ -693,7 +693,7 @@ dissect_ospf_hello(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) break; - default: + default: break; } } @@ -702,17 +702,17 @@ static void dissect_ospf_db_desc(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) { proto_tree *ospf_db_desc_tree=NULL; - proto_item *ti; + proto_item *ti; guint8 flags; guint8 reserved; char flags_string[20] = ""; if (tree) { - ti = proto_tree_add_text(tree, tvb, offset, -1, "OSPF DB Description"); + ti = proto_tree_add_text(tree, tvb, offset, -1, "OSPF DB Description"); ospf_db_desc_tree = proto_item_add_subtree(ti, ett_ospf_desc); switch (version ) { - + case OSPF_VERSION_2: proto_tree_add_text(ospf_db_desc_tree, tvb, offset, 2, "Interface MTU: %u", @@ -807,14 +807,14 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) /* we place every request for a LSA in a single subtree */ while (tvb_reported_length_remaining(tvb, offset) != 0) { ti = proto_tree_add_text(tree, tvb, offset, OSPF_LS_REQ_LENGTH, - "Link State Request"); + "Link State Request"); ospf_lsr_tree = proto_item_add_subtree(ti, ett_ospf_lsr); - + switch ( version ) { case OSPF_VERSION_2: ls_type = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_LS_TYPE], + proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_LS_TYPE], tvb, offset, 4, FALSE); break; case OSPF_VERSION_3: @@ -832,7 +832,7 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) } - proto_tree_add_text(ospf_lsr_tree, tvb, offset + 4, 4, "Link State ID: %s", + proto_tree_add_text(ospf_lsr_tree, tvb, offset + 4, 4, "Link State ID: %s", ip_to_str(tvb_get_ptr(tvb, offset + 4, 4))); proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_ADV_ROUTER], tvb, offset + 8, 4, FALSE); @@ -847,7 +847,7 @@ dissect_ospf_ls_upd(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) proto_tree *ospf_lsa_upd_tree=NULL; proto_item *ti; guint32 lsa_nr; - guint32 lsa_counter; + guint32 lsa_counter; ti = proto_tree_add_text(tree, tvb, offset, -1, "LS Update Packet"); ospf_lsa_upd_tree = proto_item_add_subtree(ti, ett_ospf_lsa_upd); @@ -857,7 +857,7 @@ dissect_ospf_ls_upd(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) lsa_nr); /* skip to the beginning of the first LSA */ offset += 4; /* the LS Upd Packet contains only a 32 bit #LSAs field */ - + lsa_counter = 0; while (lsa_counter < lsa_nr) { if ( version == OSPF_VERSION_2) @@ -883,7 +883,7 @@ dissect_ospf_ls_ack(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) } /* - * Returns if an LSA is opaque, i.e. requires special treatment + * Returns if an LSA is opaque, i.e. requires special treatment */ static int is_opaque(int lsa_type) @@ -932,14 +932,14 @@ static const value_string mpls_link_stlv_str[] = { {0, NULL}, }; -/* - * Dissect MPLS/TE opaque LSA +/* + * Dissect MPLS/TE opaque LSA */ static void dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 length) { - proto_item *ti; + proto_item *ti; proto_tree *mpls_tree; proto_tree *tlv_tree; proto_tree *stlv_tree; @@ -967,7 +967,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, case MPLS_TLV_ROUTER: ti = proto_tree_add_text(mpls_tree, tvb, offset, tlv_length+4, - "Router Address: %s", + "Router Address: %s", ip_to_str(tvb_get_ptr(tvb, offset+4, 4))); tlv_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls_router); proto_tree_add_text(tlv_tree, tvb, offset, 2, "TLV Type: 1 - Router Address"); @@ -1032,9 +1032,9 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, /* The Local/Remote Interface IP Address sub-TLV is TLV type 3/4, and is 4N octets in length, where N is the number of neighbor addresses. */ for (i=0; i < stlv_len; i+=4) - proto_tree_add_item(stlv_tree, - stlv_type==MPLS_LINK_LOCAL_IF ? - ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR] : + proto_tree_add_item(stlv_tree, + stlv_type==MPLS_LINK_LOCAL_IF ? + ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR] : ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR], tvb, stlv_offset+4+i, 4, FALSE); break; @@ -1094,9 +1094,9 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, "TLV Type: %u: %s", stlv_type, stlv_name); proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u", stlv_len); - proto_tree_add_item(stlv_tree, - stlv_type==MPLS_LINK_LOCAL_ID ? - ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID] : + proto_tree_add_item(stlv_tree, + stlv_type==MPLS_LINK_LOCAL_ID ? + ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID] : ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID], tvb, stlv_offset+4, 4, FALSE); break; @@ -1109,11 +1109,11 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, "TLV Type: %u: %s", stlv_type, stlv_name); proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u", stlv_len); - proto_tree_add_text(stlv_tree, tvb, stlv_offset+4, 1, "Switching Type: %s", - val_to_str(tvb_get_guint8(tvb,stlv_offset+4), + proto_tree_add_text(stlv_tree, tvb, stlv_offset+4, 1, "Switching Type: %s", + val_to_str(tvb_get_guint8(tvb,stlv_offset+4), gmpls_switching_type_str, "Unknown (%d)")); - proto_tree_add_text(stlv_tree, tvb, stlv_offset+5, 1, "Encoding: %s", - val_to_str(tvb_get_guint8(tvb,stlv_offset+5), + proto_tree_add_text(stlv_tree, tvb, stlv_offset+5, 1, "Encoding: %s", + val_to_str(tvb_get_guint8(tvb,stlv_offset+5), gmpls_lsp_enc_str, "Unknown (%d)")); for (i = 0; i < 8; i++) { proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4, @@ -1133,7 +1133,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, break; default: - ti = proto_tree_add_text(mpls_tree, tvb, offset, tlv_length+4, + ti = proto_tree_add_text(mpls_tree, tvb, offset, tlv_length+4, "Unknown LSA: %u", tlv_type); tlv_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls_link); proto_tree_add_text(tlv_tree, tvb, offset, 2, "TLV Type: %u - Unknown", @@ -1174,7 +1174,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, gboolean disassemble_body) { proto_tree *ospf_lsa_tree; - proto_item *ti; + proto_item *ti; guint8 ls_type; guint16 ls_length; @@ -1200,23 +1200,23 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, end_offset = offset + ls_length; if (disassemble_body) { - ti = proto_tree_add_text(tree, tvb, offset, ls_length, - "LS Type: %s", - val_to_str(ls_type, ls_type_vals, "Unknown (%d)")); + ti = proto_tree_add_text(tree, tvb, offset, ls_length, + "LS Type: %s", + val_to_str(ls_type, ls_type_vals, "Unknown (%d)")); } else { ti = proto_tree_add_text(tree, tvb, offset, OSPF_LSA_HEADER_LENGTH, - "LSA Header"); + "LSA Header"); } ospf_lsa_tree = proto_item_add_subtree(ti, ett_ospf_lsa); proto_tree_add_text(ospf_lsa_tree, tvb, offset, 2, "LS Age: %u seconds", tvb_get_ntohs(tvb, offset)); dissect_ospf_options(tvb, offset + 2, ospf_lsa_tree, OSPF_VERSION_2); - proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_LS_TYPE], tvb, - offset + 3, 1, FALSE); - proto_tree_add_item_hidden(ospf_lsa_tree, - ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb, - offset + 3, 1, FALSE); + proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_LS_TYPE], tvb, + offset + 3, 1, FALSE); + proto_tree_add_item_hidden(ospf_lsa_tree, + ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb, + offset + 3, 1, FALSE); if (is_opaque(ls_type)) { ls_id_type = tvb_get_guint8(tvb, offset + 4); @@ -1272,7 +1272,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_text(ospf_lsa_tree, tvb, offset + 2, 2, "Number of Links: %u", nr_links); offset += 4; - /* nr_links links follow + /* nr_links links follow * maybe we should put each of the links into its own subtree ??? */ for (link_counter = 1; link_counter <= nr_links; link_counter++) { @@ -1323,7 +1323,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, offset += 12; - /* nr_tos metrics may follow each link + /* nr_tos metrics may follow each link * ATTENTION: TOS metrics are not tested (I don't have TOS * based routing) * please send me a mail if it is/isn't working @@ -1371,7 +1371,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, case OSPF_LSTYPE_ASEXT: case OSPF_LSTYPE_ASEXT7: - proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Netmask: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Netmask: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4))); offset += 4; @@ -1388,7 +1388,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_get_ntoh24(tvb, offset + 1)); offset += 4; - proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Forwarding Address: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Forwarding Address: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4))); offset += 4; @@ -1411,7 +1411,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_get_ntoh24(tvb, offset + 1)); offset += 4; - proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Forwarding Address: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Forwarding Address: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4))); offset += 4; @@ -1448,7 +1448,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, gboolean disassemble_body) { proto_tree *ospf_lsa_tree; - proto_item *ti; + proto_item *ti; guint16 ls_type; guint16 ls_length; @@ -1481,10 +1481,10 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, if (disassemble_body) { ti = proto_tree_add_text(tree, tvb, offset, ls_length, - "%s (Type: 0x%04x)", val_to_str(ls_type, v3_ls_type_vals,"Unknown"), ls_type); + "%s (Type: 0x%04x)", val_to_str(ls_type, v3_ls_type_vals,"Unknown"), ls_type); } else { ti = proto_tree_add_text(tree, tvb, offset, OSPF_LSA_HEADER_LENGTH, - "LSA Header"); + "LSA Header"); } ospf_lsa_tree = proto_item_add_subtree(ti, ett_ospf_lsa); @@ -1552,7 +1552,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, if (ls_length > 0) proto_tree_add_text(ospf_lsa_tree, tvb, offset, ls_length, - "Router Interfaces:"); + "Router Interfaces:"); /* scan all router-lsa router interfaces */ /* maybe we should put each of the links into its own subtree ??? */ @@ -1716,7 +1716,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_text(ospf_lsa_tree, tvb, offset, 1, "Flags: 0x%02x (%s)", flags, flags_string); - + /* 24 bits metric */ metric=tvb_get_ntoh24(tvb, offset+1); proto_tree_add_text(ospf_lsa_tree, tvb, offset+1, 3, @@ -1738,7 +1738,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, /* address_prefix */ dissect_ospf_v3_address_prefix(tvb, offset, prefix_length, ospf_lsa_tree); - + offset+=(prefix_length+31)/32*4; /* Forwarding Address (optional - only if F-flag is on) */ @@ -1760,7 +1760,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, /* Referenced Link State ID (optional - only if Referenced LS type is non-zero */ if ( (offset < end_offset) && (referenced_ls_type != 0) ) { - proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Referenced Link State ID: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset, 4, "Referenced Link State ID: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4))); offset+=4; } @@ -1804,12 +1804,12 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, /* address_prefix */ dissect_ospf_v3_address_prefix(tvb, offset, prefix_length, ospf_lsa_tree); - + offset+=(prefix_length+31)/32*4; number_prefixes--; - } + } break; case OSPF_V3_LSTYPE_INTRA_AREA_PREFIX: @@ -1824,11 +1824,11 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, referenced_ls_type, val_to_str(referenced_ls_type, v3_ls_type_vals, "Unknown")); /* Referenced Link State ID */ - proto_tree_add_text(ospf_lsa_tree, tvb, offset + 4, 4, "Referenced Link State ID: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset + 4, 4, "Referenced Link State ID: %s", ip_to_str(tvb_get_ptr(tvb, offset + 4, 4))); /* Referenced Advertising Router */ - proto_tree_add_text(ospf_lsa_tree, tvb, offset + 8, 4, "Referenced Advertising Router: %s", + proto_tree_add_text(ospf_lsa_tree, tvb, offset + 8, 4, "Referenced Advertising Router: %s", ip_to_str(tvb_get_ptr(tvb, offset + 8, 4))); offset+=12; @@ -1851,7 +1851,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree, /* address_prefix */ dissect_ospf_v3_address_prefix(tvb, offset, prefix_length, ospf_lsa_tree); - + offset+=(prefix_length+31)/32*4; number_prefixes--; @@ -1921,7 +1921,7 @@ dissect_ospf_options(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version if (options_ospfv2 & OSPF_V2_OPTIONS_DN) { if (options_string[0] != '\0') strcat(options_string, "/"); - strcat(options_string, "DN"); + strcat(options_string, "DN"); } proto_tree_add_text(tree, tvb, offset, 1, "Options: 0x%x (%s)", @@ -1984,7 +1984,7 @@ static void dissect_ospf_v3_prefix_options(tvbuff_t *tvb, int offset, proto_tree guint8 position; position=0; - + prefix_options=tvb_get_guint8(tvb, offset); strcpy(prefix_options_string,""); @@ -2051,15 +2051,15 @@ static void dissect_ospf_v3_address_prefix(tvbuff_t *tvb, int offset, int prefix buffer[bufpos++]=':'; sprintf(bytebuf,"%02x",value); - buffer[bufpos++]=bytebuf[0]; - buffer[bufpos++]=bytebuf[1]; - + buffer[bufpos++]=bytebuf[0]; + buffer[bufpos++]=bytebuf[1]; + position++; offset++; bytes_to_process--; } - buffer[bufpos]=0; + buffer[bufpos]=0; proto_tree_add_text(tree, tvb, start_offset, ((prefix_length+31)/32)*4, "Address Prefix: %s",buffer); } diff --git a/packet-pcnfsd.c b/packet-pcnfsd.c index ce79d28ac9..3ec09c32ee 100644 --- a/packet-pcnfsd.c +++ b/packet-pcnfsd.c @@ -1,7 +1,7 @@ /* packet-pcnfsd.c * Routines for PCNFSD dissection * - * $Id: packet-pcnfsd.c,v 1.9 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pcnfsd.c,v 1.10 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -90,7 +90,7 @@ dissect_pcnfsd_mapreq(tvbuff_t *tvb, int offset, proto_tree *tree) mapreq = tvb_get_ntohl(tvb, offset + 0); if (tree) - proto_tree_add_text(tree, tvb, offset, 4, "Request: %s (%u)", + proto_tree_add_text(tree, tvb, offset, 4, "Request: %s (%u)", val_to_str(mapreq, names_mapreq, "%u"), mapreq); offset += 4; @@ -99,7 +99,7 @@ dissect_pcnfsd_mapreq(tvbuff_t *tvb, int offset, proto_tree *tree) } int -dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, +dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_pcnfsd_mapreq(tvb, offset, tree); @@ -117,7 +117,7 @@ dissect_pcnfsd2_mapid_call(tvbuff_t *tvb, int offset, packet_info *pinfo, { offset = dissect_rpc_string(tvb, tree, hf_pcnfsd_comment, offset, NULL); - offset = dissect_rpc_list(tvb, pinfo, tree, offset, + offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_pcnfsd2_dissect_mapreq_arg_item); return offset; @@ -146,7 +146,7 @@ dissect_pcnfsd2_dissect_mapreq_res_item(tvbuff_t *tvb, int offset, maprstat = tvb_get_ntohl(tvb, offset + 0); if (tree) - proto_tree_add_text(tree, tvb, offset, 4, "Status: %s (%u)", + proto_tree_add_text(tree, tvb, offset, 4, "Status: %s (%u)", val_to_str(maprstat, names_maprstat, "%u"), maprstat); offset += 4; @@ -208,7 +208,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (ident_item) { proto_item_set_len(ident_item, newoffset-offset); } - + if (ident) { pcnfsd_decode_obscure(ident, strlen(ident)); if (ident_tree) @@ -239,7 +239,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (password_item) { proto_item_set_len(password_item, newoffset-offset); } - + if (password) { pcnfsd_decode_obscure(password, strlen(password)); if (password_tree) @@ -330,9 +330,9 @@ static const vsff pcnfsd2_proc[] = { { 9, "PR_REQUEUE", NULL, NULL }, { 10, "PR_HOLD", NULL, NULL }, { 11, "PR_RELEASE", NULL, NULL }, - { 12, "MAPID", + { 12, "MAPID", dissect_pcnfsd2_mapid_call, dissect_pcnfsd2_mapid_reply }, - { 13, "AUTH", + { 13, "AUTH", dissect_pcnfsd2_auth_call, dissect_pcnfsd2_auth_reply }, { 14, "ALERT", NULL, NULL }, { 0, NULL, NULL, NULL } diff --git a/packet-pcnfsd.h b/packet-pcnfsd.h index d562d95ac6..09cc7755c9 100644 --- a/packet-pcnfsd.h +++ b/packet-pcnfsd.h @@ -1,22 +1,22 @@ /* packet-pcnfsd.h * - * $Id: packet-pcnfsd.h,v 1.1 2001/11/06 13:42:35 girlich Exp $ + * $Id: packet-pcnfsd.h,v 1.2 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-pflog.c b/packet-pflog.c index 4a4bd60fa7..1bfe3c0243 100644 --- a/packet-pflog.c +++ b/packet-pflog.c @@ -1,7 +1,7 @@ /* packet-pflog.c * Routines for pflog (OpenBSD Firewall Logging) packet disassembly * - * $Id: packet-pflog.c,v 1.6 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pflog.c,v 1.7 2002/08/28 21:00:25 jmayer Exp $ * * Copyright 2001 Mike Frantzen * All rights reserved. @@ -13,7 +13,7 @@ * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -70,7 +70,7 @@ capture_pflog(const guchar *pd, int offset, int len, packet_counts *ld) } offset += PFLOG_HDRLEN; - + /* Copy out the pflog header to insure alignment */ memcpy(&pflogh, pd, sizeof(pflogh)); pflogh.af = g_ntohl(pflogh.af); diff --git a/packet-pgm.c b/packet-pgm.c index 533af5adb0..64c18e1fc4 100644 --- a/packet-pgm.c +++ b/packet-pgm.c @@ -1,14 +1,14 @@ /* packet-pgm.c * Routines for pgm packet disassembly * - * $Id: packet-pgm.c,v 1.18 2002/08/03 19:50:44 guy Exp $ - * + * $Id: packet-pgm.c,v 1.19 2002/08/28 21:00:25 jmayer Exp $ + * * Copyright (c) 2000 by Talarian Corp * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1999 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -196,7 +196,7 @@ typedef struct { nchar_t res; } pgm_opt_nak_list_t; -/* +/* * To squeeze the whole option into 255 bytes, we * can only have 62 in the list */ @@ -474,15 +474,15 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&opts, offset, sizeof(opts)); opts.total_len = g_ntohs(opts.total_len); - tf = proto_tree_add_text(tree, tvb, offset, - opts.total_len, + tf = proto_tree_add_text(tree, tvb, offset, + opts.total_len, "%s Options (Total Length %d)", pktname, opts.total_len); opts_tree = proto_item_add_subtree(tf, ett_pgm_opts); - proto_tree_add_uint(opts_tree, hf_pgm_opt_type, tvb, + proto_tree_add_uint(opts_tree, hf_pgm_opt_type, tvb, offset, 1, opts.type); - proto_tree_add_uint(opts_tree, hf_pgm_opt_len, tvb, + proto_tree_add_uint(opts_tree, hf_pgm_opt_len, tvb, offset+1, 1, opts.len); - proto_tree_add_uint(opts_tree, hf_pgm_opt_tlen, tvb, + proto_tree_add_uint(opts_tree, hf_pgm_opt_tlen, tvb, offset+2, 2, opts.total_len); offset += 4; @@ -506,19 +506,19 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_join); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint(opt_tree, hf_pgm_opt_join_res, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_join_res, tvb, offset+3, 1, optdata.res); - proto_tree_add_uint(opt_tree, hf_pgm_opt_join_minjoin, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_join_minjoin, tvb, offset+4, 4, g_ntohl(optdata.opt_join_min)); break; @@ -529,16 +529,16 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_parityprm); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint_format(opt_tree, hf_pgm_opt_parity_prm_po, tvb, + proto_tree_add_uint_format(opt_tree, hf_pgm_opt_parity_prm_po, tvb, offset+3, 1, optdata.po, "Parity Parameters: %s (0x%x)", paritystr(optdata.po), optdata.po); @@ -553,16 +553,16 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_paritygrp); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint(opt_tree, hf_pgm_opt_parity_grp_res, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_parity_grp_res, tvb, offset+3, 1, optdata.res); proto_tree_add_uint(opt_tree, hf_pgm_opt_parity_grp_prmgrp, @@ -579,16 +579,16 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_naklist); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint(opt_tree, hf_pgm_opt_nak_res, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_nak_res, tvb, offset+3, 1, optdata.res); optdata.len -= sizeof(pgm_opt_nak_list_t); @@ -597,7 +597,7 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, ptr = nakbuf; j = 0; /* - * Print out 8 per line + * Print out 8 per line */ for (i=0; i < naks; i++) { sprintf(nakbuf+soffset, "0x%lx ", @@ -605,13 +605,13 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, soffset = strlen(nakbuf); if ((++j % 8) == 0) { if (firsttime) { - proto_tree_add_bytes_format(opt_tree, + proto_tree_add_bytes_format(opt_tree, hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, nakbuf, "List(%d): %s", naks, nakbuf); soffset = 0; } else { - proto_tree_add_bytes_format(opt_tree, - hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, + proto_tree_add_bytes_format(opt_tree, + hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, nakbuf, "List: %s", nakbuf); soffset = 0; } @@ -620,13 +620,13 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, } if (soffset) { if (firsttime) { - proto_tree_add_bytes_format(opt_tree, + proto_tree_add_bytes_format(opt_tree, hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, nakbuf, "List(%d): %s", naks, nakbuf); soffset = 0; } else { - proto_tree_add_bytes_format(opt_tree, - hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, + proto_tree_add_bytes_format(opt_tree, + hf_pgm_opt_nak_list, tvb, offset+4, optdata.len, nakbuf, "List: %s", nakbuf); soffset = 0; } @@ -639,25 +639,25 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_res, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_res, tvb, offset+3, 1, optdata.res); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_tsp, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_tsp, tvb, offset+4, 4, optdata.tsp); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_afi, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_afi, tvb, offset+8, 2, g_ntohs(optdata.acker_afi)); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_res2, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccdata_res2, tvb, offset+10, 2, g_ntohs(optdata.res2)); switch (g_ntohs(optdata.acker_afi)) { @@ -688,25 +688,25 @@ dissect_pgmopts(tvbuff_t *tvb, int offset, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&optdata, offset, sizeof(optdata)); opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_type, tvb, offset, 1, genopts.type); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_len, tvb, offset+1, 1, genopts.len); - proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, + proto_tree_add_uint(opt_tree, hf_pgm_genopt_opx, tvb, offset+2, 1, genopts.opx); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_res, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_res, tvb, offset+3, 1, optdata.res); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_tsp, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_tsp, tvb, offset+4, 4, optdata.tsp); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_afi, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_afi, tvb, offset+8, 2, g_ntohs(optdata.acker_afi)); - proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_lossrate, tvb, + proto_tree_add_uint(opt_tree, hf_pgm_opt_ccfeedbk_lossrate, tvb, offset+10, 2, g_ntohs(optdata.loss_rate)); switch (g_ntohs(optdata.acker_afi)) { @@ -763,12 +763,12 @@ decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, next_tvb = tvb_new_subset(tvb, offset, -1, -1); /* do lookup with the subdissector table */ - found = dissector_try_port(subdissector_table, pgmhdr->sport, + found = dissector_try_port(subdissector_table, pgmhdr->sport, next_tvb, pinfo, tree); if (found) return; - found = dissector_try_port(subdissector_table, pgmhdr->dport, + found = dissector_try_port(subdissector_table, pgmhdr->dport, next_tvb, pinfo, tree); if (found) return; @@ -781,7 +781,7 @@ decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, call_dissector(data_handle,next_tvb, pinfo, tree); } -int +int total_size(tvbuff_t *tvb, pgm_type *hdr) { int bytes = sizeof(pgm_type); @@ -900,7 +900,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_pgm, + ti = proto_tree_add_protocol_format(tree, proto_pgm, tvb, offset, total_size(tvb, &pgmhdr), "Pragmatic General Multicast: Type %s" " SrcPort %u, DstPort %u, GSI %s", pktname, @@ -910,30 +910,30 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pgm_tree = proto_item_add_subtree(ti, ett_pgm); proto_tree_add_uint(pgm_tree, hf_pgm_main_sport, tvb, offset, 2, pgmhdr.sport); - proto_tree_add_uint(pgm_tree, hf_pgm_main_dport, tvb, offset+2, + proto_tree_add_uint(pgm_tree, hf_pgm_main_dport, tvb, offset+2, 2, pgmhdr.dport); - proto_tree_add_uint(pgm_tree, hf_pgm_main_type, tvb, + proto_tree_add_uint(pgm_tree, hf_pgm_main_type, tvb, offset+4, 1, pgmhdr.type); - tf = proto_tree_add_uint_format(pgm_tree, hf_pgm_main_opts, tvb, - offset+5, 1, pgmhdr.opts, "Options: %s (0x%x)", + tf = proto_tree_add_uint_format(pgm_tree, hf_pgm_main_opts, tvb, + offset+5, 1, pgmhdr.opts, "Options: %s (0x%x)", optsstr(pgmhdr.opts), pgmhdr.opts); opt_tree = proto_item_add_subtree(tf, ett_pgm_optbits); - proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_opt, tvb, + proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_opt, tvb, offset+5, 1, (pgmhdr.opts & PGM_OPT)); - proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_netsig, tvb, + proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_netsig, tvb, offset+5, 1, (pgmhdr.opts & PGM_OPT_NETSIG)); - proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_varlen, tvb, + proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_varlen, tvb, offset+5, 1, (pgmhdr.opts & PGM_OPT_VAR_PKTLEN)); - proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_parity, tvb, + proto_tree_add_boolean(opt_tree, hf_pgm_main_opts_parity, tvb, offset+5, 1, (pgmhdr.opts & PGM_OPT_PARITY)); - proto_tree_add_uint(pgm_tree, hf_pgm_main_cksum, tvb, offset+6, + proto_tree_add_uint(pgm_tree, hf_pgm_main_cksum, tvb, offset+6, 2, pgmhdr.cksum); - proto_tree_add_bytes(pgm_tree, hf_pgm_main_gsi, tvb, offset+8, + proto_tree_add_bytes(pgm_tree, hf_pgm_main_gsi, tvb, offset+8, 6, pgmhdr.gsi); - proto_tree_add_uint(pgm_tree, hf_pgm_main_tsdulen, tvb, + proto_tree_add_uint(pgm_tree, hf_pgm_main_tsdulen, tvb, offset+14, 2, pgmhdr.tsdulen); offset = sizeof(pgm_type); @@ -943,15 +943,15 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PGM_SPM_PCKT: type_tree = proto_item_add_subtree(tf, ett_pgm_spm); - proto_tree_add_uint(type_tree, hf_pgm_spm_sqn, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_sqn, tvb, offset, 4, spm.sqn); - proto_tree_add_uint(type_tree, hf_pgm_spm_trail, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_trail, tvb, offset+4, 4, spm.trail); - proto_tree_add_uint(type_tree, hf_pgm_spm_lead, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_lead, tvb, offset+8, 4, spm.lead); - proto_tree_add_uint(type_tree, hf_pgm_spm_pathafi, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_pathafi, tvb, offset+10, 2, spm.path_afi); - proto_tree_add_uint(type_tree, hf_pgm_spm_res, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_res, tvb, offset+12, 2, spm.res); switch (spm.path_afi) { @@ -985,9 +985,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PGM_ODATA_PCKT: { type_tree = proto_item_add_subtree(tf, ett_pgm_data); - proto_tree_add_uint(type_tree, hf_pgm_spm_sqn, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_sqn, tvb, offset, 4, data.sqn); - proto_tree_add_uint(type_tree, hf_pgm_spm_trail, tvb, + proto_tree_add_uint(type_tree, hf_pgm_spm_trail, tvb, offset+4, 4, data.trail); if ((pgmhdr.opts & PGM_OPT) == FALSE) @@ -1005,11 +1005,11 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PGM_NCF_PCKT: type_tree = proto_item_add_subtree(tf, ett_pgm_nak); - proto_tree_add_uint(type_tree, hf_pgm_nak_sqn, tvb, + proto_tree_add_uint(type_tree, hf_pgm_nak_sqn, tvb, offset, 4, nak.sqn); - proto_tree_add_uint(type_tree, hf_pgm_nak_srcafi, tvb, + proto_tree_add_uint(type_tree, hf_pgm_nak_srcafi, tvb, offset+4, 2, nak.src_afi); - proto_tree_add_uint(type_tree, hf_pgm_nak_srcres, tvb, + proto_tree_add_uint(type_tree, hf_pgm_nak_srcres, tvb, offset+6, 2, nak.src_res); switch (nak.src_afi) { @@ -1032,9 +1032,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - proto_tree_add_uint(type_tree, hf_pgm_nak_grpafi, tvb, + proto_tree_add_uint(type_tree, hf_pgm_nak_grpafi, tvb, offset+12, 2, nak.grp_afi); - proto_tree_add_uint(type_tree, hf_pgm_nak_grpres, tvb, + proto_tree_add_uint(type_tree, hf_pgm_nak_grpres, tvb, offset+14, 2, nak.grp_res); switch (nak.grp_afi) { @@ -1067,9 +1067,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PGM_ACK_PCKT: type_tree = proto_item_add_subtree(tf, ett_pgm_ack); - proto_tree_add_uint(type_tree, hf_pgm_ack_sqn, tvb, + proto_tree_add_uint(type_tree, hf_pgm_ack_sqn, tvb, offset, 4, ack.rx_max_sqn); - proto_tree_add_uint(type_tree, hf_pgm_ack_bitmap, tvb, + proto_tree_add_uint(type_tree, hf_pgm_ack_bitmap, tvb, offset+4, 4, ack.bitmap); if ((pgmhdr.opts & PGM_OPT) == FALSE) @@ -1091,13 +1091,13 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } pktname = NULL; } -static const true_false_string opts_present = { +static const true_false_string opts_present = { "Present", - "Not Present" + "Not Present" }; /* Register all the bits needed with the filtering engine */ -void +void proto_register_pgm(void) { static hf_register_info hf[] = { @@ -1117,11 +1117,11 @@ proto_register_pgm(void) { "Options", "pgm.hdr.opts.opt", FT_BOOLEAN, BASE_NONE, TFS(&opts_present), PGM_OPT, "", HFILL }}, { &hf_pgm_main_opts_netsig, - { "Network Significant Options", "pgm.hdr.opts.netsig", + { "Network Significant Options", "pgm.hdr.opts.netsig", FT_BOOLEAN, BASE_NONE, TFS(&opts_present), PGM_OPT_NETSIG, "", HFILL }}, { &hf_pgm_main_opts_varlen, - { "Variable length Parity Packet Option", "pgm.hdr.opts.varlen", + { "Variable length Parity Packet Option", "pgm.hdr.opts.varlen", FT_BOOLEAN, BASE_NONE, TFS(&opts_present), PGM_OPT_VAR_PKTLEN, "", HFILL }}, { &hf_pgm_main_opts_parity, @@ -1131,19 +1131,19 @@ proto_register_pgm(void) { "Checksum", "pgm.hdr.cksum", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_main_gsi, - { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_HEX, + { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_main_tsdulen, - { "Transport Service Data Unit Length", "pgm.hdr.tsdulen", FT_UINT16, + { "Transport Service Data Unit Length", "pgm.hdr.tsdulen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, { &hf_pgm_spm_sqn, { "Sequence number", "pgm.spm.sqn", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_spm_trail, - { "Trailing Edge Sequence Number", "pgm.spm.trail", FT_UINT32, BASE_HEX, + { "Trailing Edge Sequence Number", "pgm.spm.trail", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_spm_lead, - { "Leading Edge Sequence Number", "pgm.spm.lead", FT_UINT32, BASE_HEX, + { "Leading Edge Sequence Number", "pgm.spm.lead", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_spm_pathafi, { "Path NLA AFI", "pgm.spm.pathafi", FT_UINT16, BASE_DEC, @@ -1155,13 +1155,13 @@ proto_register_pgm(void) { "Path NLA", "pgm.spm.path", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_pgm_data_sqn, - { "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX, + { "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_data_trail, - { "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX, + { "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_nak_sqn, - { "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX, + { "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_nak_srcafi, { "Source NLA AFI", "pgm.nak.srcafi", FT_UINT16, BASE_DEC, @@ -1182,10 +1182,10 @@ proto_register_pgm(void) { "Multicast Group NLA", "pgm.nak.grp", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_pgm_ack_sqn, - { "Maximum Received Sequence Number", "pgm.ack.maxsqn", FT_UINT32, + { "Maximum Received Sequence Number", "pgm.ack.maxsqn", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_ack_bitmap, - { "Packet Bitmap", "pgm.ack.bitmap", FT_UINT32, BASE_HEX, + { "Packet Bitmap", "pgm.ack.bitmap", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_pgm_opt_type, { "Type", "pgm.opts.type", FT_UINT8, BASE_HEX, @@ -1291,23 +1291,23 @@ proto_register_pgm(void) /* * Register configuration preferences for UDP encapsulation - * (Note: Initially the ports are set to zero so the + * (Note: Initially the ports are set to zero so the * dissecting of PGM encapsulated in UPD packets * is off by default) */ pgm_module = prefs_register_protocol(proto_pgm, proto_rereg_pgm); prefs_register_uint_preference(pgm_module, "udp.encap_ucast_port", - "PGM Encap Unicast Port (standard is 3055)", + "PGM Encap Unicast Port (standard is 3055)", "PGM Encap is PGM packets encapsulated in UDP packets" - " (Note: This option is off, i.e. port is 0, by default)", + " (Note: This option is off, i.e. port is 0, by default)", 10, &udp_encap_ucast_port); old_encap_ucast_port = udp_encap_ucast_port; prefs_register_uint_preference(pgm_module, "udp.encap_mcast_port", - "PGM Encap Multicast Port (standard is 3056)", + "PGM Encap Multicast Port (standard is 3056)", "PGM Encap is PGM packets encapsulated in UDP packets" - " (Note: This option is off, i.e. port is 0, by default)", + " (Note: This option is off, i.e. port is 0, by default)", 10, &udp_encap_mcast_port); old_encap_mcast_port = udp_encap_mcast_port; @@ -1328,7 +1328,7 @@ proto_reg_handoff_pgm(void) dissector_add("udp.port", udp_encap_mcast_port, pgm_handle); dissector_add("ip.proto", IP_PROTO_PGM, pgm_handle); - + data_handle = find_dissector("data"); } diff --git a/packet-pim.c b/packet-pim.c index 3639856758..840fd27ad6 100644 --- a/packet-pim.c +++ b/packet-pim.c @@ -2,28 +2,28 @@ * Routines for PIM disassembly * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * - * $Id: packet-pim.c,v 1.41 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pim.c,v 1.42 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -109,9 +109,9 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 pim_cksum, computed_cksum; vec_t cksum_vec[1]; proto_tree *pim_tree = NULL; - proto_item *ti; + proto_item *ti; proto_tree *pimopt_tree = NULL; - proto_item *tiopt; + proto_item *tiopt; if (!proto_is_protocol_enabled(proto_pim)) { /* @@ -343,9 +343,9 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 mask_len; guint8 adr_len; proto_tree *grouptree = NULL; - proto_item *tigroup; + proto_item *tigroup; proto_tree *subtree = NULL; - proto_item *tisub; + proto_item *tisub; proto_tree_add_text(pimopt_tree, tvb, offset, 4, "Upstream-neighbor: %s", @@ -598,7 +598,7 @@ static const value_string type2vals[] = { * is run over IPv6, the rules for computing the PIM checksum from the * draft in question, not from RFC 2362, should be used). */ -static void +static void dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; guint8 pim_typever; @@ -608,9 +608,9 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 phdr[2]; char *typestr; proto_tree *pim_tree = NULL; - proto_item *ti; + proto_item *ti; proto_tree *pimopt_tree = NULL; - proto_item *tiopt; + proto_item *tiopt; if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIM"); @@ -634,16 +634,16 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { PIM_VER(pim_typever)); } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, typestr); + col_add_str(pinfo->cinfo, COL_INFO, typestr); if (tree) { ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, FALSE); pim_tree = proto_item_add_subtree(ti, ett_pim); proto_tree_add_uint(pim_tree, hf_pim_version, tvb, offset, 1, - PIM_VER(pim_typever)); + PIM_VER(pim_typever)); proto_tree_add_uint(pim_tree, hf_pim_type, tvb, offset, 1, - PIM_TYPE(pim_typever)); + PIM_TYPE(pim_typever)); pim_cksum = tvb_get_ntohs(tvb, offset + 2); length = tvb_length(tvb); @@ -750,12 +750,12 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hello_opt = tvb_get_ntohs(tvb, offset); opt_len = tvb_get_ntohs(tvb, offset + 2); - + if(opt_len == 2) opt_value = tvb_get_ntohs(tvb, offset + 4); if(opt_len == 4) opt_value = tvb_get_ntohl(tvb, offset + 4); - + switch(hello_opt) { case 1: /* holdtime */ holdtime = opt_value; @@ -767,11 +767,11 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { { proto_tree *sub_tree = NULL; proto_item *landelay_option; - + landelay_option = proto_tree_add_text(pim_tree, tvb, offset, -1, "LAN Prune Delay"); sub_tree = proto_item_add_subtree(landelay_option, ett_pim); - + lan_delay = (opt_value & 0x7f00) >> 8; override_interval = opt_value & 0xff; proto_tree_add_text(sub_tree, tvb, offset, 4 + opt_len, @@ -792,7 +792,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text(pimopt_tree, tvb, offset, 4 + opt_len, "Generation ID: %d", opt_value); break; - + default: proto_tree_add_text(pimopt_tree, tvb, offset, 4 + opt_len, "Unknown option: %d len: %d value: 0x%x", @@ -810,7 +810,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 v_hl; tvbuff_t *next_tvb; proto_tree *flag_tree = NULL; - proto_item *tiflag; + proto_item *tiflag; flags = tvb_get_ntohl(tvb, offset); tiflag = proto_tree_add_text(pimopt_tree, tvb, offset, 4, @@ -823,7 +823,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { decode_boolean_bitfield(flags, 0x40000000, 32, "Null-Register", "Not Null-Register")); offset += 4; - + /* * The rest of the packet is a multicast data packet. */ @@ -914,9 +914,9 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int ngroup, i, njoin, nprune, j; guint16 holdtime; proto_tree *grouptree = NULL; - proto_item *tigroup; + proto_item *tigroup; proto_tree *subtree = NULL; - proto_item *tisub; + proto_item *tisub; if (PIM_TYPE(pim_typever) != 7) { /* not graft-ack */ @@ -995,7 +995,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int frpcnt; guint16 holdtime; proto_tree *grouptree = NULL; - proto_item *tigroup; + proto_item *tigroup; proto_tree_add_text(pimopt_tree, tvb, offset, 2, "Fragment tag: 0x%04x", tvb_get_ntohs(tvb, offset)); diff --git a/packet-pim.h b/packet-pim.h index 04f26f4eae..724233482f 100644 --- a/packet-pim.h +++ b/packet-pim.h @@ -1,22 +1,22 @@ /* packet-pim.h * Declarations of routines for IGMP/PIMv1 packet disassembly * - * $Id: packet-pim.h,v 1.3 2001/07/02 09:23:02 guy Exp $ + * $Id: packet-pim.h,v 1.4 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-pop.c b/packet-pop.c index 5b7227249a..b8c23bafa3 100644 --- a/packet-pop.c +++ b/packet-pop.c @@ -2,24 +2,24 @@ * Routines for pop packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-pop.c,v 1.32 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pop.c,v 1.33 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -47,7 +47,7 @@ static dissector_handle_t data_handle; #define TCP_PORT_POP 110 static gboolean response_is_continuation(const guchar *data); - + static void dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/packet-portmap.c b/packet-portmap.c index b245d7641a..19bb8ff680 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.38 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-portmap.c,v 1.39 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -102,7 +102,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_portmap_port, tvb, offset+12, 4, FALSE); } - + return offset+16; } @@ -127,7 +127,7 @@ dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } } } - + offset = dissect_rpc_uint32(tvb, tree, hf_portmap_port, offset); return offset; @@ -157,7 +157,7 @@ dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_portmap_port, tvb, offset+12, 4, FALSE); } - + return offset+16; } @@ -222,7 +222,7 @@ dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_uint(subtree, hf_portmap_version, tvb, offset+4, 4, version); proto_tree_add_uint_format(subtree, hf_portmap_proto, tvb, - offset+8, 4, proto, + offset+8, 4, proto, "Protocol: %s (0x%02x)", ipprotostr(proto), proto); proto_tree_add_uint(subtree, hf_portmap_port, tvb, offset+12, 4, port); @@ -355,7 +355,7 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree prog = tvb_get_ntohl(tvb, offset); if (rpcb_tree) proto_tree_add_uint_format(rpcb_tree, hf_portmap_rpcb_prog, tvb, - offset, 4, prog, + offset, 4, prog, "Program: %s (%u)", rpc_prog_name(prog), prog); offset += 4; diff --git a/packet-portmap.h b/packet-portmap.h index 7bdd59f5ad..804638a541 100644 --- a/packet-portmap.h +++ b/packet-portmap.h @@ -1,22 +1,22 @@ /* packet-portmap.h * - * $Id: packet-portmap.h,v 1.4 2000/08/11 13:34:03 deniel Exp $ - * + * $Id: packet-portmap.h,v 1.5 2002/08/28 21:00:25 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ppp.c b/packet-ppp.c index 54587d47ad..b5784de9a1 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,24 +1,24 @@ /* packet-ppp.c * Routines for ppp packet disassembly * - * $Id: packet-ppp.c,v 1.96 2002/08/18 15:30:38 gerald Exp $ + * $Id: packet-ppp.c,v 1.97 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * * This file created and by Mike Hall <mlh@io.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -160,7 +160,7 @@ static gint ppp_fcs_decode = 0; /* 0 = No FCS, 1 = 16 bit FCS, 2 = 32 bit FCS */ #define FCS_16 1 #define FCS_32 2 gboolean ppp_vj_decomp = TRUE; /* Default to VJ header decompression */ - + /* * For Default Protocol ID negotiated with PPPMuxCP. We need to * this ID so that if the first subframe doesn't have protocol @@ -299,7 +299,7 @@ static const value_string ppp_vals[] = { }; /* CP (LCP, IPCP, etc.) codes. - * from pppd fsm.h + * from pppd fsm.h */ #define CONFREQ 1 /* Configuration Request */ #define CONFACK 2 /* Configuration Ack */ @@ -329,7 +329,7 @@ static const value_string cp_vals[] = { #define IDENT 12 /* Identification */ #define TIMEREMAIN 13 /* Time remaining */ -/* +/* * CCP-specific packet types. */ #define RESETREQ 14 /* Reset Request */ @@ -383,14 +383,14 @@ static const value_string ccp_vals[] = { {CODEREJ, "Code Reject" }, {RESETREQ, "Reset Request" }, {RESETACK, "Reset Ack" }, - {0, NULL } + {0, NULL } }; static const value_string cbcp_vals[] = { {CBREQ, "Callback Request" }, {CBRES, "Callback Response" }, {CBACK, "Callback Ack" }, - {0, NULL } + {0, NULL } }; static const value_string bap_vals[] = { @@ -450,7 +450,7 @@ static const value_string bap_phone_delta_subopt_vals[] = { /* * Cause codes for Cause. * - * The following code table is taken from packet-q931.c but is slightly + * The following code table is taken from packet-q931.c but is slightly * adapted to BAP protocol. */ static const value_string q931_cause_code_vals[] = { @@ -854,7 +854,7 @@ static const ip_tcp_opt lcp_opts[] = { #define N_LCP_OPTS (sizeof lcp_opts / sizeof lcp_opts[0]) -/* +/* * CHAP Algorithms */ #define CHAP_ALG_MD5 0x05 /* CHAP with MD5 */ @@ -976,7 +976,7 @@ static const ip_tcp_opt ipcp_opts[] = { #define CI_CCP_RESERVED 255 /* Reserved (RFC1962) */ /* - * Microsoft Point-To-Point Compression (MPPC) and Encryption (MPPE) + * Microsoft Point-To-Point Compression (MPPC) and Encryption (MPPE) * supported bits. */ #define MPPC_SUPPORTED_BITS_C 0x00000001 /* MPPC negotiation */ @@ -1071,7 +1071,7 @@ static const ip_tcp_opt ccp_opts[] = { */ #define CI_CBCP_NO_CALLBACK 1 /* No callback */ #define CI_CBCP_CB_USER 2 /* Callback to a user-specified number */ -#define CI_CBCP_CB_PRE 3 /* Callback to a pre-specified or +#define CI_CBCP_CB_PRE 3 /* Callback to a pre-specified or administrator specified number */ #define CI_CBCP_CB_ANY 4 /* Callback to any of a list of numbers */ @@ -1226,7 +1226,7 @@ static const ip_tcp_opt bap_opts[] = { #define N_BAP_OPTS (sizeof bap_opts / sizeof bap_opts[0]) -static void dissect_ppp(tvbuff_t *tvb, packet_info *pinfo, +static void dissect_ppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static const value_string pap_vals[] = { @@ -1382,7 +1382,7 @@ static const unsigned short fcstab_16[256] = { 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; - + /* ******************************************************************************* * DETAILS : Calculate a new FCS-16 given the current FCS-16 and the new data. @@ -1406,7 +1406,7 @@ fcs16(register guint16 fcs, tvbuff_t * tvbuff) return (fcs ^ 0xffff); } - + /* ******************************************************************************* * DETAILS : Calculate a new FCS-32 given the current FCS-32 and the new data. @@ -1525,7 +1525,7 @@ dissect_lcp_protocol_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, guint16 protocol; proto_item *tf; proto_tree *field_tree = NULL; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1550,7 +1550,7 @@ dissect_lcp_authprot_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, guint8 algorithm; proto_item *tf; proto_tree *field_tree = NULL; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1564,9 +1564,9 @@ dissect_lcp_authprot_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, if (length > 0) { if (protocol == PPP_CHAP) { algorithm = tvb_get_guint8(tvb, offset); - proto_tree_add_text(field_tree, tvb, offset, length, - "Algorithm: %s (0x%02x)", - val_to_str(algorithm, chap_alg_vals, "Unknown"), + proto_tree_add_text(field_tree, tvb, offset, length, + "Algorithm: %s (0x%02x)", + val_to_str(algorithm, chap_alg_vals, "Unknown"), algorithm); offset++; } else { @@ -1593,7 +1593,7 @@ dissect_lcp_fcs_alternatives_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_item *tf; proto_tree *field_tree = NULL; guint8 alternatives; - + alternatives = tvb_get_guint8(tvb, offset + 2); tf = proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%02x", optp->name, alternatives); @@ -1626,7 +1626,7 @@ dissect_lcp_numbered_mode_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, { proto_item *tf; proto_tree *field_tree = NULL; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1660,7 +1660,7 @@ dissect_lcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, proto_item *tf; proto_tree *field_tree = NULL; guint8 operation; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1824,7 +1824,7 @@ dissect_lcp_internationalization_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_item *tf; proto_tree *field_tree = NULL; guint32 charset; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1850,7 +1850,7 @@ dissect_ipcp_addrs_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, { proto_item *tf; proto_tree *field_tree = NULL; - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s", optp->name, length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -1877,7 +1877,7 @@ static void dissect_ipcp_addr_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, static void dissect_pppmuxcp_def_pid_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, guint length, packet_info *pinfo _U_, proto_tree *tree) -{ +{ pppmux_def_prot_id = tvb_get_ntohs(tvb, offset + 2); proto_tree_add_text(tree, tvb, offset + 2, length - 2, "%s: %s (0x%02x)",optp->name, val_to_str(pppmux_def_prot_id, ppp_vals, "Unknown"), pppmux_def_prot_id); @@ -1894,7 +1894,7 @@ dissect_ccp_stac_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, guint8 check_mode; if (length == 6) { - proto_tree_add_text(tree, tvb, offset, length, + proto_tree_add_text(tree, tvb, offset, length, "%s (Ascend Proprietary version)", optp->name); /* We don't know how to decode the following 4 octets, since there's no public document that describe their usage. */ @@ -1906,9 +1906,9 @@ dissect_ccp_stac_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, "History Count: %u", tvb_get_ntohs(tvb, offset + 2)); check_mode = tvb_get_guint8(tvb, offset + 4); proto_tree_add_text(field_tree, tvb, offset + 4, 1, - "Check Mode: %s (0x%02X)", + "Check Mode: %s (0x%02X)", val_to_str(check_mode, stac_checkmode_vals, "Unknown"), - check_mode); + check_mode); } } @@ -1922,26 +1922,26 @@ dissect_ccp_mppc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, guint32 supported_bits; supported_bits = tvb_get_ntohl(tvb, offset + 2); - tf = proto_tree_add_text(tree, tvb, offset, length, + tf = proto_tree_add_text(tree, tvb, offset, length, "%s: Supported Bits: 0x%08X", optp->name, supported_bits); flags_tree = proto_item_add_subtree(tf, *optp->subtree_index); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPC_SUPPORTED_BITS_C, 8*4, + decode_boolean_bitfield(supported_bits, MPPC_SUPPORTED_BITS_C, 8*4, "Desire to negotiate MPPC", "NO Desire to negotiate MPPC")); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_D, 8*4, + decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_D, 8*4, "Obsolete (should NOT be 1)", "Obsolete (should ALWAYS be 0)")); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_L, 8*4, + decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_L, 8*4, "40-bit encryption ON", "40-bit encryption OFF")); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_S, 8*4, + decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_S, 8*4, "128-bit encryption ON", "128-bit encryption OFF")); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_M, 8*4, + decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_M, 8*4, "56-bit encryption ON", "56-bit encryption OFF")); proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s", - decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_H, 8*4, + decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_H, 8*4, "Stateless mode ON", "Stateless mode OFF")); } @@ -1959,7 +1959,7 @@ dissect_ccp_bsdcomp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_tree_add_text(field_tree, tvb, offset + 2, 1, "Version: %u", tvb_get_guint8(tvb, offset + 2) >> 5); proto_tree_add_text(field_tree, tvb, offset + 2, 1, - "Dict: %u bits", + "Dict: %u bits", tvb_get_guint8(tvb, offset + 2) & 0x1f); } @@ -1980,14 +1980,14 @@ dissect_ccp_lzsdcp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, "History Count: %u", tvb_get_ntohs(tvb, offset + 2)); check_mode = tvb_get_guint8(tvb, offset + 4); proto_tree_add_text(field_tree, tvb, offset + 4, 1, - "Check Mode: %s (0x%02X)", + "Check Mode: %s (0x%02X)", val_to_str(check_mode, lzsdcp_checkmode_vals, "Unknown"), - check_mode); + check_mode); process_mode = tvb_get_guint8(tvb, offset + 5); proto_tree_add_text(field_tree, tvb, offset + 5, 1, - "Process Mode: %s (0x%02X)", + "Process Mode: %s (0x%02X)", val_to_str(process_mode, lzsdcp_processmode_vals, "Unkown"), - process_mode); + process_mode); } static void @@ -2004,7 +2004,7 @@ dissect_ccp_mvrca_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, proto_tree_add_text(field_tree, tvb, offset + 2, 1, "Features: %u", tvb_get_guint8(tvb, offset + 2) >> 5); proto_tree_add_text(field_tree, tvb, offset + 2, 1, - "Packet by Packet flag: %s", + "Packet by Packet flag: %s", tvb_get_guint8(tvb, offset + 2) & 0x20 ? "true" : "false"); proto_tree_add_text(field_tree, tvb, offset + 2, 1, "History: %u", tvb_get_guint8(tvb, offset + 2) & 0x20); @@ -2028,10 +2028,10 @@ dissect_ccp_deflate_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, "Window: %u", hi_nibble(tvb_get_guint8(tvb, offset + 2))); method = lo_nibble(tvb_get_guint8(tvb, offset + 2)); proto_tree_add_text(field_tree, tvb, offset + 2, 1, - "Method: %s (0x%02x)", + "Method: %s (0x%02x)", method == 0x08 ? "zlib compression" : "other", method); proto_tree_add_text(field_tree, tvb, offset + 3, 1, - "Sequence number check method: %u", + "Sequence number check method: %u", tvb_get_guint8(tvb, offset + 2) & 0x03); } @@ -2056,7 +2056,7 @@ dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, gint addr_len; guint8 buf[256]; /* Since length field in Callback Conf Option is 8 bits, 256-octet buf is large enough. */ - + tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); @@ -2064,14 +2064,14 @@ dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, "Callback delay: %u", tvb_get_guint8(tvb, offset + 2)); offset += 3; length -= 3; - + while (length > 0) { - ta = proto_tree_add_text(field_tree, tvb, offset, length, + ta = proto_tree_add_text(field_tree, tvb, offset, length, "Callback Address"); - addr_type = tvb_get_guint8(tvb, offset); + addr_type = tvb_get_guint8(tvb, offset); addr_tree = proto_item_add_subtree(tf, ett_cbcp_callback_opt_addr); - proto_tree_add_text(addr_tree, tvb, offset, 1, - "Address Type: %s (%u)", + proto_tree_add_text(addr_tree, tvb, offset, 1, + "Address Type: %s (%u)", ((addr_type == 1) ? "PSTN/ISDN" : "Other"), addr_type); offset++; length--; @@ -2141,13 +2141,13 @@ dissect_bap_phone_delta_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, while (length > 0) { subopt_type = tvb_get_guint8(tvb, offset); subopt_len = tvb_get_guint8(tvb, offset + 1); - ti = proto_tree_add_text(field_tree, tvb, offset, subopt_len, + ti = proto_tree_add_text(field_tree, tvb, offset, subopt_len, "Sub-Option (%d byte%s)", subopt_len, plurality(subopt_len, "", "s")); suboption_tree = proto_item_add_subtree(ti, ett_bap_phone_delta_subopt); proto_tree_add_text(suboption_tree, tvb, offset, 1, - "Sub-Option Type: %s (%u)", + "Sub-Option Type: %s (%u)", val_to_str(subopt_type, bap_phone_delta_subopt_vals, "Unknown"), subopt_type); @@ -2156,17 +2156,17 @@ dissect_bap_phone_delta_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, switch (subopt_type) { case BAP_PHONE_DELTA_SUBOPT_UNIQ_DIGIT: - proto_tree_add_text(suboption_tree, tvb, offset + 2, 1, "Uniq Digit: %u", + proto_tree_add_text(suboption_tree, tvb, offset + 2, 1, "Uniq Digit: %u", tvb_get_guint8(tvb, offset + 2)); break; case BAP_PHONE_DELTA_SUBOPT_SUBSC_NUM: tvb_get_nstringz0(tvb, offset + 2, subopt_len - 2, buf); - proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2, + proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2, "Subscriber Number: %s", buf); break; case BAP_PHONE_DELTA_SUBOPT_PHONENUM_SUBADDR: tvb_get_nstringz0(tvb, offset + 2, subopt_len - 2, buf); - proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2, + proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2, "Phone Number Sub Address: %s", buf); break; default: @@ -2188,7 +2188,7 @@ dissect_bap_reason_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, 8 bits, 256-octets buf is large enough */ tvb_get_nstringz0(tvb, offset + 2, length - 2, buf); - proto_tree_add_text(tree, tvb, offset, length, "%s: %s", + proto_tree_add_text(tree, tvb, offset, length, "%s: %s", optp->name, buf); } @@ -2197,7 +2197,7 @@ dissect_bap_link_disc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, guint length, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%04x", + proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%04x", optp->name, tvb_get_ntohs(tvb, offset + 2)); } @@ -2215,12 +2215,12 @@ dissect_bap_call_status_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, status = tvb_get_guint8(tvb, offset + 2); proto_tree_add_text(field_tree, tvb, offset + 2, 1, - "Status: %s (0x%02x)", + "Status: %s (0x%02x)", val_to_str(status, q931_cause_code_vals, "Unknown"), status); action = tvb_get_guint8(tvb, offset + 3); proto_tree_add_text(field_tree, tvb, offset + 3, 1, - "Action: %s (0x%02x)", + "Action: %s (0x%02x)", val_to_str(action, bap_call_status_opt_action_vals, "Unknown"), action); } @@ -2431,7 +2431,7 @@ dissect_bacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - + proto_item *ti; proto_tree *fh_tree = NULL; proto_item *tf; @@ -2468,7 +2468,7 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 4; length -= 4; - if (type == BAP_CRES || type == BAP_CBRES || + if (type == BAP_CRES || type == BAP_CBRES || type == BAP_LDQRES || type == BAP_CSRES) { resp_code = tvb_get_guint8(tvb, offset); proto_tree_add_text(fh_tree, tvb, offset, 1, "Response Code: %s (0x%02x)", @@ -2495,7 +2495,7 @@ dissect_comp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *comp_data_tree; if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, + col_set_str(pinfo->cinfo, COL_PROTOCOL, proto_get_protocol_short_name(proto_comp_data)); if(check_col(pinfo->cinfo, COL_INFO)) @@ -2520,7 +2520,7 @@ dissect_pppmuxcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #define PPPMUX_PFF_BIT_SET 0x80 #define PPPMUX_LXT_BIT_SET 0x40 -static void +static void dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *mux_tree, *hdr_tree, *sub_tree, *flag_tree; @@ -2529,26 +2529,26 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flags, byte; guint16 length; static guint16 pid; - tvbuff_t *next_tvb; + tvbuff_t *next_tvb; int offset = 0, length_remaining; int length_field = 0, pid_field = 0,hdr_length = 0; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPP PPPMux"); - + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "PPP Multiplexing"); - + length_remaining = tvb_reported_length(tvb); - + if (tree) { ti = proto_tree_add_item(tree, proto_pppmux, tvb, 0, -1, FALSE); mux_tree = proto_item_add_subtree(ti,ett_pppmux); - + while (length_remaining > 0) { - + flags = tvb_get_guint8(tvb,offset) & PPPMUX_FLAGS_MASK; - + if (flags && PPPMUX_LXT_BIT_SET ) { length = tvb_get_ntohs(tvb,offset) & 0x3fff; length_field = 2; @@ -2556,7 +2556,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_guint8(tvb,offset) & 0x3f; length_field = 1; } - + if (flags && PPPMUX_PFF_BIT_SET) { byte = tvb_get_guint8(tvb,offset + length_field); if (byte && PFC_BIT) { /* Compressed PID field*/ @@ -2568,52 +2568,52 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } else { if (!pid){ /*No Last PID, hence use the default */ - if (pppmux_def_prot_id) + if (pppmux_def_prot_id) pid = pppmux_def_prot_id; } } - + hdr_length = length_field + pid_field; - + ti = proto_tree_add_text(mux_tree, tvb, offset, length + length_field, "PPPMux Sub-frame"); sub_tree = proto_item_add_subtree(ti,ett_pppmux_subframe); sub_ti = proto_tree_add_text(sub_tree, tvb, offset, hdr_length,"Header field"); - + hdr_tree = proto_item_add_subtree(sub_ti,ett_pppmux_subframe_hdr); ti = proto_tree_add_text(hdr_tree, tvb, offset, length_field, "PFF/LXT: 0x%02X", flags); - + flag_tree = proto_item_add_subtree(ti,ett_pppmux_subframe_flags); proto_tree_add_text(flag_tree,tvb,offset,length_field,"%s", decode_boolean_bitfield(flags,0x80,8,"PID Present","PID not present")); proto_tree_add_text(flag_tree,tvb,offset,length_field,"%s", decode_boolean_bitfield(flags,0x40,8,"2 bytes ength field ","1 byte length field")); - + ti = proto_tree_add_text(hdr_tree,tvb,offset,length_field,"Sub-frame Length = %u",length); - + if (flags && PPPMUX_PFF_BIT_SET) proto_tree_add_text(hdr_tree,tvb,offset + length_field,pid_field,"%s: %s(0x%02x)", "Protocol ID",val_to_str(pid,ppp_vals,"Unknown"), pid); - + offset += hdr_length; length_remaining -= hdr_length; length -= pid_field; - + sub_ti = proto_tree_add_text(sub_tree,tvb,offset,length,"Information Field"); info_tree = proto_item_add_subtree(sub_ti,ett_pppmux_subframe_info); - - next_tvb = tvb_new_subset(tvb,offset,length,-1); - + + next_tvb = tvb_new_subset(tvb,offset,length,-1); + if (!dissector_try_port(subdissector_table, pid, next_tvb, pinfo, info_tree)) { call_dissector(data_handle, next_tvb, pinfo, info_tree); } offset += length; length_remaining -= length; } /* While length_remaining */ - pid = 0; - } /* if tree */ + pid = 0; + } /* if tree */ } static void @@ -3042,26 +3042,26 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { if(tree) { if (length > 0) { tf = proto_tree_add_text(fh_tree, tvb, offset, length, - "Data (%d byte%s)", length, + "Data (%d byte%s)", length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, ett_chap_data); value_size = tvb_get_guint8(tvb, offset); - name_length = length - value_size - 1; + name_length = length - value_size - 1; tv = proto_tree_add_text(field_tree, tvb, offset, 1, - "Value Size: %d byte%s", + "Value Size: %d byte%s", value_size, plurality(value_size, "", "s")); if (--length > 0) { value_tree = proto_item_add_subtree(tv, ett_chap_value); - proto_tree_add_text(value_tree, tvb, ++offset, + proto_tree_add_text(value_tree, tvb, ++offset, ppp_min(value_size, length), - "Value (%d byte%s)", + "Value (%d byte%s)", value_size, plurality(value_size, "", "s")); offset+=value_size; length-=value_size; if (length > 0) { - proto_tree_add_text(field_tree, tvb, offset, + proto_tree_add_text(field_tree, tvb, offset, ppp_min(name_length, length), - "Name (%d byte%s)", name_length, + "Name (%d byte%s)", name_length, plurality(name_length, "", "s")); } } @@ -3074,11 +3074,11 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { if(tree) { if (length > 0) { tf = proto_tree_add_text(fh_tree, tvb, offset, length, - "Data (%d byte%s)", length, + "Data (%d byte%s)", length, plurality(length, "", "s")); field_tree = proto_item_add_subtree(tf, ett_chap_data); tv = proto_tree_add_text(field_tree, tvb, offset, length, - "Message: %d byte%s", + "Message: %d byte%s", length, plurality(length, "", "s")); } } @@ -3298,7 +3298,7 @@ proto_register_ccp(void) &ett_ccp_deflate_opt, }; - proto_ccp = proto_register_protocol("PPP Compression Control Protocol", + proto_ccp = proto_register_protocol("PPP Compression Control Protocol", "PPP CCP", "ccp"); proto_register_subtree_array(ett, array_length(ett)); } @@ -3328,7 +3328,7 @@ proto_register_cbcp(void) &ett_cbcp_callback_opt_addr }; - proto_cbcp = proto_register_protocol("PPP Callback Control Protocol", + proto_cbcp = proto_register_protocol("PPP Callback Control Protocol", "PPP CBCP", "cbcp"); proto_register_subtree_array(ett, array_length(ett)); } @@ -3357,7 +3357,7 @@ proto_register_bacp(void) &ett_bacp_favored_peer_opt }; - proto_bacp = proto_register_protocol("PPP Bandwidth Allocation Control Protocol", + proto_bacp = proto_register_protocol("PPP Bandwidth Allocation Control Protocol", "PPP BACP", "bacp"); proto_register_subtree_array(ett, array_length(ett)); } @@ -3389,7 +3389,7 @@ proto_register_bap(void) &ett_bap_call_status_opt }; - proto_bap = proto_register_protocol("PPP Bandwidth Allocation Protocol", + proto_bap = proto_register_protocol("PPP Bandwidth Allocation Protocol", "PPP BAP", "bap"); proto_register_subtree_array(ett, array_length(ett)); } @@ -3507,7 +3507,7 @@ proto_register_pppmuxcp(void) &ett_pppmuxcp_options, }; - proto_pppmuxcp = proto_register_protocol("PPPMux Control Protocol", + proto_pppmuxcp = proto_register_protocol("PPPMux Control Protocol", "PPP PPPMuxCP", "pppmuxcp"); proto_register_subtree_array(ett, array_length(ett)); @@ -3516,9 +3516,9 @@ proto_register_pppmuxcp(void) void proto_reg_handoff_pppmuxcp(void) -{ - dissector_handle_t muxcp_handle; - +{ + dissector_handle_t muxcp_handle; + muxcp_handle = create_dissector_handle(dissect_pppmuxcp, proto_pppmuxcp); dissector_add("ppp.protocol", PPP_MUXCP, muxcp_handle); @@ -3530,37 +3530,37 @@ proto_reg_handoff_pppmuxcp(void) } -void -proto_register_pppmux(void) -{ - static gint *ett[] = { - &ett_pppmux, - &ett_pppmux_subframe, - &ett_pppmux_subframe_hdr, - &ett_pppmux_subframe_flags, - &ett_pppmux_subframe_info, - }; - - proto_pppmux = proto_register_protocol("PPP Multiplexing", - "PPP PPPMux", - "pppmux"); - proto_register_subtree_array(ett, array_length(ett)); -} - -void -proto_reg_handoff_pppmux(void) -{ - dissector_handle_t pppmux_handle; - - pppmux_handle = create_dissector_handle(dissect_pppmux, proto_pppmux); - dissector_add("ppp.protocol", PPP_MUX, pppmux_handle); - - /* - * See above comment about NDISWAN for an explanation of why we're - * registering with the "ethertype" dissector table. - */ - dissector_add("ethertype", PPP_MUX, pppmux_handle); -} +void +proto_register_pppmux(void) +{ + static gint *ett[] = { + &ett_pppmux, + &ett_pppmux_subframe, + &ett_pppmux_subframe_hdr, + &ett_pppmux_subframe_flags, + &ett_pppmux_subframe_info, + }; + + proto_pppmux = proto_register_protocol("PPP Multiplexing", + "PPP PPPMux", + "pppmux"); + proto_register_subtree_array(ett, array_length(ett)); +} + +void +proto_reg_handoff_pppmux(void) +{ + dissector_handle_t pppmux_handle; + + pppmux_handle = create_dissector_handle(dissect_pppmux, proto_pppmux); + dissector_add("ppp.protocol", PPP_MUX, pppmux_handle); + + /* + * See above comment about NDISWAN for an explanation of why we're + * registering with the "ethertype" dissector table. + */ + dissector_add("ethertype", PPP_MUX, pppmux_handle); +} void proto_register_mplscp(void) diff --git a/packet-ppp.h b/packet-ppp.h index 8640ecd83d..6332addbb9 100644 --- a/packet-ppp.h +++ b/packet-ppp.h @@ -1,21 +1,21 @@ /* packet-ppp.h * - * $Id: packet-ppp.h,v 1.10 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-ppp.h,v 1.11 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-pppoe.c b/packet-pppoe.c index 6209e84926..ca73f33a64 100644 --- a/packet-pppoe.c +++ b/packet-pppoe.c @@ -1,22 +1,22 @@ /* packet-pppoe.c * Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516) * - * $Id: packet-pppoe.c,v 1.23 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pppoe.c,v 1.24 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,15 +49,15 @@ static dissector_handle_t ppp_handle; #define PPPOE_CODE_PADS 0x65 #define PPPOE_CODE_PADT 0xa7 -#define PPPOE_TAG_EOL 0x0000 +#define PPPOE_TAG_EOL 0x0000 #define PPPOE_TAG_SVC_NAME 0x0101 -#define PPPOE_TAG_AC_NAME 0x0102 +#define PPPOE_TAG_AC_NAME 0x0102 #define PPPOE_TAG_HOST_UNIQ 0x0103 #define PPPOE_TAG_AC_COOKIE 0x0104 -#define PPPOE_TAG_VENDOR 0x0105 -#define PPPOE_TAG_RELAY_ID 0x0110 -#define PPPOE_TAG_SVC_ERR 0x0201 -#define PPPOE_TAG_AC_ERR 0x0202 +#define PPPOE_TAG_VENDOR 0x0105 +#define PPPOE_TAG_RELAY_ID 0x0110 +#define PPPOE_TAG_SVC_ERR 0x0201 +#define PPPOE_TAG_AC_ERR 0x0202 #define PPPOE_TAG_GENERIC_ERR 0x0203 static gchar * @@ -117,7 +117,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, int offset, proto_tree *tree, int payload_leng proto_tree_add_text(pppoe_tree, tvb,tagstart,4, "Tag: %s", pppoetag_to_str(poe_tag,"Unknown (0x%02x)")); - + switch(poe_tag) { case PPPOE_TAG_SVC_NAME: case PPPOE_TAG_AC_NAME: @@ -269,7 +269,7 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Payload Length: %u", pppoe_length); } /* dissect_ppp is apparently done as a 'top level' dissector, - * so this doesn't work: + * so this doesn't work: * dissect_ppp(pd,offset+6,pinfo->fd,tree); * Im gonna try fudging it. */ diff --git a/packet-pptp.c b/packet-pptp.c index a1b9eb1fc7..06f1d771ba 100644 --- a/packet-pptp.c +++ b/packet-pptp.c @@ -2,22 +2,22 @@ * Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637) * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-pptp.c,v 1.25 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-pptp.c,v 1.26 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -239,7 +239,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + len = tvb_get_ntohs(tvb, offset); cntrl_type = tvb_get_ntohs(tvb, offset + 8); @@ -253,7 +253,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_pptp, tvb, offset, len, FALSE); pptp_tree = proto_item_add_subtree(ti, ett_pptp); - + proto_tree_add_text(pptp_tree, tvb, offset, 2, "Length: %u", len); offset += 2; @@ -270,7 +270,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(pptp_tree, tvb, offset, 4, "Cookie: %#08x (incorrect)", cookie); offset += 4; - + proto_tree_add_text(pptp_tree, tvb, offset, 2, "Control type: %s (%u)", cntrltype2str(cntrl_type), cntrl_type); offset += 2; @@ -306,7 +306,7 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, major_ver = tvb_get_guint8(tvb, offset); minor_ver = tvb_get_guint8(tvb, offset + 1); - proto_tree_add_text(tree, tvb, offset, 2, + proto_tree_add_text(tree, tvb, offset, 2, "Protocol version: %u.%u", major_ver, minor_ver); offset += 2; @@ -327,16 +327,16 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Maximum channels: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Firmware revision: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + tvb_get_nstringz0(tvb, offset, HOSTLEN, host); proto_tree_add_text(tree, tvb, offset, HOSTLEN, "Hostname: %s", host); offset += HOSTLEN; - + tvb_get_nstringz0(tvb, offset, VENDORLEN, vendor); proto_tree_add_text(tree, tvb, offset, VENDORLEN, "Vendor: %s", vendor); @@ -357,7 +357,7 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, major_ver = tvb_get_guint8(tvb, offset); minor_ver = tvb_get_guint8(tvb, offset + 1); - proto_tree_add_text(tree, tvb, offset, 2, + proto_tree_add_text(tree, tvb, offset, 2, "Protocol version: %u.%u", major_ver, minor_ver); offset += 2; @@ -365,12 +365,12 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", cntrlresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Error: %s (%u)", errortype2str(error), error); offset += 1; - + frame = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Framing capabilities: %s (%u)", frametype2str(frame), frame); @@ -384,16 +384,16 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Maximum channels: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Firmware revision: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + tvb_get_nstringz0(tvb, offset, HOSTLEN, host); proto_tree_add_text(tree, tvb, offset, HOSTLEN, "Hostname: %s", host); offset += HOSTLEN; - + tvb_get_nstringz0(tvb, offset, VENDORLEN, vendor); proto_tree_add_text(tree, tvb, offset, VENDORLEN, "Vendor: %s", vendor); @@ -409,11 +409,11 @@ dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Reason: %s (%u)", reasontype2str(reason), reason); offset += 1; - + proto_tree_add_text(tree, tvb, offset, 1, "Reserved: %u", tvb_get_guint8(tvb, offset)); offset += 1; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); } @@ -429,12 +429,12 @@ dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", stopresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Error: %s (%u)", errortype2str(error), error); offset += 1; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); } @@ -457,17 +457,17 @@ dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 4, "Identifier: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + result = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", echoresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, sizeof(error), "Error: %s (%u)", errortype2str(error), error); offset += 1; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); } @@ -484,19 +484,19 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Call Serial Number: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 4, "Minimum BPS: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Maximum BPS: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + bearer = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Bearer capabilities: %s (%u)", bearertype2str(bearer), bearer); @@ -514,15 +514,15 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Processing delay: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Phone number length: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + tvb_get_nstringz0(tvb, offset, PHONELEN, phone); proto_tree_add_text(tree, tvb, offset, PHONELEN, "Phone number: %s", phone); @@ -543,7 +543,7 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Peer's call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -552,7 +552,7 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", outresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Error: %s (%u)", errortype2str(error), error); @@ -561,7 +561,7 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Cause code: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 4, "Connect speed: %u", tvb_get_ntohl(tvb, offset)); offset += 4; @@ -573,7 +573,7 @@ dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Processing delay: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 4, "Physical channel ID: %u", tvb_get_ntohl(tvb, offset)); } @@ -590,11 +590,11 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Call serial number: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + bearer = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Bearer capabilities: %s (%u)", bearertype2str(bearer), bearer); @@ -607,21 +607,21 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Dialed number length: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Dialing number length: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + tvb_get_nstringz0(tvb, offset, PHONELEN, dialed); proto_tree_add_text(tree, tvb, offset, PHONELEN, "Dialed number: %s", dialed); offset += PHONELEN; - + tvb_get_nstringz0(tvb, offset, PHONELEN, dialing); proto_tree_add_text(tree, tvb, offset, PHONELEN, "Dialing number: %s", dialing); offset += PHONELEN; - + tvb_get_nstringz0(tvb, offset, SUBADDRLEN, subaddr); proto_tree_add_text(tree, tvb, offset, SUBADDRLEN, "Subaddress: %s", subaddr); @@ -637,7 +637,7 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Peer's call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -646,7 +646,7 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", inresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Error: %s (%u)", errortype2str(error), error); @@ -659,7 +659,7 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Processing delay: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); } @@ -669,7 +669,7 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint32 frame; - + proto_tree_add_text(tree, tvb, offset, 2, "Peer's call ID: %u", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -681,7 +681,7 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 4, "Connect speed: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 2, "Receive window size: %u", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -689,7 +689,7 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Processing delay: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + frame = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Framing capabilities: %s (%u)", frametype2str(frame), frame); @@ -723,7 +723,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 1, "Result: %s (%u)", discresulttype2str(result), result); offset += 1; - + error = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Error: %s (%u)", errortype2str(error), error); @@ -732,7 +732,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 2, "Cause code: %u", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(tree, tvb, offset, 2, "Reserved: %u", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -757,23 +757,23 @@ dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 4, "CRC errors: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Framing errors: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Hardware overruns: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Buffer overruns: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Time-out errors: %u", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Alignment errors: %u", tvb_get_ntohl(tvb, offset)); } @@ -793,7 +793,7 @@ dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(tree, tvb, offset, 4, "Send ACCM: %#08x", tvb_get_ntohl(tvb, offset)); offset += 4; - + proto_tree_add_text(tree, tvb, offset, 4, "Recv ACCM: %#08x", tvb_get_ntohl(tvb, offset)); } diff --git a/packet-prism.c b/packet-prism.c index ece8002dd8..632efc7ea4 100644 --- a/packet-prism.c +++ b/packet-prism.c @@ -9,7 +9,7 @@ * * By Tim Newsham * - * $Id: packet-prism.c,v 1.7 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-prism.c,v 1.8 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -21,12 +21,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -60,7 +60,7 @@ struct val_80211 { struct prism_hdr { unsigned int msgcode, msglen; char devname[16]; - struct val_80211 hosttime, mactime, channel, rssi, sq, signal, + struct val_80211 hosttime, mactime, channel, rssi, sq, signal, noise, rate, istx, frmlen; }; @@ -134,7 +134,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hdr.msgcode, hdr.msglen); if(tree) { - ti = proto_tree_add_protocol_format(tree, proto_prism, + ti = proto_tree_add_protocol_format(tree, proto_prism, tvb, 0, sizeof hdr, "Prism Monitoring Header"); prism_tree = proto_item_add_subtree(ti, ett_prism); @@ -184,8 +184,8 @@ proto_register_prism(void) VALFIELD2(rate, "Rate") VALFIELD2(istx, "IsTX") VALFIELD2(frmlen, "Frame Length") - - }; + + }; static gint *ett[] = { &ett_prism }; diff --git a/packet-prism.h b/packet-prism.h index eeadc0e614..b9439680bd 100644 --- a/packet-prism.h +++ b/packet-prism.h @@ -9,7 +9,7 @@ * * By Tim Newsham * - * $Id: packet-prism.h,v 1.2 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-prism.h,v 1.3 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -21,12 +21,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-q2931.c b/packet-q2931.c index 1c423878cf..5906aa0833 100644 --- a/packet-q2931.c +++ b/packet-q2931.c @@ -2,22 +2,22 @@ * Routines for Q.2931 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q2931.c,v 1.28 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-q2931.c,v 1.29 2002/08/28 21:00:25 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1002,7 +1002,7 @@ static const value_string q2931_cause_coding_standard_vals[] = { { 0x60, "Standard defined for the network" }, { 0, NULL } }; - + static const value_string q2931_cause_location_vals[] = { { 0x00, "User (U)" }, { 0x01, "Private network serving the local user (LPN)" }, @@ -1149,7 +1149,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, int offset, int len, val_to_str(octet & 0x03, q2931_cause_condition_vals, "Unknown (0x%X)")); break; - + case Q2931_CAUSE_CALL_REJECTED: rejection_reason = octet & 0x7C; proto_tree_add_text(tree, tvb, offset, 1, @@ -2099,7 +2099,7 @@ proto_register_q2931(void) { static hf_register_info hf[] = { { &hf_q2931_discriminator, - { "Protocol discriminator", "q2931.disc", FT_UINT8, BASE_HEX, NULL, 0x0, + { "Protocol discriminator", "q2931.disc", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_q2931_call_ref_len, diff --git a/packet-q931.c b/packet-q931.c index f0833764e9..f21d5725c9 100644 --- a/packet-q931.c +++ b/packet-q931.c @@ -2,24 +2,24 @@ * Routines for Q.931 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q931.c,v 1.45 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-q931.c,v 1.46 2002/08/28 21:00:25 jmayer Exp $ * * Modified by Andreas Sikkema for possible use with H.323 * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -360,7 +360,7 @@ static const value_string q931_information_transfer_capability_vals[] = { { 0x18, "Video" }, { 0, NULL } }; - + static const value_string q931_transfer_mode_vals[] = { { 0x00, "Circuit mode" }, { 0x40, "Packet mode" }, @@ -379,7 +379,7 @@ static const value_string q931_information_transfer_rate_vals[] = { { Q931_IT_RATE_MULTIRATE, "Multirate (64 kbit/s base rate)" }, { 0, NULL } }; - + static const value_string q931_uil1_vals[] = { { 0x01, "V.110/I.460/X.30 rate adaption" }, { 0x02, "Recommendation G.711 u-law" }, @@ -515,7 +515,7 @@ static const value_string q931_uil3_vals[] = { { 0, NULL } }; -static void +static void dissect_q931_protocol_discriminator(tvbuff_t *tvb, int offset, proto_tree *tree) { unsigned int discriminator = tvb_get_guint8(tvb, offset); @@ -633,7 +633,7 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, "Unknown (0x%02X)")); offset += 1; len -= 1; - + if (octet & Q931_IE_VL_EXTENSION) goto l1_done; if (len == 0) @@ -893,7 +893,7 @@ static const value_string q931_cause_coding_standard_vals[] = { { 0x60, "Standard specific to identified location" }, { 0, NULL } }; - + const value_string q931_cause_location_vals[] = { { 0x00, "User (U)" }, { 0x01, "Private network serving the local user (LPN)" }, @@ -1077,7 +1077,7 @@ static const value_string q931_coding_standard_vals[] = { { 0x60, "Standard defined for the network" }, { 0, NULL } }; - + static const value_string q931_call_state_vals[] = { { 0x00, "Null" }, { 0x01, "Call initiated" }, @@ -1153,7 +1153,7 @@ static const value_string q931_not_basic_channel_selection_vals[] = { }; #define Q931_IS_SLOT_MAP 0x10 - + static const value_string q931_element_type_vals[] = { { 0x03, "B-channel units" }, { 0x06, "H0-channel units" }, @@ -2108,7 +2108,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 message_type; guint8 info_element; guint16 info_element_len; - int codeset; + int codeset; gboolean non_locking_shift; tvbuff_t *h225_tvb; @@ -2209,7 +2209,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str(info_element & Q931_IE_SO_IE_MASK, q931_congestion_level_vals, "Unknown (0x%X)")); - } + } offset += 1; if (non_locking_shift) codeset = 0; @@ -2222,7 +2222,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str(info_element & Q931_IE_SO_IE_MASK, q931_repeat_indication_vals, "Unknown (0x%X)")); - } + } offset += 1; if (non_locking_shift) codeset = 0; @@ -2244,7 +2244,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * IE with ASN.1 encoding of the user information. */ if (is_tpkt && tvb_bytes_exist(tvb, offset, 4) && - tvb_get_guint8(tvb, offset) == Q931_IE_USER_USER && + tvb_get_guint8(tvb, offset) == Q931_IE_USER_USER && tvb_get_guint8(tvb, offset + 3) == Q931_PROTOCOL_DISCRIMINATOR_ASN1) { info_element_len = tvb_get_ntohs(tvb, offset + 1); if (q931_tree != NULL) { @@ -2578,7 +2578,7 @@ proto_register_q931(void) { static hf_register_info hf[] = { { &hf_q931_discriminator, - { "Protocol discriminator", "q931.disc", FT_UINT8, BASE_HEX, NULL, 0x0, + { "Protocol discriminator", "q931.disc", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, { &hf_q931_call_ref_len, diff --git a/packet-q931.h b/packet-q931.h index e379235bcf..8ce1a9643e 100644 --- a/packet-q931.h +++ b/packet-q931.h @@ -3,22 +3,22 @@ * disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q931.h,v 1.6 2002/05/14 09:24:27 guy Exp $ + * $Id: packet-q931.h,v 1.7 2002/08/28 21:00:26 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-qllc.c b/packet-qllc.c index c36bfc39e7..97a34bd270 100644 --- a/packet-qllc.c +++ b/packet-qllc.c @@ -2,22 +2,22 @@ * Routines for QLLC protocol - Qualified? LLC * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-qllc.c,v 1.6 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-qllc.c,v 1.7 2002/08/28 21:00:26 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2001 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -139,7 +139,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* Non-ambiguous control field value */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str(ctrl, qllc_control_vals, "Control Field: 0x%02x (unknown)")); } @@ -150,7 +150,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Do we have an I field ? */ - /* XXX - I field exists for QUI too, but only for subarea nodes. + /* XXX - I field exists for QUI too, but only for subarea nodes. * Need to test for this. */ if (ctrl == QXID || ctrl == QTEST || ctrl == QFRMR) { /* yes */ @@ -168,7 +168,7 @@ proto_register_qllc(void) "", HFILL }}, { &hf_qllc_control, - { "Control Field", "qllc.control", FT_UINT8, BASE_HEX, + { "Control Field", "qllc.control", FT_UINT8, BASE_HEX, VALS(qllc_control_vals), 0x0, "", HFILL }}, }; diff --git a/packet-quake.c b/packet-quake.c index f18a0c5a60..a5beb3abc8 100644 --- a/packet-quake.c +++ b/packet-quake.c @@ -4,24 +4,24 @@ * Uwe Girlich <uwe@planetquake.com> * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quake.c,v 1.27 2002/08/02 23:35:56 jmayer Exp $ + * $Id: packet-quake.c,v 1.28 2002/08/28 21:00:26 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,9 +37,9 @@ #include "prefs.h" static int proto_quake = -1; -static int hf_quake_header_flags = -1; -static int hf_quake_header_length = -1; -static int hf_quake_header_sequence = -1; +static int hf_quake_header_flags = -1; +static int hf_quake_header_length = -1; +static int hf_quake_header_sequence = -1; static int hf_quake_control_command = -1; static int hf_quake_CCREQ_CONNECT_game = -1; @@ -87,14 +87,14 @@ static unsigned int gbl_quakeServerPort=DEFAULTnet_hostport; #define NETFLAG_NAK 0x00040000 #define NETFLAG_EOM 0x00080000 #define NETFLAG_UNRELIABLE 0x00100000 -#define NETFLAG_CTL 0x80000000 +#define NETFLAG_CTL 0x80000000 #define CCREQ_CONNECT 0x01 #define CCREQ_SERVER_INFO 0x02 #define CCREQ_PLAYER_INFO 0x03 #define CCREQ_RULE_INFO 0x04 - + #define CCREP_ACCEPT 0x81 #define CCREP_REJECT 0x82 #define CCREP_SERVER_INFO 0x83 @@ -296,7 +296,7 @@ dissect_quake_CCREP_SERVER_INFO tvb, offset, len + 1, server); } offset += len + 1; - + maxbufsize = MIN((int)sizeof(map), tvb_length_remaining(tvb, offset)); len = tvb_get_nstringz0(tvb, offset, maxbufsize, map); if (tree) { @@ -344,7 +344,7 @@ dissect_quake_CCREP_PLAYER_INFO tvb, offset, 1, player); } offset += 1; - + maxbufsize = MIN((int)sizeof(name), tvb_length_remaining(tvb, offset)); len = tvb_get_nstringz0(tvb, offset, maxbufsize, name); if (tree) { @@ -433,7 +433,7 @@ dissect_quake_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *control_tree = NULL; guint rest_length; tvbuff_t *next_tvb; - + command = tvb_get_guint8(tvb, 0); direction = (command & 0x80) ? CCREP : CCREQ; @@ -589,16 +589,16 @@ proto_reg_handoff_quake(void) { static int Initialized=FALSE; static int ServerPort=0; - + if (Initialized) { dissector_delete("udp.port", ServerPort, quake_handle); } else { Initialized=TRUE; } - + /* set port for future deletes */ ServerPort=gbl_quakeServerPort; - + dissector_add("udp.port", gbl_quakeServerPort, quake_handle); data_handle = find_dissector("data"); } diff --git a/packet-quake2.c b/packet-quake2.c index 7fc3206469..5babdcf737 100644 --- a/packet-quake2.c +++ b/packet-quake2.c @@ -7,24 +7,24 @@ * http://www.dgs.monash.edu.au/~timf/bottim/ * http://www.opt-sci.Arizona.EDU/Pandora/default.asp * - * $Id: packet-quake2.c,v 1.12 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-quake2.c,v 1.13 2002/08/28 21:00:27 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-quakeworld.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -134,8 +134,8 @@ static const value_string hf_quake2_game_client_command_move_vals[] = { { 0, NULL } }; -static int -dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, +static int +dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { #define MOVES 3 /* 3 updates per command */ @@ -226,12 +226,12 @@ dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, offset++; } - if (!tree) + if (!tree) return offset; - proto_tree_add_uint(tree, hf_quake2_game_client_command_move_chksum, tvb, + proto_tree_add_uint(tree, hf_quake2_game_client_command_move_chksum, tvb, 0, 1, chksum); - proto_tree_add_uint(tree, hf_quake2_game_client_command_move_lframe, tvb, + proto_tree_add_uint(tree, hf_quake2_game_client_command_move_lframe, tvb, 1, 4, lastframe); move[MOVES].bits[OFFSET] = offset; @@ -240,25 +240,25 @@ dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *sub_tree, *field_tree; #define SHORT2ANGLE(x) ((float)x/65536.0*360.0) - move_item = proto_tree_add_text(tree, - tvb, + move_item = proto_tree_add_text(tree, + tvb, move[i].bits[OFFSET], move[i+1].bits[OFFSET]-move[i].bits[OFFSET], "Move %u", i+1); - sub_tree = proto_item_add_subtree(move_item, + sub_tree = proto_item_add_subtree(move_item, ett_quake2_game_clc_cmd_move_moves); movebits_item = - proto_tree_add_uint(sub_tree, hf_quake2_game_client_command_move, + proto_tree_add_uint(sub_tree, hf_quake2_game_client_command_move, tvb, - move[i].bits[OFFSET], + move[i].bits[OFFSET], 1, move[i].bits[VALUE]); - proto_tree_add_uint(sub_tree, + proto_tree_add_uint(sub_tree, hf_quake2_game_client_command_move_msec, tvb, move[i].msec[OFFSET], 1, move[i].msec[VALUE]); - proto_tree_add_uint(sub_tree, + proto_tree_add_uint(sub_tree, hf_quake2_game_client_command_move_lightlevel, tvb, move[i].lightlevel[OFFSET], 1, move[i].lightlevel[VALUE]); @@ -267,60 +267,60 @@ dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, continue; } - field_tree = proto_item_add_subtree(movebits_item, + field_tree = proto_item_add_subtree(movebits_item, ett_quake2_game_clc_cmd_move_bitfield); if (move[i].bits[VALUE] & CM_ANGLE1) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_angles1, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_angles1, tvb, move[i].angles[0][OFFSET], 2, move[i].bits[VALUE]); proto_item_append_text(bit_item, " (%d", move[i].angles[0][VALUE]); - proto_item_append_text(bit_item, " = %.2f deg)", + proto_item_append_text(bit_item, " = %.2f deg)", SHORT2ANGLE(move[i].angles[0][VALUE])); - } - + } + if (move[i].bits[VALUE] & CM_ANGLE2) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_angles2, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_angles2, tvb, move[i].angles[1][OFFSET], 2, move[i].bits[VALUE]); proto_item_append_text(bit_item, " (%d", move[i].angles[1][VALUE]); - proto_item_append_text(bit_item, " = %.2f deg)", + proto_item_append_text(bit_item, " = %.2f deg)", SHORT2ANGLE(move[i].angles[1][VALUE])); - } + } if (move[i].bits[VALUE] & CM_ANGLE3) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_angles3, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_angles3, tvb, move[i].angles[2][OFFSET], 2, move[i].bits[VALUE]); proto_item_append_text(bit_item, " (%d", move[i].angles[2][VALUE]); - proto_item_append_text(bit_item, " = %.2f deg)", + proto_item_append_text(bit_item, " = %.2f deg)", SHORT2ANGLE(move[i].angles[2][VALUE])); - } + } if (move[i].bits[VALUE] & CM_FORWARD) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_movement_fwd, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_movement_fwd, tvb, move[i].movement[0][OFFSET], 2, move[i].bits[VALUE]); - proto_item_append_text(bit_item, " (%hd)", + proto_item_append_text(bit_item, " (%hd)", move[i].movement[0][VALUE]); - } + } if (move[i].bits[VALUE] & CM_SIDE) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_movement_side, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_movement_side, tvb, move[i].movement[1][OFFSET], 2, move[i].bits[VALUE]); - proto_item_append_text(bit_item, " (%hd)", + proto_item_append_text(bit_item, " (%hd)", move[i].movement[1][VALUE]); - } + } if (move[i].bits[VALUE] & CM_UP) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_movement_up, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_movement_up, tvb, move[i].movement[2][OFFSET], 2, move[i].bits[VALUE]); - proto_item_append_text(bit_item, " (%hd)", + proto_item_append_text(bit_item, " (%hd)", move[i].movement[2][VALUE]); - } + } if (move[i].bits[VALUE] & CM_BUTTONS) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_buttons, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_buttons, tvb, move[i].buttons[OFFSET], 1, move[i].bits[VALUE]); - proto_item_append_text(bit_item, " (%d)", + proto_item_append_text(bit_item, " (%d)", move[i].buttons[VALUE]); if (move[i].buttons[VALUE] & BUTTON_ATTACK) proto_item_append_text(bit_item, " (Attack)"); @@ -330,10 +330,10 @@ dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, proto_item_append_text(bit_item, " (Any)"); } if (move[i].bits[VALUE] & CM_IMPULSE) { - bit_item = proto_tree_add_uint(field_tree, - hf_quake2_game_client_command_move_bitfield_impulse, tvb, + bit_item = proto_tree_add_uint(field_tree, + hf_quake2_game_client_command_move_bitfield_impulse, tvb, move[i].impulse[OFFSET], 1, move[i].bits[VALUE]); - proto_item_append_text(bit_item, " (%d)", + proto_item_append_text(bit_item, " (%d)", move[i].impulse[VALUE]); } @@ -342,44 +342,44 @@ dissect_quake2_client_commands_move(tvbuff_t *tvb, packet_info *pinfo _U_, return offset; } -static int -dissect_quake2_client_commands_uinfo(tvbuff_t *tvb, packet_info *pinfo _U_, +static int +dissect_quake2_client_commands_uinfo(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_item *userinfo_item; #define MAX_MSGLEN 1400 /* qcommon.h */ - guint8 message[MAX_MSGLEN]; + guint8 message[MAX_MSGLEN]; gint len; - len = tvb_get_nstringz0(tvb, 0, + len = tvb_get_nstringz0(tvb, 0, (guint) MIN(tvb_reported_length(tvb), sizeof(message)), - message); + message); if (message[len] == '\0') len++; - + if (tree) userinfo_item = proto_tree_add_text(tree, tvb, 0, len, "Userinfo: %s", message); return len; } -static int -dissect_quake2_client_commands_stringcmd(tvbuff_t *tvb, packet_info *pinfo _U_, +static int +dissect_quake2_client_commands_stringcmd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_item *stringcmd_item; guint8 message[MAX_MSGLEN]; gint len; - len = tvb_get_nstringz0(tvb, 0, + len = tvb_get_nstringz0(tvb, 0, (guint) MIN(tvb_reported_length(tvb), sizeof(message)), - message); + message); if (message[len] == '\0') len++; - if (tree) + if (tree) stringcmd_item = proto_tree_add_text(tree, tvb, 0, len, "Command: %s", message); @@ -415,8 +415,8 @@ dissect_quake2_client_commands(tvbuff_t *tvb, packet_info *pinfo, client_cmd_type = tvb_get_guint8(tvb, offset); if (tree) { - proto_item *cmd_type_item = proto_tree_add_uint(tree, - hf_quake2_game_client_command, tvb, offset, 1, + proto_item *cmd_type_item = proto_tree_add_uint(tree, + hf_quake2_game_client_command, tvb, offset, 1, client_cmd_type); if (cmd_type_item) { @@ -429,7 +429,7 @@ dissect_quake2_client_commands(tvbuff_t *tvb, packet_info *pinfo, offset++; rest_length = tvb_reported_length(tvb) - offset; - if (rest_length) + if (rest_length) next_tvb = tvb_new_subset(tvb, offset, rest_length, rest_length); else @@ -443,7 +443,7 @@ dissect_quake2_client_commands(tvbuff_t *tvb, packet_info *pinfo, break; case CLC_MOVE: rest_length = - dissect_quake2_client_commands_move(next_tvb, + dissect_quake2_client_commands_move(next_tvb, pinfo, clc_tree); break; case CLC_USERINFO: @@ -453,7 +453,7 @@ dissect_quake2_client_commands(tvbuff_t *tvb, packet_info *pinfo, break; case CLC_STRINGCMD: rest_length = - dissect_quake2_client_commands_stringcmd(next_tvb, + dissect_quake2_client_commands_stringcmd(next_tvb, pinfo, clc_tree); break; default: @@ -523,7 +523,7 @@ dissect_quake2_server_commands(tvbuff_t *tvb, packet_info *pinfo, server_cmd_type = tvb_get_guint8(tvb, offset); if (tree) { - cmd_type_item = proto_tree_add_uint(tree, + cmd_type_item = proto_tree_add_uint(tree, hf_quake2_game_server_command, tvb, offset, 1, server_cmd_type); if (cmd_type_item) { @@ -534,7 +534,7 @@ dissect_quake2_server_commands(tvbuff_t *tvb, packet_info *pinfo, offset++; rest_length = tvb_reported_length(tvb) - offset; - if (rest_length) + if (rest_length) next_tvb = tvb_new_subset(tvb, offset, rest_length, rest_length); else return; @@ -671,7 +671,7 @@ dissect_quake2_GamePacket(tvbuff_t *tvb, packet_info *pinfo, /* client to server */ guint16 qport = tvb_get_letohs(tvb, offset); if (game_tree) { - proto_tree_add_uint(game_tree, hf_quake2_game_qport, + proto_tree_add_uint(game_tree, hf_quake2_game_qport, tvb, offset, 2, qport); } offset +=2; @@ -778,7 +778,7 @@ proto_reg_handoff_quake2(void) static int Initialized=FALSE; static dissector_handle_t quake2_handle; static int ServerPort=0; - + if (!Initialized) { quake2_handle = create_dissector_handle(dissect_quake2, proto_quake2); @@ -786,10 +786,10 @@ proto_reg_handoff_quake2(void) } else { dissector_delete("udp.port", ServerPort, quake2_handle); } - + /* set port for future deletes */ ServerPort=gbl_quake2ServerPort; - + dissector_add("udp.port", gbl_quake2ServerPort, quake2_handle); data_handle = find_dissector("data"); } @@ -865,22 +865,22 @@ proto_register_quake2(void) "Quake II Client Command Move", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_angles1, { "Angles (pitch)", "quake2.game.client.command.move.angles", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), CM_ANGLE1, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_angles2, { "Angles (yaw)", "quake2.game.client.command.move.angles", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_ANGLE2, "", HFILL }}, + CM_ANGLE2, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_angles3, { "Angles (roll)", "quake2.game.client.command.move.angles", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_ANGLE3, "", HFILL }}, + CM_ANGLE3, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_fwd, { "Movement (fwd)", "quake2.game.client.command.move.movement", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), CM_FORWARD, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_side, @@ -890,17 +890,17 @@ proto_register_quake2(void) CM_SIDE, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_up, { "Movement (up)", "quake2.game.client.command.move.movement", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), CM_UP, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_buttons, { "Buttons", "quake2.game.client.command.move.buttons", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), CM_BUTTONS, "", HFILL }}, { &hf_quake2_game_client_command_move_bitfield_impulse, { "Impulse", "quake2.game.client.command.move.impulse", - FT_UINT8, BASE_HEX, + FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), CM_IMPULSE, "", HFILL }}, { &hf_quake2_game_client_command_move_msec, diff --git a/packet-quake3.c b/packet-quake3.c index fd39ebb1b1..eb0c4a5b51 100644 --- a/packet-quake3.c +++ b/packet-quake3.c @@ -3,24 +3,24 @@ * * Uwe Girlich <uwe@planetquake.com> * - * $Id: packet-quake3.c,v 1.13 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-quake3.c,v 1.14 2002/08/28 21:00:27 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-quake2.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -289,7 +289,7 @@ dissect_quake3_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo _U_, if (text_tree) { server_item = proto_tree_add_text(text_tree, - tvb, base, 7, + tvb, base, 7, "Server: %s:%u", get_hostname(ip_addr), udp_port); @@ -299,9 +299,9 @@ dissect_quake3_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo _U_, ett_quake3_server); } if (server_tree) { - proto_tree_add_ipv4(server_tree, hf_quake3_server_addr, + proto_tree_add_ipv4(server_tree, hf_quake3_server_addr, tvb, base + 1, 4, ip_addr); - proto_tree_add_uint(server_tree, hf_quake3_server_port, + proto_tree_add_uint(server_tree, hf_quake3_server_port, tvb, base + 5, 2, udp_port); } @@ -435,7 +435,7 @@ dissect_quake3_GamePacket(tvbuff_t *tvb, packet_info *pinfo, /* client to server */ guint16 qport = tvb_get_letohs(tvb, offset); if (game_tree) { - proto_tree_add_uint(game_tree, hf_quake3_game_qport, + proto_tree_add_uint(game_tree, hf_quake3_game_qport, tvb, offset, 2, qport); } offset +=2; @@ -501,7 +501,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dir_item = proto_tree_add_none_format( quake3_tree, hf_quake3_direction, tvb, 0, 0, - "Direction: %s", + "Direction: %s", val_to_str(direction, names_direction, "%u")); } @@ -532,8 +532,8 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pinfo, quake3_tree, &direction); } if (direction != DIR_UNKNOWN && dir_item) - proto_item_set_text(dir_item, - "Direction: %s", + proto_item_set_text(dir_item, + "Direction: %s", val_to_str(direction, names_direction, "%u")); @@ -551,7 +551,7 @@ proto_reg_handoff_quake3(void) static int server_port; static int master_port; int i; - + if (!initialized) { quake3_handle = create_dissector_handle(dissect_quake3, proto_quake3); @@ -562,11 +562,11 @@ proto_reg_handoff_quake3(void) for (i=0;i<4;i++) dissector_delete("udp.port", master_port+i, quake3_handle); } - + /* set port for future deletes */ server_port = gbl_quake3_server_port; master_port = gbl_quake3_master_port; - + /* add dissectors */ for (i=0;i<4;i++) dissector_add("udp.port", gbl_quake3_server_port + i, diff --git a/packet-quakeworld.c b/packet-quakeworld.c index 88cc93278b..7df768925d 100644 --- a/packet-quakeworld.c +++ b/packet-quakeworld.c @@ -4,24 +4,24 @@ * Uwe Girlich <uwe@planetquake.com> * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quakeworld.c,v 1.15 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-quakeworld.c,v 1.16 2002/08/28 21:00:28 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-quake.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -198,7 +198,7 @@ Cmd_TokenizeString(char* text) int i; int start; int length; - + /* clear the args from the last string */ for (i=0 ; i<cmd_argc ; i++) @@ -225,7 +225,7 @@ Cmd_TokenizeString(char* text) if (!*text) return; - + text = COM_Parse (text); if (!text) return; @@ -241,9 +241,9 @@ Cmd_TokenizeString(char* text) } } - + static void -dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, +dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, int offset, char* infostring, gint ett_key_value, int hf_key_value, int hf_key, int hf_value) { @@ -265,7 +265,7 @@ dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, for (keylength = 0 ; - *(keypos + keylength) != '\\' && + *(keypos + keylength) != '\\' && *(keypos + keylength) != 0 ; keylength++) ; @@ -274,7 +274,7 @@ dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, valuepos = keyvaluesep+1; for (valuelength = 0 ; - *(valuepos + valuelength) != '\\' && + *(valuepos + valuelength) != '\\' && *(valuepos + valuelength) != 0 ; valuelength++) ; @@ -284,7 +284,7 @@ dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, } *(keyvaluesep) = '='; *(valueend) = 0; - + if (tree) { proto_item* sub_item = NULL; proto_tree* sub_tree = NULL; @@ -294,7 +294,7 @@ dissect_id_infostring(tvbuff_t *tvb, proto_tree* tree, tvb, offset + (keypos-infostring), keylength + 1 + valuelength, keypos); - if (sub_item) + if (sub_item) sub_tree = proto_item_add_subtree( sub_item, @@ -333,11 +333,11 @@ static unsigned int gbl_quakeworldServerPort=PORT_MASTER; /* out of band message id bytes (taken out of quakeworldsource/client/protocol.h */ - + /* M = master, S = server, C = client, A = any */ /* the second character will allways be \n if the message isn't a single */ /* byte long (?? not true anymore?) */ - + #define S2C_CHALLENGE 'c' #define S2C_CONNECTION 'j' #define A2A_PING 'k' /* respond with an A2A_ACK */ @@ -345,7 +345,7 @@ static unsigned int gbl_quakeworldServerPort=PORT_MASTER; #define A2A_NACK 'm' /* [+ comment] general failure */ #define A2A_ECHO 'e' /* for echoing */ #define A2C_PRINT 'n' /* print a message on client */ - + #define S2M_HEARTBEAT 'a' /* + serverinfo + userlist + fraglist */ #define A2C_CLIENT_COMMAND 'B' /* + command line */ #define S2M_SHUTDOWN 'C' @@ -404,7 +404,7 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, Cmd_TokenizeString(text); c = Cmd_Argv(0); - + /* client to sever commands */ if (strcmp(c,"ping") == 0) { strcpy(command, "Ping"); @@ -431,11 +431,11 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, tvb, offset, command_len, command); argument_item = proto_tree_add_string(text_tree, hf_quakeworld_connectionless_arguments, - tvb, offset + Cmd_Argv_start(1), len + 1 - Cmd_Argv_start(1), + tvb, offset + Cmd_Argv_start(1), len + 1 - Cmd_Argv_start(1), text + Cmd_Argv_start(1)); if (argument_item) { argument_tree = - proto_item_add_subtree(argument_item, + proto_item_add_subtree(argument_item, ett_quakeworld_connectionless_arguments); } command_finished=TRUE; @@ -491,11 +491,11 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, tvb, offset, command_len, command); argument_item = proto_tree_add_string(text_tree, hf_quakeworld_connectionless_arguments, - tvb, offset + Cmd_Argv_start(1), len + 1 - Cmd_Argv_start(1), + tvb, offset + Cmd_Argv_start(1), len + 1 - Cmd_Argv_start(1), text + Cmd_Argv_start(1)); if (argument_item) { argument_tree = - proto_item_add_subtree(argument_item, + proto_item_add_subtree(argument_item, ett_quakeworld_connectionless_arguments); } command_finished=TRUE; @@ -557,11 +557,11 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, command_len = len; } } - + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " %s", command); } - + if (text_tree && !command_finished) { proto_tree_add_string(text_tree, hf_quakeworld_connectionless_command, tvb, offset, command_len, command); @@ -667,7 +667,7 @@ dissect_quakeworld_GamePacket(tvbuff_t *tvb, packet_info *pinfo, /* client to server */ guint16 qport = tvb_get_letohs(tvb, offset); if (game_tree) { - proto_tree_add_uint(game_tree, hf_quakeworld_game_qport, + proto_tree_add_uint(game_tree, hf_quakeworld_game_qport, tvb, offset, 2, qport); } offset +=2; @@ -774,7 +774,7 @@ proto_reg_handoff_quakeworld(void) static int Initialized=FALSE; static dissector_handle_t quakeworld_handle; static int ServerPort=0; - + if (!Initialized) { quakeworld_handle = create_dissector_handle(dissect_quakeworld, proto_quakeworld); @@ -782,10 +782,10 @@ proto_reg_handoff_quakeworld(void) } else { dissector_delete("udp.port", ServerPort, quakeworld_handle); } - + /* set port for future deletes */ ServerPort=gbl_quakeworldServerPort; - + dissector_add("udp.port", gbl_quakeworldServerPort, quakeworld_handle); data_handle = find_dissector("data"); } diff --git a/packet-radius.c b/packet-radius.c index 2f2323424c..46c1f0220d 100644 --- a/packet-radius.c +++ b/packet-radius.c @@ -4,7 +4,7 @@ * * RFC 2865, RFC 2866, RFC 2867, RFC 2868, RFC 2869 * - * $Id: packet-radius.c,v 1.67 2002/08/26 20:22:31 guy Exp $ + * $Id: packet-radius.c,v 1.68 2002/08/28 21:00:28 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -385,7 +385,7 @@ static value_value_string radius_attrib[] = {53, RADIUS_INTEGER4, "Acct Output Gigawords"}, /* 54 Unused */ {55, RADIUS_TIMESTAMP, "Event Timestamp"}, - /* 56-59 Unused */ + /* 56-59 Unused */ {60, RADIUS_BINSTRING, "CHAP Challenge"}, {61, RADIUS_NAS_PORT_TYPE, "NAS Port Type"}, {62, RADIUS_INTEGER4, "Port Limit"}, @@ -579,7 +579,7 @@ static value_string radius_tunnel_type_vals[] = static value_string radius_tunnel_medium_type_vals[] = { - {1, "IPv4"}, + {1, "IPv4"}, {2, "IPv6"}, {3, "NSAP"}, {4, "HDLC"}, @@ -624,7 +624,7 @@ static value_string radius_nas_port_type_vals[] = /* reference: - 'dictionary.acc' file from FreeRADIUS + 'dictionary.acc' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.acc */ static value_value_string radius_vendor_acc_attrib[] = @@ -839,7 +839,7 @@ static value_string radius_vendor_acc_access_community_vals[] = /* references: - 'dictionary.cisco' file from FreeRADIUS + 'dictionary.cisco' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.cisco http://www.cisco.com/univercd/cc/td/doc/product/access/acs_serv/vapp_dev/vsaig3.htm @@ -906,32 +906,32 @@ static value_value_string radius_vendor_cisco_attrib[] = */ {187, RADIUS_INTEGER4, "Cisco Multilink ID"}, {188, RADIUS_INTEGER4, "Cisco Num In Multilink"}, - /* #189 */ + /* #189 */ {190, RADIUS_INTEGER4, "Cisco Pre Input Octets"}, {191, RADIUS_INTEGER4, "Cisco Pre Output Octets"}, {192, RADIUS_INTEGER4, "Cisco Pre Input Packets"}, {193, RADIUS_INTEGER4, "Cisco Pre Output Packets"}, {194, RADIUS_INTEGER4, "Cisco Maximum Time"}, {195, CISCO_DISCONNECT_CAUSE, "Cisco Disconnect Cause"}, - /* #196 */ + /* #196 */ {197, RADIUS_INTEGER4, "Cisco Data Rate"}, {198, RADIUS_INTEGER4, "Cisco PreSession Time"}, - /* #199-#207 */ + /* #199-#207 */ {208, RADIUS_INTEGER4, "Cisco PW Lifetime"}, {209, RADIUS_INTEGER4, "Cisco IP Direct"}, {210, RADIUS_INTEGER4, "Cisco PPP VJ Slot Comp"}, - /* #211 */ + /* #211 */ {212, RADIUS_INTEGER4, "Cisco PPP Async Map"}, - /* #213-#216 */ + /* #213-#216 */ {217, RADIUS_INTEGER4, "Cisco IP Pool Definition"}, {218, RADIUS_INTEGER4, "Cisco Asing IP Pool"}, - /* #219-#227 */ + /* #219-#227 */ {228, RADIUS_INTEGER4, "Cisco Route IP"}, - /* #229-#232 */ + /* #229-#232 */ {233, RADIUS_INTEGER4, "Cisco Link Compression"}, {234, RADIUS_INTEGER4, "Cisco Target Util"}, {235, RADIUS_INTEGER4, "Cisco Maximum Channels"}, - /* #236-#241 */ + /* #236-#241 */ {242, RADIUS_INTEGER4, "Cisco Data Filter"}, {243, RADIUS_INTEGER4, "Cisco Call Filter"}, {244, RADIUS_INTEGER4, "Cisco Idle Limit"}, @@ -971,7 +971,7 @@ static value_string radius_vendor_cisco_disconnect_cause_vals[] = /* reference: - 'dictionary.shiva' file from FreeRADIUS + 'dictionary.shiva' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.shiva */ static value_value_string radius_vendor_shiva_attrib[] = @@ -1055,7 +1055,7 @@ static value_string radius_vendor_shiva_connect_reason_vals[] = /* reference: - 'dictionary.livingston' file from FreeRADIUS + 'dictionary.livingston' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.livingston */ static value_value_string radius_vendor_livingston_attrib[] = @@ -1497,7 +1497,7 @@ static value_string radius_vendor_ascend_calling_id_screening_vals[] = /* reference: - 'dictionary.bay' file from FreeRADIUS + 'dictionary.bay' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.bay */ static value_value_string radius_vendor_bay_attrib[] = @@ -1689,7 +1689,7 @@ static value_string radius_vendor_bay_audit_level_vals[] = /* reference: - 'dictionary.foundry' file from FreeRADIUS + 'dictionary.foundry' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.foundry */ static value_value_string radius_vendor_foundry_attrib[] = @@ -1702,7 +1702,7 @@ static value_value_string radius_vendor_foundry_attrib[] = /* reference: - 'dictionary.versanet' file from FreeRADIUS + 'dictionary.versanet' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.versanet */ static value_value_string radius_vendor_versanet_attrib[] = @@ -1740,7 +1740,7 @@ static value_string radius_vendor_versanet_termination_cause_vals[] = /* reference: - 'dictionary.redback' file from FreeRADIUS + 'dictionary.redback' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.redback */ static value_value_string radius_vendor_redback_attrib[] = @@ -1825,7 +1825,7 @@ static value_value_string radius_vendor_redback_attrib[] = {138, RADIUS_INTEGER4, "LAC Real Port"}, {139, REDBACK_LAC_PORT_TYPE, "LAC Port Type"}, {140, REDBACK_LAC_REAL_PORT_TYPE, "LAC Real Port Type"}, - {141, RADIUS_STRING, "Acct Dyn Ac Ent"}, + {141, RADIUS_STRING, "Acct Dyn Ac Ent"}, {142, RADIUS_INTEGER4, "Session Error Code"}, {143, RADIUS_STRING, "Session Error Msg"}, {0, 0, NULL}, @@ -1986,7 +1986,7 @@ static value_value_string radius_vendor_juniper_attrib[] = /* reference: - 'dictionary.aptis' file from FreeRADIUS + 'dictionary.aptis' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.aptis */ static value_value_string radius_vendor_aptis_attrib[] = @@ -2031,7 +2031,7 @@ static value_value_string radius_vendor_cosine_attrib[] = /* reference: - 'dictionary.shasta' file from FreeRADIUS + 'dictionary.shasta' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.shasta */ static value_value_string radius_vendor_shasta_attrib[] = @@ -2052,7 +2052,7 @@ static value_string radius_vendor_shasta_user_privilege_vals[] = /* reference: - 'dictionary.nomadix' file from FreeRADIUS + 'dictionary.nomadix' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.nomadix */ static value_value_string radius_vendor_nomadix_attrib[] = @@ -2064,7 +2064,7 @@ static value_value_string radius_vendor_nomadix_attrib[] = /* reference: - 'dictionary.erx' file from FreeRADIUS + 'dictionary.erx' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.erx */ static value_value_string radius_vendor_unisphere_attrib[] = @@ -2119,7 +2119,7 @@ static value_value_string radius_vendor_issanni_attrib[] = /* reference: - 'dictionary.quintum' file from FreeRADIUS + 'dictionary.quintum' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.quintum */ static value_value_string radius_vendor_quintum_attrib[] = @@ -2162,7 +2162,7 @@ static value_value_string radius_vendor_colubris_attrib[] = /* reference: - 'dictionary.columbia_university' file from FreeRADIUS + 'dictionary.columbia_university' file from FreeRADIUS http://www.freeradius.org/radiusd/raddb/dictionary.columbia_university */ static value_value_string radius_vendor_columbia_university_attrib[] = @@ -2429,7 +2429,7 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, int offset, const value_value_string *vvs, proto_tree *tree) { int print_type; - + /* Variable to peek which will be the next print_type for VENDOR-SPECIFIC * RADIUS attributes * */ @@ -2439,7 +2439,7 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, * is needed only when THE3GPP_QOS in involved. * */ gchar *tmp_punt; - + gchar *cont; value_string *valstrarr; guint32 intval; @@ -2511,7 +2511,7 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, if (tag <= 0x1f) { sprintf(dest, "Tag:%u, Value:", tag); - cont=&cont[strlen(cont)]; + cont=&cont[strlen(cont)]; rdconvertbufftostr(cont,tvb,offset+3,avph->avp_length-3); break; } @@ -2540,7 +2540,7 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, vsabuffer[vsa_index].str = cont; vsabuffer[vsa_index].offset = offset+vsa_len; vsabuffer[vsa_index].length = vsa_avph->avp_length; - sprintf(cont, "t:%s(%u) l:%u, ", + sprintf(cont, "t:%s(%u) l:%u, ", (vsa_rvt ? rd_match_strval_attrib(vsa_avph->avp_type,vsa_rvt->attrib) : "Unknown Type"), @@ -2550,7 +2550,7 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, (vsa_rvt ? vsa_rvt->attrib : NULL), tree); vsa_index++; vsa_len += vsa_avph->avp_length; - if (next_print_type == THE3GPP_QOS ) + if (next_print_type == THE3GPP_QOS ) { cont = tmp_punt; vsa_index--; @@ -2639,12 +2639,12 @@ static gchar *rd_value_to_str_2(gchar *dest, e_avphdr *avph, tvbuff_t *tvb, while (*tmp_punt) tmp_punt--; tmp_punt++; - + /* Call decode_qos_umts from packet-gtp package * */ decode_qos_umts(tvb, offset + 1, tree, tmp_punt, 3); break; - + case( RADIUS_TIMESTAMP ): intval=tvb_get_ntohl(tvb,offset+2); rtimestamp=ctime((time_t*)&intval); @@ -2857,7 +2857,7 @@ dissect_attribute_value_pairs(tvbuff_t *tvb, int offset,proto_tree *tree, valstr = rd_value_to_str(&avph, tvb, offset, vsa_tree); proto_item_append_text(ti, ", %s", valstr); for (i = 0; vsabuffer[i].str && i < VSABUFFER; i++) - proto_tree_add_text(vsa_tree, tvb, vsabuffer[i].offset, + proto_tree_add_text(vsa_tree, tvb, vsabuffer[i].offset, vsabuffer[i].length, "%s", vsabuffer[i].str); } } @@ -2916,7 +2916,7 @@ static void dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rh.rh_code); proto_tree_add_uint_format(radius_tree,hf_radius_id, tvb, 1, 1, rh.rh_ident, "Packet identifier: 0x%01x (%d)", - rhident,rhident); + rhident,rhident); proto_tree_add_uint(radius_tree, hf_radius_length, tvb, 2, 2, rhlength); @@ -2924,7 +2924,7 @@ static void dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) AUTHENTICATOR_LENGTH, "Authenticator"); } - + hdrlength=RD_HDR_LENGTH+AUTHENTICATOR_LENGTH; avplength= rhlength -hdrlength; diff --git a/packet-ranap.c b/packet-ranap.c index d5d8f46786..349a7e28ca 100644 --- a/packet-ranap.c +++ b/packet-ranap.c @@ -3,24 +3,24 @@ * Based on 3GPP TS 25.413 V3.4.0 * Copyright 2001, Martin Held <Martin.Held@icn.siemens.de> * - * $Id: packet-ranap.c,v 1.14 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-ranap.c,v 1.15 2002/08/28 21:00:28 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -56,9 +56,9 @@ static const value_string ranap_pdu_index_values[] = { {InitiatingMessage, "InitiatingMessage"}, {SuccessfulOutcome, "SuccessfulOutcome"}, - {UnsuccessfulOutcome, "UnsuccessfulOutcome"}, - {Outcome, "Outcome"}, - { 0, NULL} + {UnsuccessfulOutcome, "UnsuccessfulOutcome"}, + {Outcome, "Outcome"}, + { 0, NULL} }; @@ -134,7 +134,7 @@ static const value_string ranap_message_names[][5] = { { SuccessfulOutcome, "undefined message"}, { UnsuccessfulOutcome, "undefined message"}, { Outcome, "RAB-AssignmentResponse"}, - { 0, NULL}, }, + { 0, NULL}, }, { /* PC_Iu_Release */ { InitiatingMessage, "Iu-ReleaseCommand"}, { SuccessfulOutcome, "Iu-ReleaseComplete"}, @@ -143,165 +143,165 @@ static const value_string ranap_message_names[][5] = { { 0, NULL}, }, { /* PC_RelocationPreparation */ { InitiatingMessage, "RelocationRequired"}, - { SuccessfulOutcome, "RelocationCommand"}, + { SuccessfulOutcome, "RelocationCommand"}, { UnsuccessfulOutcome, "RelocationPreparationFailure"}, - { Outcome, NULL}, + { Outcome, NULL}, { 0, NULL}, }, { /* PC_RelocationResourceAllocation */ - { InitiatingMessage, "RelocationRequest"}, - { SuccessfulOutcome, "RelocationRequestAcknowledge"}, - { UnsuccessfulOutcome, "RelocationFailure"}, - { Outcome, NULL}, + { InitiatingMessage, "RelocationRequest"}, + { SuccessfulOutcome, "RelocationRequestAcknowledge"}, + { UnsuccessfulOutcome, "RelocationFailure"}, + { Outcome, NULL}, { 0, NULL}, }, { /* PC_RelocationCancel */ - { InitiatingMessage, "RelocationCancel"}, - { SuccessfulOutcome, "RelocationCancelAcknowledge"}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, + { InitiatingMessage, "RelocationCancel"}, + { SuccessfulOutcome, "RelocationCancelAcknowledge"}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, { 0, NULL}, }, { /* PC_SRNS_ContextTransfer */ { InitiatingMessage, "SRNS-ContextRequest"}, - { SuccessfulOutcome, "SRNS-ContextResponse"}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { SuccessfulOutcome, "SRNS-ContextResponse"}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_SecurityModeControl */ - { InitiatingMessage, "SecurityModeCommand"}, - { SuccessfulOutcome, "SecurityModeComplete"}, - { UnsuccessfulOutcome, "SecurityModeReject"}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "SecurityModeCommand"}, + { SuccessfulOutcome, "SecurityModeComplete"}, + { UnsuccessfulOutcome, "SecurityModeReject"}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_DataVolumeReport */ - { InitiatingMessage, "DataVolumeReportRequest"}, - { SuccessfulOutcome, "DataVolumeReport"}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "DataVolumeReportRequest"}, + { SuccessfulOutcome, "DataVolumeReport"}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_CN_InformationBroadcast */ - { InitiatingMessage, "CN-InformationBroadcastRequest"}, - { SuccessfulOutcome, "CN-InformationBroadcastConfirm"}, - { UnsuccessfulOutcome, "CN-InformationBroadcastReject"}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "CN-InformationBroadcastRequest"}, + { SuccessfulOutcome, "CN-InformationBroadcastConfirm"}, + { UnsuccessfulOutcome, "CN-InformationBroadcastReject"}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_Reset */ - { InitiatingMessage, "Reset"}, - { SuccessfulOutcome, "ResetAcknowledge"}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "Reset"}, + { SuccessfulOutcome, "ResetAcknowledge"}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_RAB_ReleaseRequest */ - { InitiatingMessage, "RAB-ReleaseRequest"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "RAB-ReleaseRequest"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_Iu_ReleaseRequest */ - { InitiatingMessage, "Iu-ReleaseRequest"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "Iu-ReleaseRequest"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_RelocationDetect */ - { InitiatingMessage, "RelocationDetect"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "RelocationDetect"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_RelocationComplete */ - { InitiatingMessage, "RelocationComplete"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "RelocationComplete"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_Paging */ - { InitiatingMessage, "Paging"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "Paging"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_CommonID */ - { InitiatingMessage, "CommonID"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "CommonID"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_CN_InvokeTrace */ - { InitiatingMessage, "CN-InvokeTrace"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "CN-InvokeTrace"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, {/* PC_LocationReportingControl */ - { InitiatingMessage, "LocationReportingControl"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "LocationReportingControl"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_LocationReport */ - { InitiatingMessage, "LocationReport"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "LocationReport"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_InitialUE_Message */ - { InitiatingMessage, "InitialUE-Message"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "InitialUE-Message"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_DirectTransfer */ - { InitiatingMessage, "DirectTransfer"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "DirectTransfer"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_OverloadControl */ - { InitiatingMessage, "Overload"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "Overload"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_ErrorIndication */ - { InitiatingMessage, "ErrorIndication"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "ErrorIndication"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_SRNS_DataForward */ - { InitiatingMessage, "SRNS-DataForwardCommand"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, + { InitiatingMessage, "SRNS-DataForwardCommand"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, { 0, NULL}, }, { /* PC_ForwardSRNS_Context */ - { InitiatingMessage, "ForwardSRNS-Context"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "ForwardSRNS-Context"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_privateMessage */ - { InitiatingMessage, "PrivateMessage"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "PrivateMessage"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_CN_DeactivateTrace */ - { InitiatingMessage, "CN-DeactivateTrace"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "CN-DeactivateTrace"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_ResetResource */ - { InitiatingMessage, "ResetResource"}, - { SuccessfulOutcome, "ResetResourceAcknowledge"}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, - { 0, NULL}, }, + { InitiatingMessage, "ResetResource"}, + { SuccessfulOutcome, "ResetResourceAcknowledge"}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, + { 0, NULL}, }, { /* PC_RANAP_Relocation */ - { InitiatingMessage, "RANAP-RelocationInformation"}, - { SuccessfulOutcome, NULL}, - { UnsuccessfulOutcome, NULL}, - { Outcome, NULL}, + { InitiatingMessage, "RANAP-RelocationInformation"}, + { SuccessfulOutcome, NULL}, + { UnsuccessfulOutcome, NULL}, + { Outcome, NULL}, { 0, NULL}, } }; @@ -483,7 +483,7 @@ static const value_string ranap_ie_id_values[] = { {IE_SAI, "SAI"}, {IE_SAPI, "SAPI"}, {IE_SourceID, "SourceID"}, - {IE_SourceRNC_ToTargetRNC_TransparentContainer, + {IE_SourceRNC_ToTargetRNC_TransparentContainer, "SourceRNC_ToTargetRNC_TransparentContainer"}, {IE_TargetID, "TargetID"}, {IE_TargetRNC_ToSourceRNC_TransparentContainer, @@ -530,8 +530,8 @@ static const value_string ranap_ie_id_values[] = { /* Traffic Class values */ #define TC_conversational 0 -#define TC_streaming 1 -#define TC_interactive 2 +#define TC_streaming 1 +#define TC_interactive 2 #define TC_background 3 static const value_string ranap_trafficClass_values[] = { @@ -577,53 +577,53 @@ static const value_string ranap_deliveryOfErroneousSDU_values[] = { {DOES_no, "no"}, {DOES_no_error_detection_consideration, "no-error-detection-consideration"}, {0, NULL}}; - - -#define subflowSDU_Size_LENGTH 2 + + +#define subflowSDU_Size_LENGTH 2 #define transferDelay_LENGTH 2 - - + + /* trafficHandlingPriority values */ static const value_string ranap_priority_values[] = { { 0, "spare"}, { 1, "highest"}, { 2, ""}, { 3, ""}, - { 4, ""}, - { 5, ""}, + { 4, ""}, + { 5, ""}, { 6, ""}, { 7, ""}, - { 8, ""}, - { 9, ""}, - { 10, ""}, - { 11, ""}, - { 12, ""}, - { 13, ""}, - { 14, "lowest"}, - { 15, "no-priority-used"}, - { 0, NULL}}; - - + { 8, ""}, + { 9, ""}, + { 10, ""}, + { 11, ""}, + { 12, ""}, + { 13, ""}, + { 14, "lowest"}, + { 15, "no-priority-used"}, + { 0, NULL}}; + + /* pre-emptionCapability values */ static const value_string ranap_pre_emptionCapability_values[] = { { 0, "shall-not-trigger-pre-emption"}, { 1, "may-trigger-pre-emption"}, - { 0, NULL}}; - + { 0, NULL}}; + /* pre-emptionVulnerability values */ static const value_string ranap_pre_emptionVulnerability_values[] = { - { 0, "not-pre-emptable"}, - { 1, "pre-emptable"}, + { 0, "not-pre-emptable"}, + { 1, "pre-emptable"}, { 0, NULL}}; - - + + /* queuingAllowed values */ static const value_string ranap_queuingAllowed_values[] = { { 0, "queueing-not-allowed"}, - { 1, "queueing-allowed"}, - { 0, NULL}}; + { 1, "queueing-allowed"}, + { 0, NULL}}; + - /* sourceStatisticsDescriptor values */ static const value_string ranap_sourceStatisticsDescriptor_values[] = { { 0, "speech"}, @@ -635,27 +635,27 @@ static const value_string ranap_relocationRequirement_values[] = { { 0, "lossless"}, { 1, "none"}, { 0, NULL}}; - + /* userPlaneMode values */ -static const value_string ranap_userPlaneMode_values[] = { - { 0, "transparent-mode"}, +static const value_string ranap_userPlaneMode_values[] = { + { 0, "transparent-mode"}, { 1, "support-mode-for-predefined-SDU-sizes"}, { 0, NULL}}; /* PDP_Type values */ -static const value_string ranap_PDP_Type_values[] = { - { 0, "empty"}, - { 1, "ppp"}, +static const value_string ranap_PDP_Type_values[] = { + { 0, "empty"}, + { 1, "ppp"}, { 2, "osp-ihoss"}, - { 3, "ipv4"}, + { 3, "ipv4"}, { 4, "ipv6"}, { 0, NULL}}; /* dataVolumeReportingIndication values */ -static const value_string ranap_dataVolumeReportingIndication_values[] = { - { 0, "do-report"}, - { 1, "do-not-report"}, - { 0, NULL}}; +static const value_string ranap_dataVolumeReportingIndication_values[] = { + { 0, "do-report"}, + { 1, "do-not-report"}, + { 0, NULL}}; /* cause_choice values */ @@ -666,12 +666,12 @@ static const value_string ranap_dataVolumeReportingIndication_values[] = { #define CC_CauseMisc 4 #define CC_CauseNon_Standard 5 -static const value_string ranap_cause_choice_values[] = { - { CC_CauseRadioNetwork, "CauseRadioNetwork"}, - { CC_CauseTransmissionNetwork, "CauseTransmissionNetwork"}, +static const value_string ranap_cause_choice_values[] = { + { CC_CauseRadioNetwork, "CauseRadioNetwork"}, + { CC_CauseTransmissionNetwork, "CauseTransmissionNetwork"}, { CC_CauseNAS, "CauseNAS"}, - { CC_CauseProtocol, "CauseProtocol"}, - { CC_CauseMisc, "CauseMisc"}, + { CC_CauseProtocol, "CauseProtocol"}, + { CC_CauseMisc, "CauseMisc"}, { CC_CauseNon_Standard, "CauseNon-Standard"}, { 0, NULL}}; @@ -723,7 +723,7 @@ static const value_string ranap_cause_value_str[] = { { 42, "requested-information-not-available"}, { 43, "relocation-desirable-for-radio-reasons"}, { 44, "relocation-not-supported-in-target-RNC-or-target-system"}, - { 45, "directed-retry"}, + { 45, "directed-retry"}, { 46, "radio-connection-with-UE-Lost"}, /* CauseTransmissionNetwork (65..80) */ @@ -749,27 +749,27 @@ static const value_string ranap_cause_value_str[] = { {115, "unspecified-failure"}, {116, "network-optimisation"}, { 0, NULL}}; - + /* CN_DomainIndicator_values */ static const value_string ranap_CN_DomainIndicator_values[] = { { 0, "cs-domain"}, - { 1, "ps-domain"}, - { 0, NULL}}; + { 1, "ps-domain"}, + { 0, NULL}}; /* SAPI_values */ static const value_string ranap_SAPI_values[] = { { 0, "sapi-0"}, - { 1, "sapi-3"}, - { 0, NULL}}; + { 1, "sapi-3"}, + { 0, NULL}}; /* service_Handover_values */ static const value_string ranap_service_Handover_values[] = { { 0, "handover-to-GSM-should-be-performed"}, - { 1, "handover-to-GSM-should-not-be-performed"}, - { 2, "handover-to-GSM-shall-not-be-performed"}, - { 0, NULL}}; + { 1, "handover-to-GSM-should-not-be-performed"}, + { 2, "handover-to-GSM-shall-not-be-performed"}, + { 0, NULL}}; /* Initialize the protocol and registered fields */ /* protocol */ @@ -912,7 +912,7 @@ static gint ett_ranap_CriticalityDiagnostics_IE = -1; /* */ /*****************************************************************************/ -/* sets *offset and *bitoffset n bits further */ +/* sets *offset and *bitoffset n bits further */ static void proceed_nbits(gint *offset, gint *bitoffset, gint n) { @@ -938,7 +938,7 @@ proceed_perint32(gint *offset, gint *bitoffset, gint length) proceed_nbits(offset, bitoffset, 2); allign(offset, bitoffset); *offset += length; -} +} /* extract length field found at offset */ @@ -948,7 +948,7 @@ extract_length(tvbuff_t *tvb, gint offset, gint *length, gint *length_size) { guint8 tmp_length8; guint16 tmp_length16; - + tmp_length8 = tvb_get_guint8(tvb, offset); if ((tmp_length8 & 0x80) == 0) { @@ -956,7 +956,7 @@ extract_length(tvbuff_t *tvb, gint offset, gint *length, gint *length_size) *length = tmp_length8; *length_size = 1; } - else + else { tmp_length16 = tvb_get_ntohs(tvb, offset); if ( ((tmp_length16 & 0x8000) == 0x8000) && ((tmp_length16 & 0x4000) == 0) ) @@ -979,7 +979,7 @@ extract_nbits(tvbuff_t *tvb, gint offset, gint bitoffset, gint n) { guint8 uint_bits; guint16 tmp_2bytes; - + /* extract value */ if (bitoffset + n <= 8) { @@ -1006,17 +1006,17 @@ extract_int32(tvbuff_t *tvb, gint offset, gint bitoffset, gint *length) { guint16 tmp_2byte; guint32 result = 0; - + tmp_2byte = tvb_get_ntohs(tvb, offset); - + tmp_2byte <<= bitoffset; /* remove bitoffset */ *length = tmp_2byte >> (6 + 8); /* allign 2bit length field to LSB */ (*length)++; /* now we have the length of the int value */ - + proceed_nbits(&offset, &bitoffset, 2); allign(&offset, &bitoffset); - switch (*length) + switch (*length) { case 1: result = tvb_get_guint8(tvb, offset); @@ -1031,7 +1031,7 @@ extract_int32(tvbuff_t *tvb, gint offset, gint bitoffset, gint *length) result = tvb_get_ntohl(tvb, offset); break; } - + return(result); } @@ -1042,16 +1042,16 @@ bitmaskstr(guint bitoffset, guint bitlength, guint16 value, guint *length) { static char maskstr[20]; guint i; - + strcpy(maskstr, " "); for (i=0; i<16; i++) { - if ( i < bitoffset || i > bitoffset+bitlength-1 ) + if ( i < bitoffset || i > bitoffset+bitlength-1 ) { /* i is outside extracted bitfield */ - maskstr[i + i/4] = '.'; + maskstr[i + i/4] = '.'; } else { /* i is inside extracted bitfield */ @@ -1076,16 +1076,16 @@ bitmaskstr(guint bitoffset, guint bitlength, guint16 value, guint *length) else { /* bitfield is located within first & second byte */ - maskstr[19] = '\0'; + maskstr[19] = '\0'; *length = 2; - } + } return(maskstr); -} +} /* add bitstring */ static proto_item * -proto_tree_add_bitstring(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, +proto_tree_add_bitstring(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, gint bitoffset, gint bitlength) { guint16 read_2bytes; @@ -1101,19 +1101,19 @@ proto_tree_add_bitstring(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offs gint byte_span; gint initial_offset = offset; - memset(bitstr, 0, 128); - + memset(bitstr, 0, 128); + /* create bitmask string for first byte */ read_2bytes = tvb_get_ntohs(tvb, offset); - maskstr = bitmaskstr(bitoffset, (bitoffset+bitlength >8) ? 8-bitoffset : bitlength, read_2bytes, &length); + maskstr = bitmaskstr(bitoffset, (bitoffset+bitlength >8) ? 8-bitoffset : bitlength, read_2bytes, &length); if (bitoffset+bitlength > 8) { - sprintf(maskstr_buf, "%s + %d Bits = ", maskstr, bitlength - (8-bitoffset)); + sprintf(maskstr_buf, "%s + %d Bits = ", maskstr, bitlength - (8-bitoffset)); } else { - sprintf(maskstr_buf, "%s = ", maskstr); - } + sprintf(maskstr_buf, "%s = ", maskstr); + } /* print all but the last byte to buf */ @@ -1122,47 +1122,47 @@ proto_tree_add_bitstring(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offs { read_2bytes = tvb_get_ntohs(tvb, offset); alligned_2bytes = read_2bytes << bitoffset; /* remove bitoffset */ - one_byte = alligned_2bytes >> 8; /* move to low byte */ - + one_byte = alligned_2bytes >> 8; /* move to low byte */ + bitstr[i]=one_byte; sprintf(&(buf[2*i]), "%02X", one_byte); } - + /* add last byte if it contains bits which have not yet been shifted in */ if ( ((bitlength + 7) / 8 ) == byte_span ) { read_2bytes = tvb_get_ntohs(tvb, offset); alligned_2bytes = read_2bytes << bitoffset; /* remove bitoffset */ - one_byte = alligned_2bytes >> 8; /* move to low byte */ - one_byte >>= (8 - (bitlength%8)); /*cut off surplus bits */ - one_byte <<= (8 - (bitlength%8)); /* allign to MSB in low byte*/ - + one_byte = alligned_2bytes >> 8; /* move to low byte */ + one_byte >>= (8 - (bitlength%8)); /*cut off surplus bits */ + one_byte <<= (8 - (bitlength%8)); /* allign to MSB in low byte*/ + bitstr[i]=one_byte; - sprintf(&(buf[2*i]), "%02X", one_byte); + sprintf(&(buf[2*i]), "%02X", one_byte); } - + /* get header field info */ hf_info_p = proto_registrar_get_nth(hfindex); return ( proto_tree_add_bytes_format(tree, hfindex, tvb, initial_offset, - byte_span , bitstr, "%s %s: %s", maskstr_buf, hf_info_p->name, buf) ); - + byte_span , bitstr, "%s %s: %s", maskstr_buf, hf_info_p->name, buf) ); + } - - + + /* add unsigned int, 1-8 bits long */ static proto_item * -proto_tree_add_uint_bits(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, +proto_tree_add_uint_bits(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, gint bitoffset, gint bitlength, gint min) { guint8 uint_bits; guint16 read_2bytes, alligned_2bytes; - char *maskstr; + char *maskstr; guint length; header_field_info *hf_info_p; - + /* extract value */ if (bitoffset + bitlength <= 8) { @@ -1177,12 +1177,12 @@ proto_tree_add_uint_bits(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offs read_2bytes = tvb_get_ntohs(tvb, offset); } alligned_2bytes = read_2bytes << bitoffset; /* remove bitoffset */ - uint_bits = alligned_2bytes >> ( 8 + (8-bitlength)); /* allign to LSB */ - + uint_bits = alligned_2bytes >> ( 8 + (8-bitlength)); /* allign to LSB */ + uint_bits += min; /* create bitmask string */ - maskstr = bitmaskstr(bitoffset, bitlength, read_2bytes, &length); + maskstr = bitmaskstr(bitoffset, bitlength, read_2bytes, &length); /* get header field info */ hf_info_p = proto_registrar_get_nth(hfindex); @@ -1191,44 +1191,44 @@ proto_tree_add_uint_bits(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offs { /* string representation for decoded header field present */ return ( proto_tree_add_uint_format(tree, hfindex, tvb, offset, - length, uint_bits, "%s = %s: %s (%d)", maskstr, hf_info_p->name, + length, uint_bits, "%s = %s: %s (%d)", maskstr, hf_info_p->name, val_to_str(uint_bits, hf_info_p->strings, "%d"), uint_bits) ); } else { /* no string representation */ return ( proto_tree_add_uint_format(tree, hfindex, tvb, offset, - length, uint_bits, "%s = %s: %d", maskstr, hf_info_p->name, uint_bits) ); - } -} + length, uint_bits, "%s = %s: %d", maskstr, hf_info_p->name, uint_bits) ); + } +} /* add PER encoded integer (maximum length of value: 4 bytes) */ static proto_item * -proto_tree_add_PERint32(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, +proto_tree_add_PERint32(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint offset, gint bitoffset, gint *length, gint min) -{ - guint32 value; +{ + guint32 value; guint16 tmp_2bytes; char *maskstr; guint length_size; - header_field_info *hf_info_p; - + header_field_info *hf_info_p; + /* get value */ value = extract_int32(tvb, offset, bitoffset, length); value += min; - + /* create bitmask string for 2 bit length field */ - tmp_2bytes = tvb_get_ntohs(tvb, offset); - maskstr = bitmaskstr(bitoffset, 2, tmp_2bytes, &length_size); + tmp_2bytes = tvb_get_ntohs(tvb, offset); + maskstr = bitmaskstr(bitoffset, 2, tmp_2bytes, &length_size); /* get header field info */ hf_info_p = proto_registrar_get_nth(hfindex); - + return ( proto_tree_add_uint_format(tree, hfindex, tvb, offset, - (*length) + length_size, value, - "%s + %d Bytes = %s: %d", maskstr, *length, hf_info_p->name, value) ); -} - + (*length) + length_size, value, + "%s + %d Bytes = %s: %d", maskstr, *length, hf_info_p->name, value) ); +} + /*****************************************************************************/ @@ -1240,31 +1240,31 @@ static int dissect_iE_Extension(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoffset, char *description) { proto_item *ext_item = NULL; - proto_tree *ext_tree = NULL; - guint16 number_of_extFields; + proto_tree *ext_tree = NULL; + guint16 number_of_extFields; gint number_of_octets = 0; gint number_of_octets_size = 0; int i; - + allign(offset, bitoffset); - + /* create subtree for iE_Extension */ if (tree) { ext_item = proto_tree_add_text(tree, tvb, *offset, 0, "%s iE-Extensions", description); ext_tree = proto_item_add_subtree(ext_item, ett_ranap_iE_Extension); } - + /* number of extension fields */ number_of_extFields = tvb_get_ntohs(tvb, *offset) + 1; if (ext_tree) { - proto_tree_add_uint(ext_tree, hf_ranap_number_of_ProtocolExtensionFields, - tvb, *offset, 2, number_of_extFields); + proto_tree_add_uint(ext_tree, hf_ranap_number_of_ProtocolExtensionFields, + tvb, *offset, 2, number_of_extFields); } - - *offset += 2; - + + *offset += 2; + /* for each extension field */ for (i=1; i <= number_of_extFields; i++) { @@ -1273,25 +1273,25 @@ dissect_iE_Extension(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoff if (ext_tree) { proto_tree_add_item(ext_tree, hf_ranap_ext_field_id, tvb, - *offset, IE_ID_LENGTH, FALSE); - } + *offset, IE_ID_LENGTH, FALSE); + } *offset += IE_ID_LENGTH; - + /* criticality */ if (ext_tree) { - proto_tree_add_uint_bits(ext_tree, hf_ranap_ext_field_criticality, tvb, + proto_tree_add_uint_bits(ext_tree, hf_ranap_ext_field_criticality, tvb, *offset, *bitoffset, 2, 0); } - proceed_nbits(offset, bitoffset, 2); - + proceed_nbits(offset, bitoffset, 2); + /* number of octets in the IE */ allign(offset, bitoffset); if (0 == extract_length(tvb, *offset, &number_of_octets, &number_of_octets_size)) { if (ext_tree) { - proto_tree_add_uint(ext_tree, hf_ranap_ext_field_number_of_octets, tvb, + proto_tree_add_uint(ext_tree, hf_ranap_ext_field_number_of_octets, tvb, *offset, number_of_octets_size, number_of_octets); } } @@ -1305,28 +1305,28 @@ dissect_iE_Extension(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoff } return(-1); } - + *offset += number_of_octets_size; if (ext_tree) { proto_tree_add_item(ext_tree, hf_ranap_extension_field, tvb, *offset, number_of_octets, FALSE); - + } *offset += number_of_octets; } - + return(0); } - - -static int + + +static int dissect_userPlaneInformation(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint *bitoffset) { int extension_present; int iE_Extensions_present; - int tmp_extension_present; + int tmp_extension_present; /* protocol_extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); @@ -1334,36 +1334,36 @@ dissect_userPlaneInformation(tvbuff_t *tvb, proto_tree *tree, gint *offset, gint /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); /* userPlaneMode */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - - proto_tree_add_uint_bits(tree, hf_ranap_userPlaneMode, tvb, *offset, + proceed_nbits(offset, bitoffset, 1); + + proto_tree_add_uint_bits(tree, hf_ranap_userPlaneMode, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* uP-ModeVersions */ - proto_tree_add_bitstring(tree, hf_ranap_uP_ModeVersions, tvb, *offset, + proto_tree_add_bitstring(tree, hf_ranap_uP_ModeVersions, tvb, *offset, *bitoffset, 16); - proceed_nbits(offset, bitoffset, 16); - + proceed_nbits(offset, bitoffset, 16); + /* iE-Extensions */ if (iE_Extensions_present) - { - return(dissect_iE_Extension(tvb, tree, offset, bitoffset, "UserPlaneInformation")); + { + return(dissect_iE_Extension(tvb, tree, offset, bitoffset, "UserPlaneInformation")); } return(0); } -static int +static int dissect_sDU_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { proto_item *sDU_item = NULL; - proto_tree *sDU_tree = NULL; + proto_tree *sDU_tree = NULL; proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; int ret; @@ -1380,179 +1380,179 @@ dissect_sDU_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b int rAB_SubflowCombinationBitRate_present; int sDU_FormatInformationParameters_iE_Extensions_present; gint i; - + /* create subtree for sDU_Parameters */ sDU_item = proto_tree_add_text(ie_tree, tvb, *offset, 0, "sDU Parameters"); - sDU_tree = proto_item_add_subtree(sDU_item, ett_ranap_sDU); + sDU_tree = proto_item_add_subtree(sDU_item, ett_ranap_sDU); /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(sDU_tree, tvb, *offset, 1, "sDU_Parameters Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); /* protocol_extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, *offset, *bitoffset, 1, 0); proceed_nbits(offset, bitoffset, 1); - + /* sDU_ErrorRatio present ? */ sDU_ErrorRatio_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_sDU_ErrorRatio_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_sDU_ErrorRatio_present, tvb, *offset, *bitoffset, 1, 0); proceed_nbits(offset, bitoffset, 1); - + /* sDU_FormatInformationParameters present ? */ sDU_FormatInformationParameters_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_sDU_FormatInformationParameters_present, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proto_tree_add_uint_bits(optionals_tree, hf_ranap_sDU_FormatInformationParameters_present, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); /* sDU_ErrorRatio */ if (sDU_ErrorRatio_present) { sDU_ErrorRatio_iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); - proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_mantissa, tvb, *offset, + proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_mantissa, tvb, *offset, *bitoffset, 4, 1); proceed_nbits(offset, bitoffset, 4); - - proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_exponent, tvb, *offset, + + proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_exponent, tvb, *offset, *bitoffset, 3, 1); - proceed_nbits(offset, bitoffset, 3); - + proceed_nbits(offset, bitoffset, 3); + if (sDU_ErrorRatio_iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, sDU_tree, offset, bitoffset, "sDU_ErrorRatio")) != 0) return (ret); - } + } } - + /* residualBitErrorRatio */ residualBitErrorRatio_iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); proceed_nbits(offset, bitoffset, 1); - - proto_tree_add_uint_bits(sDU_tree, hf_ranap_residualBitErrorRatio_mantissa, tvb, *offset, + + proto_tree_add_uint_bits(sDU_tree, hf_ranap_residualBitErrorRatio_mantissa, tvb, *offset, *bitoffset, 4, 1); proceed_nbits(offset, bitoffset, 4); - - proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_exponent, tvb, *offset, + + proto_tree_add_uint_bits(sDU_tree, hf_ranap_sDU_ErrorRatio_exponent, tvb, *offset, *bitoffset, 3, 1); - proceed_nbits(offset, bitoffset, 3); - - + proceed_nbits(offset, bitoffset, 3); + + if (residualBitErrorRatio_iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, sDU_tree, offset, bitoffset, "residualBitErrorRatio")) != 0) return(ret); - } - - + } + + /* deliveryOfErroneousSDU */ - proto_tree_add_uint_bits(sDU_tree, hf_ranap_deliveryOfErroneousSDU, tvb, *offset, + proto_tree_add_uint_bits(sDU_tree, hf_ranap_deliveryOfErroneousSDU, tvb, *offset, *bitoffset, 2, 0); proceed_nbits(offset, bitoffset, 2); - + /* sDU_FormatInformationParameters */ if (sDU_FormatInformationParameters_present) { number_of_sDU_FormatInformationParameters = extract_nbits(tvb, *offset, *bitoffset, 6) + 1; proceed_nbits(offset, bitoffset, 6); - + for (i=1; i<= number_of_sDU_FormatInformationParameters; i++) { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(sDU_tree, tvb, *offset, 1, "sDU_FormatInformationParameters Extension/Optional/Default bitmap"); optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + /* protocol extension present ? */ - sDU_FormatInformationParameters_extension_present = + sDU_FormatInformationParameters_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); + /* subflowSDU_Size present ? */ subflowSDU_Size_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_subflowSDU_Size_present, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proto_tree_add_uint_bits(optionals_tree, hf_ranap_subflowSDU_Size_present, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); + /* rAB_SubflowCombinationBitRate present ? */ rAB_SubflowCombinationBitRate_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_rAB_SubflowCombinationBitRate_present, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - - /* ie_Extension present ? */ - sDU_FormatInformationParameters_iE_Extensions_present = - extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, - *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proto_tree_add_uint_bits(optionals_tree, hf_ranap_rAB_SubflowCombinationBitRate_present, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); + + /* ie_Extension present ? */ + sDU_FormatInformationParameters_iE_Extensions_present = + extract_nbits(tvb, *offset, *bitoffset, 1); + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + *offset, *bitoffset, 1, 0); + proceed_nbits(offset, bitoffset, 1); + if (subflowSDU_Size_present) { allign(offset, bitoffset); - proto_tree_add_item(sDU_tree, hf_ranap_subflowSDU_Size, - tvb, *offset, subflowSDU_Size_LENGTH, FALSE); - offset += subflowSDU_Size_LENGTH; + proto_tree_add_item(sDU_tree, hf_ranap_subflowSDU_Size, + tvb, *offset, subflowSDU_Size_LENGTH, FALSE); + offset += subflowSDU_Size_LENGTH; } - + if (rAB_SubflowCombinationBitRate_present) { proto_tree_add_PERint32(sDU_tree, hf_ranap_rAB_SubflowCombinationBitRate, - tvb, *offset, *bitoffset, &length, 0); + tvb, *offset, *bitoffset, &length, 0); proceed_perint32(offset, bitoffset, length); - } - + } + if (sDU_FormatInformationParameters_iE_Extensions_present) { - if ((ret=dissect_iE_Extension(tvb, sDU_tree, offset, bitoffset, + if ((ret=dissect_iE_Extension(tvb, sDU_tree, offset, bitoffset, "sDU_FormatInformationParameters" )) != 0) return (ret); } - } - } - + } + } + if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for sDU_FormatInformationParameters present, dissection not supported"); - return(-1); - } - - return (0); - -} + return(-1); + } + + return (0); + +} -static int +static int dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { guint8 tmp_byte; proto_item *rab_item = NULL; - proto_tree *rab_tree = NULL; + proto_tree *rab_tree = NULL; proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; proto_item *prio_item = NULL; proto_tree *prio_tree = NULL; int ret; int extension_present; - int tmp_extension_present; + int tmp_extension_present; int guaranteedBitRate_present; int transferDelay_present; int trafficHandlingPriority_present; @@ -1563,74 +1563,74 @@ dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b int tmp_iE_Extensions_present; int i; gint length; - + /* create subtree for rAB_Parameters */ rab_item = proto_tree_add_text(ie_tree, tvb, *offset, 0, "rAB_Parameters"); - rab_tree = proto_item_add_subtree(rab_item, ett_ranap_rAB_Parameters); - + rab_tree = proto_item_add_subtree(rab_item, ett_ranap_rAB_Parameters); + /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(rab_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "rAB_Parameters Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); /* protocol extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); /* guaranteedBitRate present ? */ guaranteedBitRate_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_guaranteedBitRate_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* transferDelay present ? */ transferDelay_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_transferDelay_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* trafficHandlingPriority present ? */ trafficHandlingPriority_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_trafficHandlingPriority_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* allocationOrRetentionPriority present ? */ allocationOrRetentionPriority_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_allocationOrRetentionPriority_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); /* sourceStatisticsDescriptor present ? */ sourceStatisticsDescriptor_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_sourceStatisticsDescriptor_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* relocationRequirement present ? */ relocationRequirement_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_relocationRequirement_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* iE-Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - - + proceed_nbits(offset, bitoffset, 1); + + /* trafficClass */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + proto_tree_add_uint_bits(rab_tree, hf_ranap_trafficClass, tvb, *offset, *bitoffset, 2, 0); proceed_nbits(offset, bitoffset, 2); - + if (tmp_extension_present) { /* decoding is not supported */ @@ -1642,83 +1642,83 @@ dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b /* rAB-AsymmetryIndicator */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + proto_tree_add_uint_bits(rab_tree, hf_ranap_rAB_AsymmetryIndicator, tvb, *offset, *bitoffset, 2, 0); - proceed_nbits(offset, bitoffset, 2); - + proceed_nbits(offset, bitoffset, 2); + if (tmp_extension_present) { /* decoding is not supported */ proto_tree_add_text(rab_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for rAB-AsymmetryIndicator present, dissection not supported"); return(-1); - } + } + - /* maxBitrate */ tmp_byte = extract_nbits(tvb, *offset, *bitoffset, 1) +1 ; /*sequence 1..2 */ proceed_nbits(offset, bitoffset, 1); - + for (i=1; i<= tmp_byte; i++) { proto_tree_add_PERint32(rab_tree, hf_ranap_maxBitrate, - tvb, *offset, *bitoffset, &length, 1); + tvb, *offset, *bitoffset, &length, 1); proceed_perint32(offset, bitoffset, length); - } - - + } + + /* guaranteedBitRate */ if (guaranteedBitRate_present) { tmp_byte = extract_nbits(tvb, *offset, *bitoffset, 1) +1 ; /*sequence 1..2 */ proceed_nbits(offset, bitoffset, 1); - + for (i=1; i<= tmp_byte; i++) { proto_tree_add_PERint32(rab_tree, hf_ranap_guaranteedBitrate, - tvb, *offset, *bitoffset, &length, 0); - proceed_perint32(offset, bitoffset, length); - } + tvb, *offset, *bitoffset, &length, 0); + proceed_perint32(offset, bitoffset, length); + } } /* deliveryOrder */ - proto_tree_add_uint_bits(rab_tree, hf_ranap_deliveryOrder, tvb, *offset, + proto_tree_add_uint_bits(rab_tree, hf_ranap_deliveryOrder, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - - + proceed_nbits(offset, bitoffset, 1); + + /* maxSDU-Size */ allign(offset, bitoffset); - proto_tree_add_item(rab_tree, hf_ranap_maxSDU_Size, - tvb, *offset, maxSDU_Size_LENGTH, FALSE); - *offset += maxSDU_Size_LENGTH; - + proto_tree_add_item(rab_tree, hf_ranap_maxSDU_Size, + tvb, *offset, maxSDU_Size_LENGTH, FALSE); + *offset += maxSDU_Size_LENGTH; + /* sDU-Parameters */ tmp_byte = extract_nbits(tvb, *offset, *bitoffset, 3) + 1; /*sequence 1..7 */ - proceed_nbits(offset, bitoffset, 3); + proceed_nbits(offset, bitoffset, 3); for (i=1; i<= tmp_byte; i++) - { + { if ((ret=dissect_sDU_Parameters(tvb, rab_tree, offset, bitoffset))!=0) return(ret); } - - /* transferDelay */ + + /* transferDelay */ if (transferDelay_present) { allign(offset, bitoffset); - proto_tree_add_item(rab_tree, hf_ranap_transferDelay, - tvb, *offset, transferDelay_LENGTH, FALSE); - *offset += transferDelay_LENGTH; + proto_tree_add_item(rab_tree, hf_ranap_transferDelay, + tvb, *offset, transferDelay_LENGTH, FALSE); + *offset += transferDelay_LENGTH; } /* trafficHandlingPriority */ if (trafficHandlingPriority_present) { - proto_tree_add_uint_bits(rab_tree, hf_ranap_trafficHandlingPriority, tvb, *offset, + proto_tree_add_uint_bits(rab_tree, hf_ranap_trafficHandlingPriority, tvb, *offset, *bitoffset, 4, 0); - proceed_nbits(offset, bitoffset, 4); + proceed_nbits(offset, bitoffset, 4); } /* allocationOrRetentionPriority */ @@ -1727,58 +1727,58 @@ dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b /* create subtree for */ prio_item = proto_tree_add_text(rab_tree, tvb, *offset, 0, "allocationOrRetentionPriority"); - prio_tree = proto_item_add_subtree(prio_item, ett_ranap_allocationOrRetentionPriority); - + prio_tree = proto_item_add_subtree(prio_item, ett_ranap_allocationOrRetentionPriority); + /* protocol extension present ? */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* iE Extension present ? */ tmp_iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* allocationOrRetentionPriority */ - proto_tree_add_uint_bits(prio_tree, hf_ranap_priorityLevel, tvb, *offset, + proto_tree_add_uint_bits(prio_tree, hf_ranap_priorityLevel, tvb, *offset, *bitoffset, 4, 0); - proceed_nbits(offset, bitoffset, 4); - + proceed_nbits(offset, bitoffset, 4); + /* pre-emptionCapability */ - proto_tree_add_uint_bits(prio_tree, hf_ranap_pre_emptionCapability, tvb, *offset, + proto_tree_add_uint_bits(prio_tree, hf_ranap_pre_emptionCapability, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* pre-emptionVulnerability */ - proto_tree_add_uint_bits(prio_tree, hf_ranap_pre_emptionVulnerability, tvb, *offset, + proto_tree_add_uint_bits(prio_tree, hf_ranap_pre_emptionVulnerability, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* queuingAllowed */ - proto_tree_add_uint_bits(prio_tree, hf_ranap_queuingAllowed, tvb, *offset, + proto_tree_add_uint_bits(prio_tree, hf_ranap_queuingAllowed, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + if (tmp_iE_Extensions_present) { - if ((ret=dissect_iE_Extension(tvb, prio_tree, offset, bitoffset, + if ((ret=dissect_iE_Extension(tvb, prio_tree, offset, bitoffset, "AllocationOrRetentionPriority")) != 0) - return (ret); - } - + return (ret); + } + if (tmp_extension_present) { /* decoding is not supported */ proto_tree_add_text(prio_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for rAB-allocationOrRetentionPriority present, dissection not supported"); return(-1); - } + } } - + /* sourceStatisticsDescriptor */ - if (sourceStatisticsDescriptor_present) + if (sourceStatisticsDescriptor_present) { /* protocol extension */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); if (tmp_extension_present) { @@ -1787,11 +1787,11 @@ dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b "Protocol extension for sourceStatisticsDescriptor present, dissection not supported"); return(-1); } - - proto_tree_add_uint_bits(rab_tree, hf_ranap_sourceStatisticsDescriptor, tvb, *offset, + + proto_tree_add_uint_bits(rab_tree, hf_ranap_sourceStatisticsDescriptor, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - } + proceed_nbits(offset, bitoffset, 1); + } /* relocationRequirement */ if (relocationRequirement_present) @@ -1799,29 +1799,29 @@ dissect_rAB_Parameters(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *b /* protocol extension */ tmp_extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); proceed_nbits(offset, bitoffset, 1); - + if (tmp_extension_present) { /* decoding is not supported */ proto_tree_add_text(prio_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for relocationRequirement present, dissection not supported"); return(-1); - } - - proto_tree_add_uint_bits(rab_tree, hf_ranap_relocationRequirement, tvb, *offset, + } + + proto_tree_add_uint_bits(rab_tree, hf_ranap_relocationRequirement, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - } + proceed_nbits(offset, bitoffset, 1); + } /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, rab_tree, offset, bitoffset, "rAB_Parameters" )) != 0 ) - return (ret); + return (ret); } - /* extended */ + /* extended */ if (extension_present) { /* decoding is not supported */ @@ -1839,31 +1839,31 @@ static int dissect_TransportLayerAddress(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { gint extension_present; - gint str_length; - + gint str_length; + extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); proceed_nbits(offset, bitoffset, 1); if (extension_present) - { - /* extended integer */ + { + /* extended integer */ proto_tree_add_text(ie_tree, tvb, *offset, 0, - "extension present for TransportLayerAddress, dissection not supported"); + "extension present for TransportLayerAddress, dissection not supported"); return (-1); } - + /* extract and add length of transportLayerAddress bitstring */ - str_length = extract_nbits(tvb, *offset, *bitoffset, 8) + 1; + str_length = extract_nbits(tvb, *offset, *bitoffset, 8) + 1; proto_tree_add_uint_bits(ie_tree, hf_ranap_transportLayerAddress_length, tvb, *offset, *bitoffset, 8, 1); - proceed_nbits(offset, bitoffset, 8); - allign(offset, bitoffset); - + proceed_nbits(offset, bitoffset, 8); + allign(offset, bitoffset); + /* add transportLayerAddress */ - proto_tree_add_bitstring(ie_tree, hf_ranap_transportLayerAddress, tvb, *offset, - *bitoffset, str_length); + proto_tree_add_bitstring(ie_tree, hf_ranap_transportLayerAddress, tvb, *offset, + *bitoffset, str_length); proceed_nbits(offset, bitoffset, str_length); - return (0); + return (0); } @@ -1873,100 +1873,100 @@ dissect_iuTransportAssociation(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, { guint extension_present; guint choice_value; - + /* extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); if (extension_present) - { - /* extended choice */ + { + /* extended choice */ proto_tree_add_text(ie_tree, tvb, *offset, 0, - "extension present for IuTransportAssociation, dissection not supported"); + "extension present for IuTransportAssociation, dissection not supported"); return (-1); } - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* choice */ choice_value = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); - allign(offset, bitoffset); + proceed_nbits(offset, bitoffset, 1); + allign(offset, bitoffset); if (choice_value == 0) { - /* gTP-TEI */ + /* gTP-TEI */ proto_tree_add_item(ie_tree, hf_ranap_gTP_TEI, tvb, *offset, 4, FALSE); *offset += 4; } else - { + { /* bindingID */ proto_tree_add_item(ie_tree, hf_ranap_bindingID, tvb, *offset, 4, FALSE); - *offset += 4; + *offset += 4; } - + return (0); -} - +} + static int dissect_transportLayerInformation(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int extension_present; - int iE_Extensions_present; - int ret; + int iE_Extensions_present; + int ret; /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "TransportLayerInformation Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); /* protocol extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* iE-Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); - /* transportLayerAddress */ - if ((ret=dissect_TransportLayerAddress(tvb, ie_tree, offset, bitoffset)) != 0) + /* transportLayerAddress */ + if ((ret=dissect_TransportLayerAddress(tvb, ie_tree, offset, bitoffset)) != 0) return (ret); - /* iuTransportAssociation */ - if ((ret=dissect_iuTransportAssociation(tvb, ie_tree, offset, bitoffset)) != 0) + /* iuTransportAssociation */ + if ((ret=dissect_iuTransportAssociation(tvb, ie_tree, offset, bitoffset)) != 0) return (ret); - + /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, offset, bitoffset, "TransportLayerInformation" )) != 0 ) - return (ret); + return (ret); } /* protocol extension */ if (extension_present) - { - /* extended sequence */ + { + /* extended sequence */ proto_tree_add_text(ie_tree, tvb, *offset, 0, - "extension present for TransportLayerInformation, dissection not supported"); + "extension present for TransportLayerInformation, dissection not supported"); return (-1); } - + return(0); } - + static int -dissect_dataVolumeList (tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset, char *parname) +dissect_dataVolumeList (tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset, char *parname) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; gint extension_present; gint dataVolumeReference_present; gint iE_Extensions_present; @@ -1974,128 +1974,128 @@ dissect_dataVolumeList (tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint * gint length; gint i; int ret; - + /* number of volumes */ number_vol = extract_nbits(tvb, *offset, *bitoffset, 1) + 1; - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + for (i=1; i<=number_vol; i++) { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, *offset, 1, "%d. %s Extension/Optional/Default bitmap", i, parname); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* dataVolumeReference present ? */ dataVolumeReference_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dataVolumeReference_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dataVolumeReference_present, tvb, *offset, *bitoffset, 1, 0); proceed_nbits(offset, bitoffset, 1); - + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - - + proceed_nbits(offset, bitoffset, 1); + + /* UnsuccessfullyTransmittedDataVolume */ proto_tree_add_PERint32(ie_tree, hf_ranap_dl_UnsuccessfullyTransmittedDataVolume, - tvb, *offset, *bitoffset, &length, 0); + tvb, *offset, *bitoffset, &length, 0); proceed_perint32(offset, bitoffset, length); - + /* DataVolumeReference */ if (dataVolumeReference_present) { - proto_tree_add_uint_bits(ie_tree, hf_ranap_dataVolumeReference, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_dataVolumeReference, tvb, *offset, *bitoffset, 8, 0); proceed_nbits(offset, bitoffset, 8); - } - + } + /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, offset, bitoffset, "dl-dataVolumes" )) != 0) return(ret); - } - + } + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for dl-dataVolumes present, dissection not supported"); - return(-1); - } + return(-1); + } } - - return (0); - -} + + return (0); + +} static int -dissect_cause(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) +dissect_cause(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { gint extension_present; - int cause_choice; + int cause_choice; /* protocol extension present ? */ - extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proceed_nbits(offset, bitoffset, 1); + extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); + proceed_nbits(offset, bitoffset, 1); if (extension_present) - { - /* choice extension present */ + { + /* choice extension present */ proto_tree_add_text(ie_tree, tvb, *offset, 0, - "extension present for cause, dissection not supported"); + "extension present for cause, dissection not supported"); return (-1); - } + } cause_choice = extract_nbits(tvb, *offset, *bitoffset, 3); proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_choice, tvb, *offset, *bitoffset, 3, 0); proceed_nbits(offset, bitoffset, 3); - + switch (cause_choice) { case CC_CauseRadioNetwork: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 6, 1); - proceed_nbits(offset, bitoffset, 6); + tvb, *offset, *bitoffset, 6, 1); + proceed_nbits(offset, bitoffset, 6); break; case CC_CauseTransmissionNetwork: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 4, 65); - proceed_nbits(offset, bitoffset, 4); - break; + tvb, *offset, *bitoffset, 4, 65); + proceed_nbits(offset, bitoffset, 4); + break; case CC_CauseNAS: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 4, 81); - proceed_nbits(offset, bitoffset, 4); - break; + tvb, *offset, *bitoffset, 4, 81); + proceed_nbits(offset, bitoffset, 4); + break; case CC_CauseProtocol: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 4, 97); - proceed_nbits(offset, bitoffset, 4); + tvb, *offset, *bitoffset, 4, 97); + proceed_nbits(offset, bitoffset, 4); case CC_CauseMisc: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 4, 113); - proceed_nbits(offset, bitoffset, 4); - break; + tvb, *offset, *bitoffset, 4, 113); + proceed_nbits(offset, bitoffset, 4); + break; case CC_CauseNon_Standard: proto_tree_add_uint_bits(ie_tree, hf_ranap_cause_value, - tvb, *offset, *bitoffset, 7, 129); - proceed_nbits(offset, bitoffset, 7); - break; + tvb, *offset, *bitoffset, 7, 129); + proceed_nbits(offset, bitoffset, 7); + break; default: proto_tree_add_text(ie_tree, tvb, *offset, 0, - "unexpected cause choice value, dissection not supported"); + "unexpected cause choice value, dissection not supported"); return(-1); } return(0); @@ -2103,65 +2103,65 @@ dissect_cause(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) static int -dissect_iEsCriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) +dissect_iEsCriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree, gint *offset, gint *bitoffset) { proto_item *diag_item = NULL; proto_tree *diag_tree = NULL; proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int extension_present; int repetitionNumber_present; int iE_Extensions_present; int num_of_errors; - int i; + int i; allign(offset, bitoffset); num_of_errors = extract_nbits(tvb, *offset, *bitoffset, 8) + 1; - proto_tree_add_uint_bits(ie_tree, hf_ranap_num_of_CriticalityDiagnostics_IEs, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_num_of_CriticalityDiagnostics_IEs, tvb, *offset, *bitoffset, 8, 1); - proceed_nbits(offset, bitoffset, 8); - + proceed_nbits(offset, bitoffset, 8); + for ( i= 1; i <= num_of_errors; i++) { /* add subtree for CriticalityDiagnostics-IE */ - diag_item = proto_tree_add_text(ie_tree, tvb, *offset, 0, + diag_item = proto_tree_add_text(ie_tree, tvb, *offset, 0, "%d. CriticalityDiagnostics-IE", i); diag_tree = proto_item_add_subtree(diag_item, ett_ranap_CriticalityDiagnostics_IE); - + /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(diag_tree, tvb, *offset, 1, "CriticalityDiagnostics-IE Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* repetitionNumber present ? */ repetitionNumber_present = extract_nbits(tvb, *offset, *bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_repetitionNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_repetitionNumber_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, *offset, *bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, *offset, *bitoffset, 1, 0); - proceed_nbits(offset, bitoffset, 1); - + proceed_nbits(offset, bitoffset, 1); + /* iECriticality */ proto_tree_add_uint_bits(diag_tree, hf_ranap_iECriticality, tvb, *offset, *bitoffset, 2, 0); - proceed_nbits(offset, bitoffset, 2); - + proceed_nbits(offset, bitoffset, 2); + /* iE-ID */ allign(offset, bitoffset); proto_tree_add_item(diag_tree, hf_ranap_ie_ie_id, tvb, - *offset, IE_ID_LENGTH, FALSE); + *offset, IE_ID_LENGTH, FALSE); *offset += IE_ID_LENGTH; - + /* repetitionNumber */ if (repetitionNumber_present) { @@ -2169,28 +2169,28 @@ dissect_iEsCriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree, gint *offs proto_tree_add_uint_bits(diag_tree, hf_ranap_repetitionNumber, tvb, *offset, *bitoffset, 8, 1); proceed_nbits(offset, bitoffset, 8); - } + } /* iE-Extensions */ if (iE_Extensions_present) { - return(dissect_iE_Extension(tvb, diag_tree, offset, bitoffset, "CriticalityDiagnostics-IE")); + return(dissect_iE_Extension(tvb, diag_tree, offset, bitoffset, "CriticalityDiagnostics-IE")); } - - + + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(diag_tree, tvb, *offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for CriticalityDiagnostics-IE present, dissection not supported"); - return(-1); - } - } - - return(0); -} + return(-1); + } + } + + return(0); +} @@ -2204,9 +2204,9 @@ static int dissect_IE_RAB_ID(tvbuff_t *tvb, proto_tree *ie_tree) { if (ie_tree) - { + { proto_tree_add_item(ie_tree, hf_ranap_rab_id, tvb, - 0, RAB_ID_LENGTH, FALSE); + 0, RAB_ID_LENGTH, FALSE); } return(0); } @@ -2216,9 +2216,9 @@ static int dissect_IE_RAC(tvbuff_t *tvb, proto_tree *ie_tree) { if (ie_tree) - { + { proto_tree_add_item(ie_tree, hf_ranap_rac, tvb, - 0, RAC_LENGTH, FALSE); + 0, RAC_LENGTH, FALSE); } return(0); } @@ -2228,42 +2228,42 @@ static int dissect_IE_LAI(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; - int iE_Extensions_present; + proto_tree *optionals_tree = NULL; + int iE_Extensions_present; gint offset = 0; gint bitoffset = 0; int ret; - + if (ie_tree) - { + { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "LAI Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* iE_Extensions_present present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* plmn_id */ allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_plmn_id, tvb, - offset, PLMN_ID_LENGTH, FALSE); + offset, PLMN_ID_LENGTH, FALSE); offset += PLMN_ID_LENGTH; - - /* lac */ + + /* lac */ proto_tree_add_item(ie_tree, hf_ranap_lac, tvb, offset, LAC_LENGTH, FALSE); offset += LAC_LENGTH; - + /* iE_Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "LAI")) != 0) - return (ret); - } + return (ret); + } } return(0); } @@ -2273,46 +2273,46 @@ static int dissect_IE_SAI(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; - int iE_Extensions_present; + proto_tree *optionals_tree = NULL; + int iE_Extensions_present; gint offset = 0; gint bitoffset = 0; - int ret; - + int ret; + if (ie_tree) { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "SAI Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* iE_Extensions_present present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - - /* plmn_id */ + proceed_nbits(&offset, &bitoffset, 1); + + /* plmn_id */ proto_tree_add_item(ie_tree, hf_ranap_plmn_id, tvb, - offset, PLMN_ID_LENGTH, FALSE); - offset += PLMN_ID_LENGTH; - - /* lac */ + offset, PLMN_ID_LENGTH, FALSE); + offset += PLMN_ID_LENGTH; + + /* lac */ proto_tree_add_item(ie_tree, hf_ranap_lac, tvb, offset, LAC_LENGTH, FALSE); - offset += LAC_LENGTH; - - /* sac */ + offset += LAC_LENGTH; + + /* sac */ proto_tree_add_item(ie_tree, hf_ranap_sac, tvb, offset, SAC_LENGTH, FALSE); - offset += SAC_LENGTH; - + offset += SAC_LENGTH; + /* iE_Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "LAI")) != 0) - return (ret); - } + return (ret); + } } return(0); } @@ -2322,8 +2322,8 @@ static int dissect_IE_NAS_PDU(tvbuff_t *tvb, proto_tree *ie_tree) { gint length; - gint length_size; - + gint length_size; + if (extract_length(tvb, 0, &length, &length_size) != 0) { if (ie_tree) @@ -2341,16 +2341,16 @@ dissect_IE_NAS_PDU(tvbuff_t *tvb, proto_tree *ie_tree) proto_tree_add_item(ie_tree, hf_ranap_nas_pdu_length, tvb, 0, length_size, FALSE); } - - /* call NAS dissector (not implemented yet) */ - /* ............. */ - - /* meanwhile display in hex */ + + /* call NAS dissector (not implemented yet) */ + /* ............. */ + + /* meanwhile display in hex */ if (ie_tree) { /* NAS - PDU */ proto_tree_add_item(ie_tree, hf_ranap_nas_pdu, tvb, - length_size, length, FALSE); + length_size, length, FALSE); } return(0); } @@ -2361,10 +2361,10 @@ dissect_IE_CN_DomainIndicator(tvbuff_t *tvb, proto_tree *ie_tree) { gint offset = 0; gint bitoffset = 0; - + if (ie_tree) { - proto_tree_add_uint_bits(ie_tree, hf_ranap_CN_DomainIndicator, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_CN_DomainIndicator, tvb, offset, bitoffset, 1, 0); } return(0); @@ -2375,11 +2375,11 @@ static int dissect_IE_IuSigConId(tvbuff_t *tvb, proto_tree *ie_tree) { if (ie_tree) - { - proto_tree_add_bitstring(ie_tree, hf_ranap_IuSigConId, tvb, 0, 0, 24); + { + proto_tree_add_bitstring(ie_tree, hf_ranap_IuSigConId, tvb, 0, 0, 24); } return(0); -} +} static int @@ -2388,24 +2388,24 @@ dissect_IE_SAPI(tvbuff_t *tvb, proto_tree *ie_tree) gint offset = 0; gint bitoffset = 0; int extension_present; - + if (ie_tree) - { + { /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); if (extension_present) { - /* extended enum */ + /* extended enum */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for IE_SAPI present, dissection not supported"); - return(-1); - } - + return(-1); + } + /* SAPI */ - proto_tree_add_uint_bits(ie_tree, hf_ranap_SAPI, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_SAPI, tvb, offset, bitoffset, 1, 0); } return(0); @@ -2417,9 +2417,9 @@ dissect_IE_TransportLayerAddress(tvbuff_t *tvb, proto_tree *ie_tree) { gint offset = 0; gint bitoffset = 0; - + if (ie_tree) - { + { return(dissect_TransportLayerAddress(tvb, ie_tree, &offset, &bitoffset)); } return(0); @@ -2431,9 +2431,9 @@ dissect_IE_IuTransportAssociation(tvbuff_t *tvb, proto_tree *ie_tree) { gint offset = 0; gint bitoffset = 0; - + if (ie_tree) - { + { return(dissect_iuTransportAssociation(tvb, ie_tree, &offset, &bitoffset)); } return(0); @@ -2445,9 +2445,9 @@ dissect_IE_Cause(tvbuff_t *tvb, proto_tree *ie_tree) { gint offset = 0; gint bitoffset = 0; - + if (ie_tree) - { + { return(dissect_cause(tvb, ie_tree, &offset, &bitoffset)); } return(0); @@ -2458,7 +2458,7 @@ static int dissect_IE_RAB_ReleasedItem_IuRelComp(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int extension_present; int dl_GTP_PDU_SequenceNumber_present; int ul_GTP_PDU_SequenceNumber_present; @@ -2466,78 +2466,78 @@ dissect_IE_RAB_ReleasedItem_IuRelComp(tvbuff_t *tvb, proto_tree *ie_tree) gint offset = 0; gint bitoffset = 0; int ret; - + if (ie_tree) - { + { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB_ReleasedItem_IuRelComp Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* dl_GTP_PDU_SequenceNumber present ? */ dl_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_GTP_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* ul_GTP_PDU_SequenceNumber present ? */ ul_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_GTP_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* iE_Extensions_present present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - - + proceed_nbits(&offset, &bitoffset, 1); + + /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); - + proceed_nbits(&offset, &bitoffset, 8); + /* dl-GTP-PDU-SequenceNumber */ if (dl_GTP_PDU_SequenceNumber_present) { allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_dl_GTP_PDU_SequenceNumber, tvb, offset, 2, FALSE); - offset += 2; - } + offset += 2; + } /* ul-GTP-PDU-SequenceNumber */ if (ul_GTP_PDU_SequenceNumber_present) { allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_ul_GTP_PDU_SequenceNumber, tvb, offset, 2, FALSE); - offset += 2; - } + offset += 2; + } /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "RAB_ReleasedItem_IuRelComp")) != 0) return (ret); - } - + } + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB_ReleasedItem_IuRelComp present, dissection not supported"); - return(-1); - } - } - return(0); + return(-1); + } + } + return(0); } @@ -2545,51 +2545,51 @@ static int dissect_IE_RAB_DataVolumeReportItem(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int extension_present; - int dl_UnsuccessfullyTransmittedDataVolume_present; + int dl_UnsuccessfullyTransmittedDataVolume_present; int iE_Extensions_present; gint offset = 0; gint bitoffset = 0; int ret; - + if (ie_tree) - { + { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB_DataVolumeReportItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* dl_UnsuccessfullyTransmittedDataVolume present ? */ dl_UnsuccessfullyTransmittedDataVolume_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_UnsuccessfullyTransmittedDataVolume_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_UnsuccessfullyTransmittedDataVolume_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* iE_Extensions_present present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); + proceed_nbits(&offset, &bitoffset, 8); /* dl_UnsuccessfullyTransmittedDataVolume */ if (dl_UnsuccessfullyTransmittedDataVolume_present) { - - if ((ret = dissect_dataVolumeList(tvb, ie_tree, &offset, &bitoffset, - "dl_UnsuccessfullyTransmittedDataVolume")) != 0) + + if ((ret = dissect_dataVolumeList(tvb, ie_tree, &offset, &bitoffset, + "dl_UnsuccessfullyTransmittedDataVolume")) != 0) return (ret); } @@ -2598,19 +2598,19 @@ dissect_IE_RAB_DataVolumeReportItem(tvbuff_t *tvb, proto_tree *ie_tree) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "IE_RAB_DataVolumeReportItem")) != 0) return (ret); - } - + } + /* protocol extended */ if (extension_present) { - /* extended enum */ + /* extended enum */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for IE_RAB_DataVolumeReportItem present, dissection not supported"); - return(-1); - } - } - return(0); + return(-1); + } + } + return(0); } @@ -2618,7 +2618,7 @@ static int dissect_IE_RAB_SetupOrModifyItemSecond(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int extension_present; int tmp_extension; int pDP_TypeInformation_present; @@ -2633,102 +2633,102 @@ dissect_IE_RAB_SetupOrModifyItemSecond(tvbuff_t *tvb, proto_tree *ie_tree) gint8 tmp_byte; gint i; int ret; - + if (ie_tree) - { + { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "SetupOrModifyItemSecond Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* pDP_TypeInformation present ? */ pDP_TypeInformation_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_pDP_TypeInformation_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_pDP_TypeInformation_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* dataVolumeReportingIndication present ? */ dataVolumeReportingIndication_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dataVolumeReportingIndication_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dataVolumeReportingIndication_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* dl_GTP_PDU_SequenceNumber present present ? */ dl_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_GTP_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - - + proceed_nbits(&offset, &bitoffset, 1); + + /* ul_GTP_PDU_SequenceNumber present ? */ ul_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_GTP_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* dl_N_PDU_SequenceNumber present ? */ dl_N_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_N_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_N_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* ul_N_PDU_SequenceNumber present ? */ ul_N_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_N_PDU_SequenceNumber_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_N_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* iE_Extensions present ? */ - iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* pDP-TypeInformation */ if (pDP_TypeInformation_present) { tmp_byte = extract_nbits(tvb, offset, bitoffset, 1) + 1; /* Sequence 1..2 */ - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); for (i=1; i<=tmp_byte; i++) { tmp_extension = extract_nbits(tvb, offset, bitoffset, 1); proceed_nbits(&offset, &bitoffset, 1); if (tmp_extension != 0) { - /* extended enum */ + /* extended enum */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for PDP-Type present, dissection not supported"); return(-1); - } - - proto_tree_add_uint_bits(ie_tree, hf_ranap_PDP_Type, tvb, + } + + proto_tree_add_uint_bits(ie_tree, hf_ranap_PDP_Type, tvb, offset, bitoffset, 3, 0); - proceed_nbits(&offset, &bitoffset, 3); + proceed_nbits(&offset, &bitoffset, 3); } - } + } /* dataVolumeReportingIndication */ if (dataVolumeReportingIndication_present) { - proto_tree_add_uint_bits(ie_tree, hf_ranap_dataVolumeReportingIndication, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_dataVolumeReportingIndication, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); } - + /* dl-GTP-PDU-SequenceNumber */ if (dl_GTP_PDU_SequenceNumber_present) { allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_dl_GTP_PDU_SequenceNumber, tvb, offset, 2, FALSE); - offset += 2; - } + offset += 2; + } /* ul-GTP-PDU-SequenceNumber */ if (ul_GTP_PDU_SequenceNumber_present) @@ -2736,7 +2736,7 @@ dissect_IE_RAB_SetupOrModifyItemSecond(tvbuff_t *tvb, proto_tree *ie_tree) allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_ul_GTP_PDU_SequenceNumber, tvb, offset, 2, FALSE); offset += 2; - } + } /* dl-N-PDU-SequenceNumber */ if (dl_N_PDU_SequenceNumber_present) @@ -2744,7 +2744,7 @@ dissect_IE_RAB_SetupOrModifyItemSecond(tvbuff_t *tvb, proto_tree *ie_tree) allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_dl_N_PDU_SequenceNumber, tvb, offset, 2, FALSE); offset += 2; - } + } /* ul-N-PDU-SequenceNumber */ if (ul_N_PDU_SequenceNumber_present) @@ -2752,34 +2752,34 @@ dissect_IE_RAB_SetupOrModifyItemSecond(tvbuff_t *tvb, proto_tree *ie_tree) allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_ul_N_PDU_SequenceNumber, tvb, offset, 2, FALSE); offset += 2; - } + } /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "SetupOrModifyItemSecond")) != 0) return (ret); - } - + } + /* protocol extended */ if (extension_present) { - /* extended enum */ + /* extended enum */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for SetupOrModifyItemSecond present, dissection not supported"); - return(-1); - } - } - return(0); + return(-1); + } + } + return(0); } -static int +static int dissect_IE_RAB_SetupOrModifiedItem (tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; + proto_tree *optionals_tree = NULL; int ret; int extension_present; int transportLayerAddress_present; @@ -2789,41 +2789,41 @@ dissect_IE_RAB_SetupOrModifiedItem (tvbuff_t *tvb, proto_tree *ie_tree) gint offset = 0; gint bitoffset = 0; - + if (ie_tree) { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB-SetupOrModifiedItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); - + /* transportLayerAddress present ? */ transportLayerAddress_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_transportLayerAddress_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_transportLayerAddress_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); /* iuTransportAssociation present ? */ iuTransportAssociation_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iuTransportAssociation_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iuTransportAssociation_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); /* dl_dataVolumes present ? */ dl_dataVolumes_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_dataVolumes_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_dataVolumes_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); @@ -2831,49 +2831,49 @@ dissect_IE_RAB_SetupOrModifiedItem (tvbuff_t *tvb, proto_tree *ie_tree) /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); - + proceed_nbits(&offset, &bitoffset, 8); + /* transportLayerAddress */ if (transportLayerAddress_present) { - if ((ret=dissect_TransportLayerAddress(tvb, ie_tree, &offset, &bitoffset)) != 0) + if ((ret=dissect_TransportLayerAddress(tvb, ie_tree, &offset, &bitoffset)) != 0) return (ret); } - + /* iuTransportAssociation */ if (iuTransportAssociation_present) - { - if ((ret=dissect_iuTransportAssociation(tvb, ie_tree, &offset, &bitoffset)) != 0) + { + if ((ret=dissect_iuTransportAssociation(tvb, ie_tree, &offset, &bitoffset)) != 0) return (ret); } - + /* dl-dataVolumes */ if (dl_dataVolumes_present) - { - if ((ret = dissect_dataVolumeList(tvb, ie_tree, &offset, &bitoffset, - "dl-dataVolumes")) != 0) + { + if ((ret = dissect_dataVolumeList(tvb, ie_tree, &offset, &bitoffset, + "dl-dataVolumes")) != 0) return (ret); - } - + } + /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "RAB_SetupOrModifiedItem")) != 0) - return (ret); + return (ret); } - + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB_SetupOrModifiedItem present, dissection not supported"); - return(-1); + return(-1); } } - - return (0); + + return (0); } @@ -2893,99 +2893,99 @@ dissect_IE_RAB_SetupOrModifyItemFirst (tvbuff_t *tvb, proto_tree *ie_tree) int iE_Extensions_present; int tmp_extension_present; int ret; - + if (ie_tree) - { + { offset = 0; bitoffset = 0; - + /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset,IE_PROTOCOL_EXTENSION_LENGTH, "RAB_SetupOrModifyItemFirst Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* nAS_SynchronisationIndicator present ? */ nAS_SynchronisationIndicator_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_nAS_SynchronisationIndicator_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* rAB_Parameters present ? */ rAB_Parameters_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_rAB_Parameters_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); - + /* userPlaneInformation present ? */ userPlaneInformation_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_userPlaneInformation_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); - + /* transportLayerInformation present ? */ transportLayerInformation_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_transportLayerInformation_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); - + /* service_Handover present ? */ service_Handover_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_service_Handover_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* add RAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); + proceed_nbits(&offset, &bitoffset, 8); /* nAS-SynchronisationIndicator */ if (nAS_SynchronisationIndicator_present) { proto_tree_add_uint_bits(ie_tree, hf_ranap_nAS_SynchronisationIndicator, tvb, offset, bitoffset, 4, 0); - proceed_nbits(&offset, &bitoffset, 4); - } - + proceed_nbits(&offset, &bitoffset, 4); + } + /* rAB-Parameters */ if (rAB_Parameters_present) - { - if ((ret=dissect_rAB_Parameters(tvb, ie_tree, &offset, &bitoffset)) != 0) + { + if ((ret=dissect_rAB_Parameters(tvb, ie_tree, &offset, &bitoffset)) != 0) return(ret); } - + /* userPlaneInformation */ if (userPlaneInformation_present) - { - if ((ret=dissect_userPlaneInformation(tvb, ie_tree, &offset, &bitoffset)) != 0) + { + if ((ret=dissect_userPlaneInformation(tvb, ie_tree, &offset, &bitoffset)) != 0) return(ret); } - /* transportLayerInformation */ + /* transportLayerInformation */ if (transportLayerInformation_present) - { - if ((ret=dissect_transportLayerInformation(tvb, ie_tree, &offset, &bitoffset)) != 0) + { + if ((ret=dissect_transportLayerInformation(tvb, ie_tree, &offset, &bitoffset)) != 0) return(ret); } /* service_Handover */ if (service_Handover_present) - { + { tmp_extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + if (tmp_extension_present) { /* extended enum */ @@ -2993,22 +2993,22 @@ dissect_IE_RAB_SetupOrModifyItemFirst (tvbuff_t *tvb, proto_tree *ie_tree) proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for service_Handover present, dissection not supported"); return(-1); - } - + } + proto_tree_add_uint_bits(ie_tree, hf_ranap_service_Handover, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - } + proceed_nbits(&offset, &bitoffset, 2); + } /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "SetupOrModifyItemFirst" )) != 0) - return(ret); + return(ret); } } - return(0); + return(0); } @@ -3018,7 +3018,7 @@ dissect_IE_RAB_ReleaseItem(tvbuff_t *tvb, proto_tree *ie_tree) proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; gint offset = 0; - gint bitoffset = 0; + gint bitoffset = 0; int extension_present; int iE_Extensions_present; int ret; @@ -3027,59 +3027,59 @@ dissect_IE_RAB_ReleaseItem(tvbuff_t *tvb, proto_tree *ie_tree) /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset,IE_PROTOCOL_EXTENSION_LENGTH, "RAB_ReleaseItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - - + proceed_nbits(&offset, &bitoffset, 1); + + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - - + proceed_nbits(&offset, &bitoffset, 1); + + /* add RAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); + proceed_nbits(&offset, &bitoffset, 8); /* add cause */ if ((ret=dissect_cause(tvb, ie_tree, &offset, &bitoffset)) != 0) - return (ret); - + return (ret); + /* iE Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "RAB_ReleasedItem")) != 0) return (ret); - } - + } + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB_ReleasedItem present, dissection not supported"); - return(-1); - } + return(-1); + } return(0); } -static int +static int dissect_IE_RAB_ReleasedItem (tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; - int ret; + int ret; int extension_present; int dl_dataVolumes_present; int dl_GTP_PDU_SequenceNumber_present; @@ -3093,17 +3093,17 @@ dissect_IE_RAB_ReleasedItem (tvbuff_t *tvb, proto_tree *ie_tree) /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB-ReleasedItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); - + /* dl_dataVolumes present ? */ dl_dataVolumes_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_dataVolumes_present, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_dataVolumes_present, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); @@ -3111,41 +3111,41 @@ dissect_IE_RAB_ReleasedItem (tvbuff_t *tvb, proto_tree *ie_tree) dl_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_dl_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* uL_GTP_PDU_SequenceNumber present ? */ ul_GTP_PDU_SequenceNumber_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_ul_GTP_PDU_SequenceNumber_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); + proceed_nbits(&offset, &bitoffset, 8); /* dl-dataVolumes */ if (dl_dataVolumes_present) - { + { if ((ret=dissect_dataVolumeList(tvb, ie_tree, &offset, &bitoffset, - "dl-dataVolumes")) != 0) + "dl-dataVolumes")) != 0) return (ret); - } - + } + /* dL-GTP-PDU-SequenceNumber */ if (dl_GTP_PDU_SequenceNumber_present) { allign(&offset, &bitoffset); proto_tree_add_item(ie_tree, hf_ranap_dl_GTP_PDU_SequenceNumber, tvb, offset, 2, FALSE); - offset += 2; - } - + offset += 2; + } + /* uL-GTP-PDU-SequenceNumber */ if (ul_GTP_PDU_SequenceNumber_present) { @@ -3157,20 +3157,20 @@ dissect_IE_RAB_ReleasedItem (tvbuff_t *tvb, proto_tree *ie_tree) /* iE-Extensions */ if (iE_Extensions_present) { - if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "UserPlaneInformation")) != 0) - return(ret); + if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "UserPlaneInformation")) != 0) + return(ret); } - + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB_ReleasedItem present, dissection not supported"); - return(-1); - } - } + return(-1); + } + } return(0); } @@ -3181,7 +3181,7 @@ dissect_IE_RAB_QueuedItem (tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; - int ret; + int ret; int extension_present; int iE_Extensions_present; gint offset = 0; @@ -3193,11 +3193,11 @@ dissect_IE_RAB_QueuedItem (tvbuff_t *tvb, proto_tree *ie_tree) /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB-QueuedItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); @@ -3205,33 +3205,33 @@ dissect_IE_RAB_QueuedItem (tvbuff_t *tvb, proto_tree *ie_tree) iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); - + proceed_nbits(&offset, &bitoffset, 8); + /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "RAB_QueuedItem" )) != 0 ) - return (ret); - } - + return (ret); + } + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB_QueuedItem present, dissection not supported"); - return(-1); - } - } + return(-1); + } + } return(0); -} +} static int @@ -3239,7 +3239,7 @@ dissect_IE_RAB_FailedItem(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; - int ret; + int ret; int extension_present; int iE_Extensions_present; gint offset = 0; @@ -3250,11 +3250,11 @@ dissect_IE_RAB_FailedItem(tvbuff_t *tvb, proto_tree *ie_tree) /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "RAB-FailedItem Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); @@ -3262,47 +3262,47 @@ dissect_IE_RAB_FailedItem(tvbuff_t *tvb, proto_tree *ie_tree) iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* rAB-ID */ proto_tree_add_uint_bits(ie_tree, hf_ranap_rab_id, tvb, offset, bitoffset, 8, 0); - proceed_nbits(&offset, &bitoffset, 8); - + proceed_nbits(&offset, &bitoffset, 8); + /* cause */ if ((ret=dissect_cause(tvb, ie_tree, &offset, &bitoffset)) != 0) - return (ret); + return (ret); /* iE-Extensions */ if (iE_Extensions_present) { if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "RAB-FailedItem")) != 0) - return (ret); + return (ret); } - - + + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for RAB-FailedItem present, dissection not supported"); - return(-1); - } - } + return(-1); + } + } return(0); -} +} -static int +static int dissect_IE_CriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree) { proto_item *optionals_item = NULL; proto_tree *optionals_tree = NULL; - int ret; - int extension_present; + int ret; + int extension_present; int procedureCode_present; int triggeringMessage_present; int procedureCriticality_present; @@ -3310,18 +3310,18 @@ dissect_IE_CriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree) int iE_Extensions_present; gint offset = 0; gint bitoffset = 0; - + if (ie_tree) { /* create subtree for extension/optional/default bitmap */ optionals_item = proto_tree_add_text(ie_tree, tvb, offset, 1, "IE-CriticalityDiagnostics Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); - + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, offset, bitoffset, 1); - proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, + proto_tree_add_uint_bits(optionals_tree, hf_ranap_ie_protocol_extension, tvb, offset, bitoffset, 1, 0); proceed_nbits(&offset, &bitoffset, 1); @@ -3329,41 +3329,41 @@ dissect_IE_CriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree) procedureCode_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_procedureCode_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* triggeringMessage present ? */ triggeringMessage_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_triggeringMessage_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* procedureCriticality present ? */ procedureCriticality_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_procedureCriticality_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* iEsCriticalityDiagnostics present ? */ iEsCriticalityDiagnostics_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iEsCriticalityDiagnostics_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); - + proceed_nbits(&offset, &bitoffset, 1); + /* iE_Extensions present ? */ iE_Extensions_present = extract_nbits(tvb, offset, bitoffset, 1); proto_tree_add_uint_bits(optionals_tree, hf_ranap_iE_Extensions_present, tvb, offset, bitoffset, 1, 0); - proceed_nbits(&offset, &bitoffset, 1); + proceed_nbits(&offset, &bitoffset, 1); /* procedureCode */ if (procedureCode_present) { allign (&offset, &bitoffset); - proto_tree_add_item(ie_tree, hf_ranap_procedure_code, tvb, offset, 1, FALSE); + proto_tree_add_item(ie_tree, hf_ranap_procedure_code, tvb, offset, 1, FALSE); offset += 1; - } - + } + /* triggeringMessage */ if (triggeringMessage_present) { @@ -3371,7 +3371,7 @@ dissect_IE_CriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree) tvb, offset, bitoffset, 2, 0); proceed_nbits(&offset, &bitoffset, 2); } - + /* procedureCriticality */ if (procedureCriticality_present) { @@ -3379,46 +3379,46 @@ dissect_IE_CriticalityDiagnostics(tvbuff_t *tvb, proto_tree *ie_tree) tvb, offset, bitoffset, 2, 0); proceed_nbits(&offset, &bitoffset, 2); } - + /* iEsCriticalityDiagnostics */ if (iEsCriticalityDiagnostics_present) { - if ((ret=dissect_iEsCriticalityDiagnostics(tvb, ie_tree, &offset, &bitoffset)) != 0) - return(ret); + if ((ret=dissect_iEsCriticalityDiagnostics(tvb, ie_tree, &offset, &bitoffset)) != 0) + return(ret); } - + /* iE-Extensions */ if (iE_Extensions_present) { - if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "IE_CriticalityDiagnostics")) != 0) - return(ret); + if ((ret=dissect_iE_Extension(tvb, ie_tree, &offset, &bitoffset, "IE_CriticalityDiagnostics")) != 0) + return(ret); } - - + + /* protocol extended */ if (extension_present) { - /* extended sequence */ + /* extended sequence */ /* decoding is not supported */ proto_tree_add_text(ie_tree, tvb, offset, IE_PROTOCOL_EXTENSION_LENGTH, "Protocol extension for IE CriticalityDiagnostics present, dissection not supported"); - return(-1); - } - } + return(-1); + } + } return(0); -} +} + - static int dissect_unknown_IE(tvbuff_t *tvb, proto_tree *ie_tree) { if (ie_tree) - { + { proto_tree_add_text(ie_tree, tvb, 0, -1, - "IE Contents (dissection not implemented)"); + "IE Contents (dissection not implemented)"); } - return(0); -} + return(0); +} @@ -3436,9 +3436,9 @@ dissect_RAB_IE_ContainerPairList(tvbuff_t *tvb, proto_tree *ie_tree) proto_item *ie_pair_item = NULL; proto_tree *ie_pair_tree = NULL; proto_item *first_value_item = NULL; - proto_tree *first_value_tree = NULL; + proto_tree *first_value_tree = NULL; proto_item *second_value_item = NULL; - proto_tree *second_value_tree = NULL; + proto_tree *second_value_tree = NULL; guint number_of_RABs, currentRAB; guint number_of_IEs, currentIE; gint number_of_octets_first, number_of_octets_second; @@ -3449,50 +3449,50 @@ dissect_RAB_IE_ContainerPairList(tvbuff_t *tvb, proto_tree *ie_tree) guint16 ie_id; tvbuff_t *first_value_tvb; tvbuff_t *second_value_tvb; - + if (ie_tree) - { + { /* number of RABs in the list */ number_of_RABs = 1 + tvb_get_guint8(tvb, offset); - proto_tree_add_uint(ie_tree, hf_ranap_num_rabs, - tvb, offset, + proto_tree_add_uint(ie_tree, hf_ranap_num_rabs, + tvb, offset, NUM_RABS_LENGTH, number_of_RABs); offset += NUM_RABS_LENGTH; - + /* do for each RAB */ - for (currentRAB=1; currentRAB<=number_of_RABs; currentRAB++) + for (currentRAB=1; currentRAB<=number_of_RABs; currentRAB++) { /* create subtree for RAB */ rab_item = proto_tree_add_text(ie_tree, tvb, offset, 0, "%d. RAB", currentRAB); rab_tree = proto_item_add_subtree(rab_item, ett_ranap_rab); - + /* number of IE pairs for this RAB */ number_of_IEs = tvb_get_ntohs(tvb, offset); - proto_tree_add_uint(rab_tree, hf_ranap_number_of_ies_in_list, + proto_tree_add_uint(rab_tree, hf_ranap_number_of_ies_in_list, tvb, offset, 2, number_of_IEs); offset += 2; /*points now to beginning of first IE pair */ - + /* do for each IE pair */ for (currentIE=1; currentIE<=number_of_IEs; currentIE++) { - /* use tmp_offset to point to current field */ + /* use tmp_offset to point to current field */ tmp_offset = offset; /* IE pair ID */ ie_id = tvb_get_ntohs(tvb, tmp_offset); tmp_offset += IE_ID_LENGTH; - + tmp_offset += 1; /* skip first criticality byte */ /* number of octets in first value */ - extract_length(tvb, tmp_offset, &number_of_octets_first, &number_of_octets_first_size); - tmp_offset += number_of_octets_first_size + number_of_octets_first; + extract_length(tvb, tmp_offset, &number_of_octets_first, &number_of_octets_first_size); + tmp_offset += number_of_octets_first_size + number_of_octets_first; tmp_offset += 1; /* skip second criticality byte */ /* number of octets in second value */ extract_length(tvb, tmp_offset, &number_of_octets_second, &number_of_octets_second_size); - tmp_offset += number_of_octets_second_size + number_of_octets_second; - + tmp_offset += number_of_octets_second_size + number_of_octets_second; + /* create subtree for ie_pair */ ie_pair_item = proto_tree_add_text(rab_tree, tvb, offset, tmp_offset - offset, @@ -3500,25 +3500,25 @@ dissect_RAB_IE_ContainerPairList(tvbuff_t *tvb, proto_tree *ie_tree) val_to_str(ie_id, ranap_ie_id_values, "Unknown"), ie_id); ie_pair_tree = proto_item_add_subtree(ie_pair_item, ett_ranap_ie_pair); - + /* add fields to ie pair subtee */ /* use offset to point to current field */ /* IE ID */ - proto_tree_add_item(ie_pair_tree, hf_ranap_ie_ie_id, tvb, offset, IE_ID_LENGTH, FALSE); + proto_tree_add_item(ie_pair_tree, hf_ranap_ie_ie_id, tvb, offset, IE_ID_LENGTH, FALSE); offset += IE_ID_LENGTH; - + /* first criticality */ - proto_tree_add_uint_bits(ie_pair_tree, hf_ranap_ie_pair_first_criticality, tvb, + proto_tree_add_uint_bits(ie_pair_tree, hf_ranap_ie_pair_first_criticality, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - + proceed_nbits(&offset, &bitoffset, 2); + /* number of octets in first value */ allign(&offset, &bitoffset); if (number_of_octets_first != 0) { - proto_tree_add_uint(ie_pair_tree, hf_ranap_first_value_number_of_octets, - tvb, offset, - number_of_octets_first_size, + proto_tree_add_uint(ie_pair_tree, hf_ranap_first_value_number_of_octets, + tvb, offset, + number_of_octets_first_size, number_of_octets_first); } else @@ -3535,38 +3535,38 @@ dissect_RAB_IE_ContainerPairList(tvbuff_t *tvb, proto_tree *ie_tree) number_of_octets_first, "%sFirst", val_to_str(ie_id, ranap_ie_id_values, "Unknown")); - first_value_tree = proto_item_add_subtree(first_value_item, ett_ranap_ie_pair_first_value); - + first_value_tree = proto_item_add_subtree(first_value_item, ett_ranap_ie_pair_first_value); + /* create tvb containing first value */ first_value_tvb = tvb_new_subset(tvb, offset, number_of_octets_first, number_of_octets_first); - + /* add fields of first value */ switch (ie_id) { case IE_RAB_SetupOrModifyItem: dissect_IE_RAB_SetupOrModifyItemFirst (first_value_tvb, first_value_tree); break; - + default: dissect_unknown_IE(first_value_tvb, first_value_tree); break; } - + offset += number_of_octets_first; - - + + /* second criticality */ - proto_tree_add_uint_bits(ie_pair_tree, hf_ranap_ie_pair_second_criticality, tvb, + proto_tree_add_uint_bits(ie_pair_tree, hf_ranap_ie_pair_second_criticality, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - + proceed_nbits(&offset, &bitoffset, 2); + /* number of octets of second value */ allign(&offset, &bitoffset); if (number_of_octets_second != 0) { - proto_tree_add_uint(ie_pair_tree, hf_ranap_second_value_number_of_octets, - tvb, offset, - number_of_octets_second_size, + proto_tree_add_uint(ie_pair_tree, hf_ranap_second_value_number_of_octets, + tvb, offset, + number_of_octets_second_size, number_of_octets_second); } else @@ -3576,35 +3576,35 @@ dissect_RAB_IE_ContainerPairList(tvbuff_t *tvb, proto_tree *ie_tree) 2, "Number of Octets greater than 0x3FFF, dissection not supported"); return(-1); } - offset += number_of_octets_second_size; - + offset += number_of_octets_second_size; + /* add subtree for second value */ second_value_item = proto_tree_add_text(ie_pair_tree, tvb, offset, number_of_octets_second, "%sSecond", val_to_str(ie_id, ranap_ie_id_values, "Unknown")); - second_value_tree = proto_item_add_subtree(second_value_item, ett_ranap_ie_pair_second_value); - + second_value_tree = proto_item_add_subtree(second_value_item, ett_ranap_ie_pair_second_value); + /* create tvb containing first value */ - second_value_tvb = tvb_new_subset(tvb, offset, number_of_octets_second, number_of_octets_second); - + second_value_tvb = tvb_new_subset(tvb, offset, number_of_octets_second, number_of_octets_second); + /* add fields of second value */ switch (ie_id) { case IE_RAB_SetupOrModifyItem: dissect_IE_RAB_SetupOrModifyItemSecond (second_value_tvb, second_value_tree); break; - + default: dissect_unknown_IE(second_value_tvb, second_value_tree); break; } - - offset += number_of_octets_second; - + + offset += number_of_octets_second; + }/* for each IE ... */ - }/* for each RAB ... */ - } + }/* for each RAB ... */ + } return(0); } @@ -3616,31 +3616,31 @@ dissect_RAB_IE_ContainerList(tvbuff_t *tvb, proto_tree *list_tree) proto_tree *rab_tree = NULL; proto_item *ie_item = NULL; proto_tree *ie_tree = NULL; - + guint number_of_RABs, currentRAB; guint number_of_IEs, currentIE; gint ie_number_of_octets = 0; - gint ie_number_of_octets_size = 0; + gint ie_number_of_octets_size = 0; gint offset = 0; gint bitoffset = 0; gint ie_offset = 0; gint ie_header_length; guint16 ie_id; tvbuff_t *ie_tvb; - + if (list_tree) - { + { /* number of RABs in the list */ number_of_RABs = 1 + tvb_get_guint8(tvb, offset); - proto_tree_add_uint(list_tree, hf_ranap_num_rabs, - tvb, offset, + proto_tree_add_uint(list_tree, hf_ranap_num_rabs, + tvb, offset, NUM_RABS_LENGTH, number_of_RABs); offset += NUM_RABS_LENGTH; - + /* do for each RAB */ - for (currentRAB=1; currentRAB<=number_of_RABs; currentRAB++) + for (currentRAB=1; currentRAB<=number_of_RABs; currentRAB++) { /* create subtree for RAB */ rab_item = proto_tree_add_text(list_tree, tvb, offset, 0, "%d. RAB", currentRAB); @@ -3648,7 +3648,7 @@ dissect_RAB_IE_ContainerList(tvbuff_t *tvb, proto_tree *list_tree) /* number of IEs for this RAB */ number_of_IEs = tvb_get_ntohs(tvb, offset); - proto_tree_add_uint(rab_tree, hf_ranap_number_of_ies_in_list, + proto_tree_add_uint(rab_tree, hf_ranap_number_of_ies_in_list, tvb, offset, 2, number_of_IEs); offset += 2; /*points now to beginning of first IE in list */ @@ -3658,18 +3658,18 @@ dissect_RAB_IE_ContainerList(tvbuff_t *tvb, proto_tree *list_tree) for (currentIE=1; currentIE<=number_of_IEs; currentIE++) { /* extract IE ID */ - ie_id = tvb_get_ntohs(tvb, offset); + ie_id = tvb_get_ntohs(tvb, offset); offset += IE_ID_LENGTH; - - offset += IE_CRITICALITY_LENGTH; /* skip criticality byte */ + + offset += IE_CRITICALITY_LENGTH; /* skip criticality byte */ /* number of octets */ extract_length(tvb, offset, &ie_number_of_octets, &ie_number_of_octets_size); - ie_header_length = IE_ID_LENGTH + IE_CRITICALITY_LENGTH + ie_number_of_octets_size; - + ie_header_length = IE_ID_LENGTH + IE_CRITICALITY_LENGTH + ie_number_of_octets_size; + /* reset offset to beginning of ie */ offset = ie_offset; - + /* create subtree for ie */ ie_item = proto_tree_add_text(rab_tree, tvb, offset, ie_header_length + ie_number_of_octets, @@ -3677,21 +3677,21 @@ dissect_RAB_IE_ContainerList(tvbuff_t *tvb, proto_tree *list_tree) val_to_str(ie_id, ranap_ie_id_values, "Unknown"), ie_id); ie_tree = proto_item_add_subtree(ie_item, ett_ranap_ie); - + /* IE ID */ proto_tree_add_item(ie_tree, hf_ranap_ie_ie_id, tvb, - offset, IE_ID_LENGTH, FALSE); + offset, IE_ID_LENGTH, FALSE); offset += IE_ID_LENGTH; - + /* criticality */ - proto_tree_add_uint_bits(ie_tree, hf_ranap_ie_criticality, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_ie_criticality, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - - allign(&offset, &bitoffset); + proceed_nbits(&offset, &bitoffset, 2); + + allign(&offset, &bitoffset); if (ie_number_of_octets != 0) { - proto_tree_add_uint(ie_tree, hf_ranap_ie_number_of_octets, tvb, + proto_tree_add_uint(ie_tree, hf_ranap_ie_number_of_octets, tvb, offset, ie_number_of_octets_size, ie_number_of_octets); } else @@ -3700,93 +3700,93 @@ dissect_RAB_IE_ContainerList(tvbuff_t *tvb, proto_tree *list_tree) proto_tree_add_text(ie_tree, tvb, offset, 0, "Number of Octets greater than 0x3FFF, dissection not supported"); return(-1); - } - offset += ie_number_of_octets_size; - - + } + offset += ie_number_of_octets_size; + + /* create tvb containing ie */ ie_tvb = tvb_new_subset(tvb, offset, ie_number_of_octets, ie_number_of_octets); - + /* add fields of ie */ switch (ie_id) { case IE_RAB_SetupOrModifiedItem: dissect_IE_RAB_SetupOrModifiedItem(ie_tvb, ie_tree); - break; + break; case IE_RAB_ReleaseItem: dissect_IE_RAB_ReleaseItem(ie_tvb, ie_tree); - break; + break; case IE_RAB_ReleasedItem: dissect_IE_RAB_ReleasedItem(ie_tvb, ie_tree); break; case IE_RAB_ReleasedItem_IuRelComp: dissect_IE_RAB_ReleasedItem_IuRelComp(ie_tvb, ie_tree); - break; + break; case IE_RAB_QueuedItem: dissect_IE_RAB_QueuedItem(ie_tvb, ie_tree); - break; + break; case IE_RAB_FailedItem: dissect_IE_RAB_FailedItem(ie_tvb, ie_tree); - break; + break; case IE_RAB_DataVolumeReportItem: dissect_IE_RAB_DataVolumeReportItem(ie_tvb, ie_tree); - break; + break; default: dissect_unknown_IE(ie_tvb, ie_tree); break; } - + ie_offset += (ie_header_length + ie_number_of_octets); offset = ie_offset; } /* for each IE */ } /* for each RAB */ } return (0); -} +} static int dissect_ranap_ie(guint16 ie_id, tvbuff_t *ie_contents_tvb, proto_tree *ie_tree) { /* call specific dissection function for ie contents */ - switch(ie_id) + switch(ie_id) { case IE_RAB_ID: return(dissect_IE_RAB_ID(ie_contents_tvb, ie_tree)); break; - case IE_NAS_PDU: + case IE_NAS_PDU: return(dissect_IE_NAS_PDU(ie_contents_tvb, ie_tree)); break; - case IE_LAI: + case IE_LAI: return(dissect_IE_LAI(ie_contents_tvb, ie_tree)); break; - case IE_RAC: + case IE_RAC: return(dissect_IE_RAC(ie_contents_tvb, ie_tree)); break; - case IE_SAI: + case IE_SAI: return(dissect_IE_SAI(ie_contents_tvb, ie_tree)); break; - case IE_CN_DomainIndicator: + case IE_CN_DomainIndicator: return(dissect_IE_CN_DomainIndicator(ie_contents_tvb, ie_tree)); break; - case IE_IuSigConId: + case IE_IuSigConId: return(dissect_IE_IuSigConId(ie_contents_tvb, ie_tree)); break; - case IE_SAPI: + case IE_SAPI: return(dissect_IE_SAPI(ie_contents_tvb, ie_tree)); break; - case IE_TransportLayerAddress: + case IE_TransportLayerAddress: return(dissect_IE_TransportLayerAddress(ie_contents_tvb, ie_tree)); break; - case IE_IuTransportAssociation: + case IE_IuTransportAssociation: return(dissect_IE_IuTransportAssociation(ie_contents_tvb, ie_tree)); - break; - case IE_RAB_SetupOrModifyList: + break; + case IE_RAB_SetupOrModifyList: return(dissect_RAB_IE_ContainerPairList(ie_contents_tvb, ie_tree)); break; - case IE_RAB_SetupOrModifiedList: - case IE_RAB_ReleaseList: - case IE_RAB_ReleasedList: + case IE_RAB_SetupOrModifiedList: + case IE_RAB_ReleaseList: + case IE_RAB_ReleasedList: case IE_RAB_QueuedList: case IE_RAB_FailedList: case IE_RAB_ReleaseFailedList: @@ -3803,13 +3803,13 @@ dissect_ranap_ie(guint16 ie_id, tvbuff_t *ie_contents_tvb, proto_tree *ie_tree) case IE_RAB_FailedtoReportList: case IE_RAB_ContextList_RANAP_RelocInf: return(dissect_RAB_IE_ContainerList(ie_contents_tvb, ie_tree)); - break; + break; case IE_CriticalityDiagnostics: return(dissect_IE_CriticalityDiagnostics(ie_contents_tvb, ie_tree)); - break; + break; case IE_Cause: return(dissect_IE_Cause(ie_contents_tvb, ie_tree)); - break; + break; default: return(dissect_unknown_IE(ie_contents_tvb, ie_tree)); break; @@ -3821,64 +3821,64 @@ static int dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree) { proto_item *ie_item = NULL; - proto_tree *ie_tree = NULL; + proto_tree *ie_tree = NULL; proto_item *optionals_item = NULL; - proto_tree *optionals_tree = NULL; - + proto_tree *optionals_tree = NULL; + int msg_extension_present; int ProtocolExtensionContainer_present; - - guint16 number_of_ies; + + guint16 number_of_ies; guint16 ie_id; gint ie_number_of_octets = 0; gint ie_number_of_octets_size = 0; guint16 ie_header_length; gint offset = 0; - gint bitoffset = 0; + gint bitoffset = 0; gint i, ie_offset; tvbuff_t *ie_contents_tvb; - + if (ranap_tree) - { + { /* create subtree for extension/optional bitmap of message */ optionals_item = proto_tree_add_text(ranap_tree, tvb, offset, 1, - "Message Extension/Optional/Default bitmap"); - optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); + "Message Extension/Optional/Default bitmap"); + optionals_tree = proto_item_add_subtree(optionals_item, ett_ranap_optionals); } - + /* msg_extension present ? */ msg_extension_present = extract_nbits(tvb, offset, bitoffset, 1); - + if (ranap_tree) - { - proto_tree_add_uint_bits(optionals_tree, hf_ranap_msg_extension_present, tvb, + { + proto_tree_add_uint_bits(optionals_tree, hf_ranap_msg_extension_present, tvb, offset, bitoffset, 1, 0); - } + } proceed_nbits(&offset, &bitoffset, 1); - + /* ProtocolExtensionContainer present ? */ ProtocolExtensionContainer_present = extract_nbits(tvb, offset, bitoffset, 1); if (ranap_tree) - { + { proto_tree_add_uint_bits(optionals_tree, hf_ranap_ProtocolExtensionContainer_present, tvb, offset, bitoffset, 1, 0); } - proceed_nbits(&offset, &bitoffset, 1); - - - /* extract ie container data */ + proceed_nbits(&offset, &bitoffset, 1); + + + /* extract ie container data */ /* number of ies */ allign(&offset, &bitoffset); number_of_ies = tvb_get_ntohs(tvb, offset); if (ranap_tree) - { - proto_tree_add_uint(ranap_tree, hf_ranap_number_of_ies, - tvb, offset, 2, number_of_ies); + { + proto_tree_add_uint(ranap_tree, hf_ranap_number_of_ies, + tvb, offset, 2, number_of_ies); } offset += 2; - + ie_offset = offset; /* ie_offset marks beginning of IE-Header */ - + /* do the following for each IE in the PDU */ for (i=1; i <= number_of_ies; i++) { @@ -3886,13 +3886,13 @@ dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree) /* IE-ID */ ie_id = tvb_get_ntohs(tvb, offset); offset += IE_ID_LENGTH; - + /* number of octets in the IE */ offset += IE_CRITICALITY_LENGTH; /* skip criticality byte */ ie_number_of_octets = 0; extract_length(tvb, offset, &ie_number_of_octets, &ie_number_of_octets_size); - ie_header_length = IE_ID_LENGTH + IE_CRITICALITY_LENGTH + ie_number_of_octets_size; - + ie_header_length = IE_ID_LENGTH + IE_CRITICALITY_LENGTH + ie_number_of_octets_size; + if (ranap_tree) { offset = ie_offset; /* start from beginning of IE */ @@ -3903,23 +3903,23 @@ dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree) val_to_str(ie_id, ranap_ie_id_values, "Unknown"), ie_id); ie_tree = proto_item_add_subtree(ie_item, ett_ranap_ie); - + /* add fields to ie subtee */ /* IE ID */ proto_tree_add_item(ie_tree, hf_ranap_ie_ie_id, tvb, - offset, IE_ID_LENGTH, FALSE); - offset += IE_ID_LENGTH; - + offset, IE_ID_LENGTH, FALSE); + offset += IE_ID_LENGTH; + /* criticality */ - proto_tree_add_uint_bits(ie_tree, hf_ranap_ie_criticality, tvb, + proto_tree_add_uint_bits(ie_tree, hf_ranap_ie_criticality, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - + proceed_nbits(&offset, &bitoffset, 2); + /* number of octets */ allign(&offset, &bitoffset); if (ie_number_of_octets != 0) { - proto_tree_add_uint(ie_tree, hf_ranap_ie_number_of_octets, tvb, + proto_tree_add_uint(ie_tree, hf_ranap_ie_number_of_octets, tvb, offset, ie_number_of_octets_size, ie_number_of_octets); offset += ie_number_of_octets_size; } @@ -3939,23 +3939,23 @@ dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree) /* create tvb containing the ie contents */ ie_contents_tvb = tvb_new_subset(tvb, ie_offset + ie_header_length, ie_number_of_octets, ie_number_of_octets); - + /* call specific dissection function for ie contents */ dissect_ranap_ie(ie_id, ie_contents_tvb, ie_tree); - + /* set ie_offset to beginning of next ie */ ie_offset += (ie_header_length + ie_number_of_octets); offset = ie_offset; } - + /* protocol Extensions */ if (ProtocolExtensionContainer_present) - { - return(dissect_iE_Extension(tvb, ranap_tree, &offset, &bitoffset, "PDU")); + { + return(dissect_iE_Extension(tvb, ranap_tree, &offset, &bitoffset, "PDU")); } - + return(0); - + } @@ -3964,8 +3964,8 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ranap_item = NULL; proto_tree *ranap_tree = NULL; - - guint procedure_code; + + guint procedure_code; guint pdu_index; gint number_of_octets = 0; gint number_of_octets_size = 0; @@ -3973,87 +3973,87 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint tmp_offset = 0; gint bitoffset = 0; gint tmp_bitoffset = 0; - guint extension_present; - + guint extension_present; + tvbuff_t *ie_tvb; - + /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); + /* extract header fields which are needed even if no tree exists */ - + /* protocol_extension present ? */ extension_present = extract_nbits(tvb, tmp_offset, tmp_bitoffset, 1); proceed_nbits(&tmp_offset, &tmp_bitoffset, 1); if (extension_present) { - /* extended choice */ + /* extended choice */ /* decoding is not supported */ col_append_str(pinfo->cinfo, COL_INFO, "RANAP-PDU Protocol extension present, dissection not supported"); - return; - } - + return; + } + /* pdu_index choice 0..3 */ pdu_index = extract_nbits(tvb, tmp_offset, tmp_bitoffset, 2); proceed_nbits(&tmp_offset, &tmp_bitoffset, 2); - + /* procedure code */ - allign(&tmp_offset, &tmp_bitoffset); + allign(&tmp_offset, &tmp_bitoffset); procedure_code = tvb_get_guint8(tvb, tmp_offset); tmp_offset += 1; - - /* add Procedure Code to Info Column */ - if (check_col(pinfo->cinfo, COL_INFO)) + + /* add Procedure Code to Info Column */ + if (check_col(pinfo->cinfo, COL_INFO)) { if (procedure_code <= PC_max) { - col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(pdu_index, ranap_message_names[procedure_code], + col_append_str(pinfo->cinfo, COL_INFO, + val_to_str(pdu_index, ranap_message_names[procedure_code], "unknown message")); col_append_str(pinfo->cinfo, COL_INFO, " "); } } - + /* extract number of octets */ tmp_offset += 1; /* leave out criticality byte */ extract_length(tvb, tmp_offset, &number_of_octets, &number_of_octets_size); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ - if (tree) + if (tree) { /* create the ranap protocol tree */ ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE); ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap); - + /* Add fields to ranap protocol tree */ /* PDU Index */ - proceed_nbits(&offset, &bitoffset, 1); /* leave out extension bit, checked above */ - proto_tree_add_uint_bits(ranap_tree, hf_ranap_pdu_index, tvb, + proceed_nbits(&offset, &bitoffset, 1); /* leave out extension bit, checked above */ + proto_tree_add_uint_bits(ranap_tree, hf_ranap_pdu_index, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); + proceed_nbits(&offset, &bitoffset, 2); + - /* Procedure Code */ - allign(&offset, &bitoffset); + allign(&offset, &bitoffset); proto_tree_add_item(ranap_tree, hf_ranap_procedure_code, tvb, offset, 1, FALSE); offset += 1; - + /* PDU Criticality */ - proto_tree_add_uint_bits(ranap_tree, hf_ranap_pdu_criticality, tvb, + proto_tree_add_uint_bits(ranap_tree, hf_ranap_pdu_criticality, tvb, offset, bitoffset, 2, 0); - proceed_nbits(&offset, &bitoffset, 2); - + proceed_nbits(&offset, &bitoffset, 2); + /* number of octets */ allign(&offset, &bitoffset); if (number_of_octets != 0) { - proto_tree_add_uint(ranap_tree, hf_ranap_pdu_number_of_octets, - tvb, offset, + proto_tree_add_uint(ranap_tree, hf_ranap_pdu_number_of_octets, + tvb, offset, number_of_octets_size, number_of_octets); - offset += number_of_octets_size; + offset += number_of_octets_size; } else { @@ -4063,16 +4063,16 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } } - + /* set offset to the beginning of ProtocolIE-Container */ /* in case we skipped "if(tree){...}" above */ offset = PDU_NUMBER_OF_OCTETS_OFFSET + number_of_octets_size; - + /* create a tvb containing the remainder of the PDU */ ie_tvb = tvb_new_subset(tvb, offset, -1, -1); - + /* dissect the ies */ - dissect_ranap_ie_container(ie_tvb, ranap_tree); + dissect_ranap_ie_container(ie_tvb, ranap_tree); } @@ -4085,675 +4085,675 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_ranap(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_ranap_pdu_index, - { "RANAP-PDU Index", - "ranap.ranap_pdu_index", + { "RANAP-PDU Index", + "ranap.ranap_pdu_index", FT_UINT8, BASE_HEX, VALS(&ranap_pdu_index_values), 0x0, "", HFILL } }, { &hf_ranap_procedure_code, - { "Procedure Code", + { "Procedure Code", "ranap.procedure_code", - FT_UINT8, BASE_DEC, VALS(&ranap_procedure_code_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_procedure_code_values), 0x0, "", HFILL } }, { &hf_ranap_pdu_criticality, - { "Criticality of PDU", + { "Criticality of PDU", "ranap.pdu.criticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } }, { &hf_ranap_pdu_number_of_octets, { "Number of Octets in PDU", "ranap.pdu.num_of_octets", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_ie_protocol_extension, { "Protocol Extension", "ranap.ie.protocol_extension_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_number_of_ies, { "Number of IEs in PDU", "ranap.pdu.number_of_ies", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_number_of_ProtocolExtensionFields, { "Number of Protocol Extension Fields", "ranap.ie.number_of_ProtocolExtensionFields", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_number_of_ies_in_list, { "Number of IEs in list", "ranap.number_of_ies", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_ie_ie_id, - { "IE-ID", + { "IE-ID", "ranap.ie.ie_id", - FT_UINT16, BASE_DEC, VALS(&ranap_ie_id_values), 0x0, + FT_UINT16, BASE_DEC, VALS(&ranap_ie_id_values), 0x0, "", HFILL } }, { &hf_ranap_ext_field_id, - { "ProtocolExtensionField ID", + { "ProtocolExtensionField ID", "ranap.ie.ProtocolExtensionFields.Id", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_ie_criticality, - { "Criticality of IE", - "ranap.ie.criticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "Criticality of IE", + "ranap.ie.criticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } }, { &hf_ranap_ext_field_criticality, - { "Criticality of ProtocolExtensionField", - "ranap.ie.ProtocolExtensionFields.criticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "Criticality of ProtocolExtensionField", + "ranap.ie.ProtocolExtensionFields.criticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_ie_pair_first_criticality, - { "First Criticality", - "ranap.ie_pair.first_criticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "First Criticality", + "ranap.ie_pair.first_criticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } }, { &hf_ranap_ie_pair_second_criticality, - { "Second Criticality", - "ranap.ie_pair.second_criticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "Second Criticality", + "ranap.ie_pair.second_criticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_ie_number_of_octets, - { "Number of Octets in IE", + { "Number of Octets in IE", "ranap.ie.number_of_octets", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_first_value_number_of_octets, - { "Number of Octets in first value", + { "Number of Octets in first value", "ranap.ie_pair.first_value.number_of_octets", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_second_value_number_of_octets, - { "Number of Octets in second value", + { "Number of Octets in second value", "ranap.ie_pair.second_value.number_of_octets", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_rab_id, - { "RAB-ID", + { "RAB-ID", "ranap.RAB_ID", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_ranap_nas_pdu, - { "NAS-PDU", + { "NAS-PDU", "ranap.NAS_PDU", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_extension_field, - { "Extension Field Value", + { "Extension Field Value", "ranap.Extension_Field_Value", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_plmn_id, - { "PLMN-ID", + { "PLMN-ID", "ranap.PLMN_ID", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_lac, - { "LAC", + { "LAC", "ranap.PLMN_ID", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_plmn_id, - { "PLMN-ID", + { "PLMN-ID", "ranap.PLMN_ID", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_lac, - { "LAC", + { "LAC", "ranap.PLMN_ID", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_sac, - { "SAC", + { "SAC", "ranap.SAC", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_rac, - { "RAC", + { "RAC", "ranap.RAC", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_num_rabs, - { "Number of RABs", + { "Number of RABs", "ranap.number_of_RABs", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_nAS_SynchronisationIndicator_present, - { "nAS-SynchronisationIndicator", + { "nAS-SynchronisationIndicator", "ranap.nAS-SynchronisationIndicator_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_rAB_Parameters_present, - { "rAB-Parameters", + { "rAB-Parameters", "ranap.rAB_Parameters_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_userPlaneInformation_present, - { "userPlaneInformation", + { "userPlaneInformation", "ranap.userPlaneInformation_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_transportLayerInformation_present, - { "transportLayerInformation", + { "transportLayerInformation", "ranap.transportLayerInformation_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_service_Handover_present, - { "service-Handover", + { "service-Handover", "ranap.service_Handover_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_iE_Extensions_present, - { "iE-Extensions", + { "iE-Extensions", "ranap.ie.iE-Extensions_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_nAS_SynchronisationIndicator, - { "nAS-SynchronisationIndicator", + { "nAS-SynchronisationIndicator", "ranap.nAS-SynchronisationIndicator", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_ranap_guaranteedBitRate_present, - { "guaranteedBitRate", + { "guaranteedBitRate", "ranap.guaranteedBitRate_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_transferDelay_present, - { "transferDelay", + { "transferDelay", "ranap.transferDelay_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_trafficHandlingPriority_present, - { "trafficHandlingPriority", + { "trafficHandlingPriority", "ranap.trafficHandlingPriority_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_allocationOrRetentionPriority_present, - { "allocationOrRetentionPriority", + { "allocationOrRetentionPriority", "ranap.allocationOrRetentionPriority_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_sourceStatisticsDescriptor_present, - { "sourceStatisticsDescriptor", + { "sourceStatisticsDescriptor", "ranap.sourceStatisticsDescriptor_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_relocationRequirement_present, - { "relocationRequirement", + { "relocationRequirement", "ranap.relocationRequirement_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_trafficClass, - { "Traffic Class", + { "Traffic Class", "ranap.rab_Parameters.trafficClass", - FT_UINT8, BASE_DEC, VALS(&ranap_trafficClass_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_trafficClass_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_rAB_AsymmetryIndicator, - { "rAB_AsymmetryIndicator", + { "rAB_AsymmetryIndicator", "ranap.rab_Parameters.rAB_AsymmetryIndicator", - FT_UINT8, BASE_DEC, VALS(&ranap_rAB_AsymmetryIndicator_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_rAB_AsymmetryIndicator_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_maxBitrate, - { "maxBitrate", + { "maxBitrate", "ranap.rab_Parameters.maxBitrate", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_guaranteedBitrate, - { "guaranteedBitrate", + { "guaranteedBitrate", "ranap.rab_Parameters.guaranteedBitrate", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_deliveryOrder, - { "deliveryOrder", + { "deliveryOrder", "ranap.rab_Parameters.deliveryOrder", - FT_UINT8, BASE_DEC, VALS(&ranap_DeliveryOrder_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_DeliveryOrder_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_maxSDU_Size, - { "maxSDU_Size", + { "maxSDU_Size", "ranap.rab_Parameters.maxSDU_Size", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_sDU_ErrorRatio_mantissa, - { "sDU_ErrorRatio: mantissa", + { "sDU_ErrorRatio: mantissa", "ranap.rab_Parameters.sDU_ErrorRatio.mantissa", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_sDU_ErrorRatio_exponent, - { "sDU_ErrorRatio: exponent", + { "sDU_ErrorRatio: exponent", "ranap.rab_Parameters.sDU_ErrorRatio.exponent", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_residualBitErrorRatio_mantissa, - { "residualBitErrorRatio: mantissa", + { "residualBitErrorRatio: mantissa", "ranap.rab_Parameters.residualBitErrorRatio.mantissa", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_residualBitErrorRatio_exponent, - { "residualBitErrorRatio: exponent", + { "residualBitErrorRatio: exponent", "ranap.rab_Parameters.residualBitErrorRatio.exponent", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_deliveryOfErroneousSDU, - { "deliveryOfErroneousSDU", + { "deliveryOfErroneousSDU", "ranap.rab_Parameters.ranap_deliveryOfErroneousSDU", - FT_UINT8, BASE_DEC, VALS(&ranap_deliveryOfErroneousSDU_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_deliveryOfErroneousSDU_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_subflowSDU_Size, - { "subflowSDU_Size", + { "subflowSDU_Size", "ranap.rab_Parameters.subflowSDU_Size", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_rAB_SubflowCombinationBitRate, - { "rAB_SubflowCombinationBitRate", + { "rAB_SubflowCombinationBitRate", "ranap.rab_Parameters.rAB_SubflowCombinationBitRate", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_sDU_ErrorRatio_present, - { "sDU_ErrorRatio", + { "sDU_ErrorRatio", "ranap.sDU_ErrorRatio_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_sDU_FormatInformationParameters_present, - { "sDU_FormatInformationParameters", + { "sDU_FormatInformationParameters", "ranap.sDU_FormatInformationParameters_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_subflowSDU_Size_present, - { "subflowSDU_Size", + { "subflowSDU_Size", "ranap.subflowSDU_Size_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_rAB_SubflowCombinationBitRate_present, - { "subflowSDU_Size", + { "subflowSDU_Size", "ranap.rAB_SubflowCombinationBitRate_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_transferDelay, - { "transferDelay", + { "transferDelay", "ranap.rab_Parameters.transferDelay", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_trafficHandlingPriority, - { "trafficHandlingPriority", + { "trafficHandlingPriority", "ranap.rab_Parameters.trafficHandlingPriority", - FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_priorityLevel, - { "priorityLevel", + { "priorityLevel", "ranap.rab_Parameters.allocationOrRetentionPriority.priorityLevel", - FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, "", HFILL } }, { &hf_ranap_pre_emptionCapability, - { "pre-emptionCapability", + { "pre-emptionCapability", "ranap.rab_Parameters.allocationOrRetentionPriority.pre_emptionCapability", - FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionCapability_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionCapability_values), 0x0, "", HFILL } }, { &hf_ranap_pre_emptionVulnerability, - { "pre-emptionVulnerability", + { "pre-emptionVulnerability", "ranap.rab_Parameters.allocationOrRetentionPriority.pre_emptionVulnerability", - FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionVulnerability_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionVulnerability_values), 0x0, "", HFILL } }, { &hf_ranap_queuingAllowed, - { "queuingAllowed", + { "queuingAllowed", "ranap.rab_Parameters.allocationOrRetentionPriority.queuingAllowed", - FT_UINT8, BASE_DEC, VALS(&ranap_queuingAllowed_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_queuingAllowed_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_sourceStatisticsDescriptor, - { "sourceStatisticsDescriptor", + { "sourceStatisticsDescriptor", "ranap.rab_Parameters.sourceStatisticsDescriptor", - FT_UINT8, BASE_DEC, VALS(&ranap_sourceStatisticsDescriptor_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_sourceStatisticsDescriptor_values), 0x0, "", HFILL } }, { &hf_ranap_relocationRequirement, - { "relocationRequirement", + { "relocationRequirement", "ranap.rab_Parameters.relocationRequirement", - FT_UINT8, BASE_DEC, VALS(&ranap_relocationRequirement_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_relocationRequirement_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_userPlaneMode, - { "userPlaneMode", + { "userPlaneMode", "ranap.userPlaneMode", - FT_UINT8, BASE_DEC, VALS(&ranap_userPlaneMode_values), 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_userPlaneMode_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_uP_ModeVersions, - { "uP_ModeVersions", + { "uP_ModeVersions", "ranap.uP_ModeVersions", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_number_of_ProtocolExtensionFields, - { "Number of ProtocolExtensionFields", + { "Number of ProtocolExtensionFields", "ranap.number_of_ProtocolExtensionFields", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_ext_field_number_of_octets, - { "Number of octets", + { "Number of octets", "ranap.ProtocolExtensionFields.octets", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_transportLayerAddress_length, - { "bit length of transportLayerAddress", + { "bit length of transportLayerAddress", "ranap.transportLayerAddress_length", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_transportLayerAddress, - { "transportLayerAddress", + { "transportLayerAddress", "ranap.transportLayerAddress", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_gTP_TEI, - { "gTP_TEI", + { "gTP_TEI", "ranap.gTP_TEI", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_bindingID, - { "bindingID", + { "bindingID", "ranap.bindingID", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_ranap_pDP_TypeInformation_present, - { "pDP_TypeInformation", + { "pDP_TypeInformation", "ranap.pDP_TypeInformation_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dataVolumeReportingIndication_present, - { "dataVolumeReportingIndication", + { "dataVolumeReportingIndication", "ranap.dataVolumeReportingIndication_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dl_GTP_PDU_SequenceNumber_present, - { "dl_GTP_PDU_SequenceNumber", + { "dl_GTP_PDU_SequenceNumber", "ranap.dl_GTP_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_ul_GTP_PDU_SequenceNumber_present, - { "ul_GTP_PDU_SequenceNumber", + { "ul_GTP_PDU_SequenceNumber", "ranap.ul_GTP_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dl_N_PDU_SequenceNumber_present, - { "dl_N_PDU_SequenceNumber", + { "dl_N_PDU_SequenceNumber", "ranap.dl_N_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_ul_N_PDU_SequenceNumber_present, - { "ul_N_PDU_SequenceNumber", + { "ul_N_PDU_SequenceNumber", "ranap.ul_N_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_PDP_Type, - { "PDP-Type", + { "PDP-Type", "ranap.RAB_SetupOrModifyItemSecond.PDP_Type", - FT_UINT8, BASE_HEX, VALS(&ranap_PDP_Type_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_PDP_Type_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dataVolumeReportingIndication, - { "dataVolumeReportingIndication", + { "dataVolumeReportingIndication", "ranap.RAB_SetupOrModifyItemSecond.dataVolumeReportingIndication", - FT_UINT8, BASE_HEX, VALS(&ranap_dataVolumeReportingIndication_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_dataVolumeReportingIndication_values), 0x0, "", HFILL } }, { &hf_ranap_dl_GTP_PDU_SequenceNumber, - { "dl_GTP_PDU_SequenceNumber", + { "dl_GTP_PDU_SequenceNumber", "ranap.RAB_SetupOrModifyItemSecond.dl_GTP_PDU_SequenceNumber", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_ul_GTP_PDU_SequenceNumber, - { "ul_GTP_PDU_SequenceNumber", + { "ul_GTP_PDU_SequenceNumber", "ranap.RAB_SetupOrModifyItemSecond.ul_GTP_PDU_SequenceNumber", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_dl_N_PDU_SequenceNumber, - { "ul_GTP_PDU_SequenceNumber", + { "ul_GTP_PDU_SequenceNumber", "ranap.RAB_SetupOrModifyItemSecond.ul_GTP_PDU_SequenceNumber", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_ul_N_PDU_SequenceNumber, - { "ul_GTP_PDU_SequenceNumber", + { "ul_GTP_PDU_SequenceNumber", "ranap.RAB_SetupOrModifyItemSecond.ul_GTP_PDU_SequenceNumber", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_cause_choice, - { "cause choice", + { "cause choice", "ranap.cause_choice", - FT_UINT8, BASE_HEX, VALS(&ranap_cause_choice_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_cause_choice_values), 0x0, "", HFILL } }, { &hf_ranap_cause_value, - { "cause value", + { "cause value", "ranap.cause_value", FT_UINT8, BASE_DEC,VALS(&ranap_cause_value_str), 0x0, "", HFILL } }, { &hf_ranap_transportLayerAddress_present, - { "transportLayerAddress", + { "transportLayerAddress", "ranap.transportLayerAddress_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_iuTransportAssociation_present, - { "iuTransportAssociation", + { "iuTransportAssociation", "ranap.iuTransportAssociation_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dl_dataVolumes_present, - { "dl_dataVolumes", + { "dl_dataVolumes", "ranap.dl_dataVolumes_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_dataVolumeReference_present, - { "dataVolumeReference", + { "dataVolumeReference", "ranap.dataVolumeReference_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume, - { "dl-UnsuccessfullyTransmittedDataVolume", + { "dl-UnsuccessfullyTransmittedDataVolume", "ranap.dl-UnsuccessfullyTransmittedDataVolume", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_dataVolumeReference, - { "dataVolumeReference", + { "dataVolumeReference", "ranap.dataVolumeReference", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_procedureCode_present, - { "procedureCode", + { "procedureCode", "ranap.procedureCode_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_triggeringMessage_present, - { "triggeringMessage", + { "triggeringMessage", "ranap.triggeringMessage_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_procedureCriticality_present, - { "procedureCriticality", + { "procedureCriticality", "ranap.procedureCriticality_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_iEsCriticalityDiagnostics_present, - { "iEsCriticalityDiagnostics", + { "iEsCriticalityDiagnostics", "ranap.iEsCriticalityDiagnostics_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_triggeringMessage, - { "triggeringMessage", - "ranap.triggeringMessage", - FT_UINT8, BASE_HEX, VALS(&ranap_pdu_index_values), 0x0, + { "triggeringMessage", + "ranap.triggeringMessage", + FT_UINT8, BASE_HEX, VALS(&ranap_pdu_index_values), 0x0, "", HFILL } }, { &hf_ranap_procedureCriticality, - { "procedureCriticality", - "ranap.procedureCriticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "procedureCriticality", + "ranap.procedureCriticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_iECriticality, - { "iECriticality", - "ranap.iECriticality", - FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, + { "iECriticality", + "ranap.iECriticality", + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_repetitionNumber, - { "repetitionNumber", - "ranap.repetitionNumber", - FT_UINT16, BASE_DEC, NULL, 0x0, + { "repetitionNumber", + "ranap.repetitionNumber", + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_num_of_CriticalityDiagnostics_IEs, - { "Number of CriticalityDiagnostics-IEs", - "ranap.num_of_CriticalityDiagnostics_IEs", - FT_UINT16, BASE_DEC, NULL, 0x0, + { "Number of CriticalityDiagnostics-IEs", + "ranap.num_of_CriticalityDiagnostics_IEs", + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_ranap_repetitionNumber_present, - { "repetitionNumber", + { "repetitionNumber", "ranap.repetitionNumber_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume_present, - { "dl-UnsuccessfullyTransmittedDataVolume", + { "dl-UnsuccessfullyTransmittedDataVolume", "ranap.dl_UnsuccessfullyTransmittedDataVolume_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_CN_DomainIndicator, - { "CN-DomainIndicator", + { "CN-DomainIndicator", "ranap.CN_DomainIndicator", - FT_UINT8, BASE_HEX, VALS(&ranap_CN_DomainIndicator_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_CN_DomainIndicator_values), 0x0, "", HFILL } }, { &hf_ranap_service_Handover, - { "service-Handover", + { "service-Handover", "ranap.service_Handover", - FT_UINT8, BASE_HEX, VALS(&ranap_service_Handover_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_service_Handover_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_IuSigConId, - { "IuSigConId", + { "IuSigConId", "ranap.IuSigConId", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_ranap_SAPI, - { "SAPI", + { "SAPI", "ranap.IuSigConId", - FT_UINT8, BASE_HEX, VALS(&ranap_SAPI_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_SAPI_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_msg_extension_present, - { "Message Extension", + { "Message Extension", "ranap.msg_extension_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } - }, + }, { &hf_ranap_ProtocolExtensionContainer_present, - { "ProtocolExtensionContainer", + { "ProtocolExtensionContainer", "ranap.ProtocolExtensionContainer_present", - FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, "", HFILL } }, { &hf_ranap_nas_pdu_length, - { "length of NAS-PDU", + { "length of NAS-PDU", "ranap.nas_pdu_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - } + } }; /* Setup protocol subtree array */ @@ -4769,18 +4769,18 @@ proto_register_ranap(void) &ett_ranap_sDU, &ett_ranap_rAB_Parameters, &ett_ranap_allocationOrRetentionPriority , - &ett_ranap_CriticalityDiagnostics_IE + &ett_ranap_CriticalityDiagnostics_IE }; - - + + /* Register the protocol name and description */ proto_ranap = proto_register_protocol("Radio Access Network Application Part", "RANAP", "ranap"); - + /* Register the header fields and subtrees */ proto_register_field_array(proto_ranap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + }; @@ -4791,6 +4791,6 @@ proto_reg_handoff_ranap(void) ranap_handle = create_dissector_handle(dissect_ranap, proto_ranap); dissector_add("sual.subsystem_number", SCCP_SSN_RANAP, ranap_handle); - dissector_add("sual.subsystem_number", SCCP_SSN_RANAP_C, ranap_handle); - dissector_add("sual.subsystem_number", SCCP_SSN_RANAP_D, ranap_handle); + dissector_add("sual.subsystem_number", SCCP_SSN_RANAP_C, ranap_handle); + dissector_add("sual.subsystem_number", SCCP_SSN_RANAP_D, ranap_handle); } diff --git a/packet-raw.c b/packet-raw.c index 8931192511..448d54203d 100644 --- a/packet-raw.c +++ b/packet-raw.c @@ -1,24 +1,24 @@ /* packet-raw.c * Routines for raw packet disassembly * - * $Id: packet-raw.c,v 1.34 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-raw.c,v 1.35 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * * This file created and by Mike Hall <mlh@io.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -52,7 +52,7 @@ capture_raw(const guchar *pd, int len, packet_counts *ld) * Irix PPP connections. We can't tell what type of data is coming down * the line, so our safest bet is IP. - GCC */ - + /* Currently, the Linux 2.1.xxx PPP driver passes back some of the header * sometimes. This check should be removed when 2.2 is out. */ @@ -74,7 +74,7 @@ capture_raw(const guchar *pd, int len, packet_counts *ld) capture_ip(pd, 10, len, ld); } else { - /* + /* * OK, is this IPv4 or IPv6? */ if (BYTES_ARE_IN_FRAME(0,len,1)) { @@ -126,7 +126,7 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Irix PPP connections. We can't tell what type of data is coming down * the line, so our safest bet is IP. - GCC */ - + /* Currently, the Linux 2.1.xxx PPP driver passes back some of the header * sometimes. This check should be removed when 2.2 is out. */ diff --git a/packet-raw.h b/packet-raw.h index 4246132036..fc56069715 100644 --- a/packet-raw.h +++ b/packet-raw.h @@ -1,21 +1,21 @@ /* packet-raw.h * - * $Id: packet-raw.h,v 1.6 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-raw.h,v 1.7 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rip.c b/packet-rip.c index ee268ada9a..a268f75bf8 100644 --- a/packet-rip.c +++ b/packet-rip.c @@ -3,27 +3,27 @@ * RFC1058, RFC2453 * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-rip.c,v 1.32 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-rip.c,v 1.33 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include "config.h" #include <string.h> @@ -85,7 +85,7 @@ static void dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, static void dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree); -static void +static void dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; @@ -102,7 +102,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) command = tvb_get_guint8(tvb, 0); version = tvb_get_guint8(tvb, 1); - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_add_str(pinfo->cinfo, COL_PROTOCOL, val_to_str(version, version_vals, "RIP")); @@ -175,7 +175,7 @@ dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4, FALSE); } - proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, + proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, offset+16, 4, metric); } @@ -207,7 +207,7 @@ dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version, proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4, FALSE); } - proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, + proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb, offset+16, 4, metric); } diff --git a/packet-ripng.c b/packet-ripng.c index 51af46f4cc..5815033942 100644 --- a/packet-ripng.c +++ b/packet-ripng.c @@ -3,27 +3,27 @@ * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * derived from packet-rip.c * - * $Id: packet-ripng.c,v 1.26 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-ripng.c,v 1.27 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include "config.h" #include <string.h> @@ -50,14 +50,14 @@ static const value_string cmdvals[] = { { 0, NULL }, }; -static void +static void dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; struct rip6 rip6; struct netinfo6 ni6; proto_tree *ripng_tree = NULL; proto_tree *subtree = NULL; - proto_item *ti; + proto_item *ti; if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng"); @@ -66,12 +66,12 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* avoid alignment problem */ tvb_memcpy(tvb, (guint8 *)&rip6, offset, sizeof(rip6)); - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "RIPng version %u", rip6.rip6_vers); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, - val_to_str(rip6.rip6_cmd, cmdvals, "Unknown command (%u)")); + val_to_str(rip6.rip6_cmd, cmdvals, "Unknown command (%u)")); if (tree) { ti = proto_tree_add_item(tree, proto_ripng, tvb, offset, -1, FALSE); diff --git a/packet-ripng.h b/packet-ripng.h index 91ecfa0588..d141a98a3f 100644 --- a/packet-ripng.h +++ b/packet-ripng.h @@ -2,23 +2,23 @@ * RIPng definition * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * - * $Id: packet-ripng.h,v 1.5 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-ripng.h,v 1.6 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,7 +37,7 @@ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -49,7 +49,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/packet-rlogin.c b/packet-rlogin.c index e49fbcc582..b8195f0b6f 100644 --- a/packet-rlogin.c +++ b/packet-rlogin.c @@ -2,24 +2,24 @@ * Routines for unix rlogin packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-rlogin.c,v 1.27 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-rlogin.c,v 1.28 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Based upon RFC-1282 - BSD Rlogin - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -65,7 +65,7 @@ typedef struct { int state; guint32 info_framenum; char name[ NAME_LEN]; - + } rlogin_hash_entry_t; #define NONE 0 @@ -102,7 +102,7 @@ rlogin_init(void) /**************** Decoder State Machine ******************/ -static void +static void rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info *pinfo) { @@ -119,9 +119,9 @@ rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, /* exit if not needed */ if (( hash_info->state == DONE) || ( hash_info->state == BAD)) return; - + /* test timestamp */ - if (( last_abs_sec > pinfo->fd->abs_secs) || + if (( last_abs_sec > pinfo->fd->abs_secs) || (( last_abs_sec == pinfo->fd->abs_secs) && ( last_abs_usec >= pinfo->fd->abs_usecs))) return; @@ -131,7 +131,7 @@ rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, length = tvb_length(tvb); if ( length == 0) /* exit if no data */ - return; + return; if ( hash_info->state == NONE){ /* new connection*/ if (tvb_get_guint8(tvb, 0) != '\0') { @@ -147,12 +147,12 @@ rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, else { hash_info->state = DONE; hash_info->info_framenum = pinfo->fd->num; - } + } } } /* expect user data here */ -/*$$$ may need to do more checking here */ +/*$$$ may need to do more checking here */ else if ( hash_info->state == USER_INFO_WAIT) { - hash_info->state = DONE; + hash_info->state = DONE; hash_info->info_framenum = pinfo->fd->num; /* save name for later*/ stringlen = tvb_strnlen(tvb, 0, NAME_LEN); @@ -162,11 +162,11 @@ rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, stringlen = NAME_LEN - 1; /* name too long */ tvb_memcpy(tvb, (guint8 *)hash_info->name, 0, stringlen); hash_info->name[stringlen] = '\0'; - + if (check_col(pinfo->cinfo, COL_INFO)) /* update summary */ col_append_str(pinfo->cinfo, COL_INFO, ", User information"); - } + } } static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, @@ -200,11 +200,11 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, int urgent_offset = tcpinfo->urgent_pointer - 1; guint8 Temp = tvb_get_guint8(tvb, urgent_offset); - + if (urgent_offset > offset) /* check for data in front */ proto_tree_add_text( rlogin_tree, tvb, offset, urgent_offset, "Data"); - + proto_tree_add_text( rlogin_tree, tvb, urgent_offset, 1, "Control byte: %u (%s)", Temp, @@ -219,13 +219,13 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, if ( pinfo->srcport== RLOGIN_PORT) /* from server */ proto_tree_add_text(rlogin_tree, tvb, offset, 1, "Startup info received flag (0x00)"); - - else + + else proto_tree_add_text(rlogin_tree, tvb, offset, 1, "Client Startup Flag (0x00)"); ++offset; } - + if (!tvb_offset_exists(tvb, offset)) return; /* No more data to check */ @@ -255,7 +255,7 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, "Client User Name: %.*s", str_len - 1, tvb_get_ptr(tvb, offset, str_len - 1)); offset += str_len; - + /* * Do terminal type/speed. */ @@ -273,7 +273,7 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, /* look for first 0xff byte */ ti_offset = tvb_find_guint8(tvb, offset, -1, 0xff); - + if (ti_offset != -1 && tvb_bytes_exist(tvb, ti_offset + 1, 1) && tvb_get_guint8(tvb, ti_offset + 1) == 0xff) { @@ -291,15 +291,15 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, window_info_item = proto_tree_add_item(rlogin_tree, hf_window_info, tvb, offset, 12, FALSE ); - + window_tree = proto_item_add_subtree(window_info_item, ett_rlogin_window); - proto_tree_add_text(window_tree, tvb, offset, 2, + proto_tree_add_text(window_tree, tvb, offset, 2, "Magic Cookie: (0xff, 0xff)"); offset += 2; - - proto_tree_add_text(window_tree, tvb, offset, 2, + + proto_tree_add_text(window_tree, tvb, offset, 2, "Window size marker: 'ss'"); offset += 2; @@ -319,14 +319,14 @@ static void rlogin_display( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, offset, 2, FALSE); offset += 2; } - + if (tvb_offset_exists(tvb, offset)) { /* * There's more data in the frame. */ proto_tree_add_text(rlogin_tree, tvb, offset, -1, "Data"); } -} +} static void dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -354,30 +354,30 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_add_proto_data(conversation, proto_rlogin, hash_info); } - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* update protocol */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Rlogin"); if (check_col(pinfo->cinfo, COL_INFO)){ /* display packet info*/ char temp[1000]; - + col_clear(pinfo->cinfo, COL_INFO); if ( hash_info->name[0]) { strcpy( temp, "User name: "); strcat( temp, hash_info->name); strcat( temp, ", "); } - else + else temp[0] = 0; length = tvb_length(tvb); if (length != 0) { if ( tvb_get_guint8(tvb, 0) == '\0') - strcat( temp, "Start Handshake"); + strcat( temp, "Start Handshake"); else if ( tcpinfo->urgent && length >= tcpinfo->urgent_pointer ) - strcat( temp, "Control Message"); + strcat( temp, "Control Message"); else { /* check for terminal info */ ti_offset = tvb_find_guint8(tvb, 0, -1, 0xff); @@ -399,7 +399,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) temp[i + bytes_to_copy] = '\0'; } } - } + } col_add_str(pinfo->cinfo, COL_INFO, temp); } @@ -425,7 +425,7 @@ proto_register_rlogin( void){ &ett_rlogin_window_y_pixels, &ett_rlogin_user_info }; - + static hf_register_info hf[] = { { &hf_user_info, @@ -464,7 +464,7 @@ proto_register_rlogin( void){ "Rlogin Protocol", "Rlogin", "rlogin"); proto_register_field_array(proto_rlogin, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); register_init_routine( &rlogin_init); /* register re-init routine */ } @@ -472,8 +472,8 @@ proto_register_rlogin( void){ void proto_reg_handoff_rlogin(void) { - /* dissector install routine */ - + /* dissector install routine */ + dissector_handle_t rlogin_handle; rlogin_handle = create_dissector_handle(dissect_rlogin, proto_rlogin); diff --git a/packet-rmi.c b/packet-rmi.c index 34ed1a3793..50d741664e 100644 --- a/packet-rmi.c +++ b/packet-rmi.c @@ -2,7 +2,7 @@ * Routines for java rmiregistry dissection * Copyright 2002, Michael Stiller <ms@2scale.net> * - * $Id: packet-rmi.c,v 1.4 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-rmi.c,v 1.5 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -94,14 +94,14 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rmitype = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMI"); datalen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); data = tvb_get_ptr(tvb, offset, datalen); - + rmitype = get_rmi_type(data, datalen); - + if (check_col(pinfo->cinfo, COL_INFO)) { switch(rmitype) { case RMI_OUTPUTSTREAM: @@ -110,7 +110,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "JRMI, Version: %d, ", version); proto = tvb_get_guint8(tvb, 6); - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(proto, rmi_protocol_str, "Unknown protocol")); break; @@ -183,7 +183,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) epid_hostname); port = tvb_get_ntohs(tvb, offset + len + 5); - proto_tree_add_uint(rmi_tree, hf_rmi_epid_port, + proto_tree_add_uint(rmi_tree, hf_rmi_epid_port, tvb, offset + len + 5, 2, port); } if(message == RMI_INPUTSTREAM_MESSAGE_RETURNDATA) { @@ -230,7 +230,7 @@ dissect_ser(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint offset; offset = 0; - + if(tree) { ti = proto_tree_add_item(tree, proto_ser, tvb, 0, -1, FALSE); ser_tree = proto_item_add_subtree(ti, ett_ser); @@ -246,7 +246,7 @@ static rmi_type get_rmi_type(const guchar *data, int datalen) { guint16 ser_magic; - + if (datalen >= 2) { ser_magic = data[0] << 8 | data[1]; if (ser_magic == SER_STREAM_MAGIC) { @@ -279,7 +279,7 @@ get_rmi_type(const guchar *data, int datalen) void proto_register_rmi(void) { - + static hf_register_info hf[] = { { &hf_rmi_magic, { "Magic", "rmi.magic", @@ -287,11 +287,11 @@ proto_register_rmi(void) "RMI Header Magic", HFILL }}, { &hf_rmi_version, { "Version", "rmi.version", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "RMI Protocol Version", HFILL }}, { &hf_rmi_protocol, { "Protocol","rmi.protocol", - FT_STRING, BASE_HEX, NULL, 0x0, + FT_STRING, BASE_HEX, NULL, 0x0, "RMI Protocol Type", HFILL }}, { &hf_rmi_inputmessage, { "Input Stream Message", "rmi.inputstream.message", @@ -303,7 +303,7 @@ proto_register_rmi(void) "RMI Outputstream Message token", HFILL }}, { &hf_rmi_epid_length, { "Length", "rmi.endpoint_id.length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "RMI Endpointidentifier Length", HFILL }}, { &hf_rmi_epid_hostname, { "Hostname", "rmi.endpoint_id.hostname", @@ -320,10 +320,10 @@ proto_register_rmi(void) "Java Serialization Magic", HFILL }}, { &hf_ser_version, { "Version", "rmi.ser.version", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "Java Serialization Version", HFILL }}, }; - + static gint *ett[] = { &ett_rmi, &ett_rmi_magic, @@ -335,7 +335,7 @@ proto_register_rmi(void) &ett_rmi_epid_port, &ett_ser, }; - + proto_rmi = proto_register_protocol("Java RMI", "RMI", "rmi"); proto_ser = proto_register_protocol("Java Serialization", "Serialization", "serialization"); diff --git a/packet-rmi.h b/packet-rmi.h index f62cd90f85..d57004c45a 100644 --- a/packet-rmi.h +++ b/packet-rmi.h @@ -2,7 +2,7 @@ * header file for java rmiregistry dissection * Copyright 2002, Michael Stiller <ms@2scale.net> * - * $Id: packet-rmi.h,v 1.2 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-rmi.h,v 1.3 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -47,7 +47,7 @@ #define RMI_OUTPUTSTREAM_PROTOCOL_STREAM 0x4b #define RMI_OUTPUTSTREAM_PROTOCOL_SINGLEOP 0x4c -#define RMI_OUTPUTSTREAM_PROTOCOL_MULTIPLEX 0x4d +#define RMI_OUTPUTSTREAM_PROTOCOL_MULTIPLEX 0x4d #define RMI_OUTPUTSTREAM_MESSAGE_CALL 0x50 #define RMI_OUTPUTSTREAM_MESSAGE_PING 0x52 @@ -62,7 +62,7 @@ typedef enum { CONTINUATION = 1, RMI_OUTPUTSTREAM = 2, RMI_OUTPUTMESSAGE = 3, - RMI_INPUTSTREAM = 16, + RMI_INPUTSTREAM = 16, SERIALIZATION_DATA = 128, } rmi_type; diff --git a/packet-rpc.c b/packet-rpc.c index 7e36626c65..33c43a5138 100644 --- a/packet-rpc.c +++ b/packet-rpc.c @@ -1,25 +1,25 @@ /* packet-rpc.c * Routines for rpc dissection * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> - * - * $Id: packet-rpc.c,v 1.102 2002/08/22 20:47:10 guy Exp $ - * + * + * $Id: packet-rpc.c,v 1.103 2002/08/28 21:00:29 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * Copied from packet-smb.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -267,7 +267,7 @@ rpc_proc_equal(gconstpointer k1, gconstpointer k2) rpc_proc_info_key* key1 = (rpc_proc_info_key*) k1; rpc_proc_info_key* key2 = (rpc_proc_info_key*) k2; - return ((key1->prog == key2->prog && + return ((key1->prog == key2->prog && key1->vers == key2->vers && key1->proc == key2->proc) ? TRUE : FALSE); @@ -544,7 +544,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, fill_truncated = 0; } } - string_buffer = (char*)g_malloc(string_length_copy + + string_buffer = (char*)g_malloc(string_length_copy + (string_data ? 1 : 0)); tvb_memcpy(tvb,string_buffer,offset+4,string_length_copy); if (string_data) @@ -565,7 +565,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, in the case of totally wrong packets, where \0 are inside the string. TRUNCATED will appear at the - first \0 or at the end (where we + first \0 or at the end (where we put the securing \0). */ strcat(string_buffer_print,"<TRUNCATED>"); @@ -607,12 +607,12 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, if (string_data) { proto_tree_add_string_format(string_tree, hfindex, tvb, offset, string_length_copy, - string_buffer_print, + string_buffer_print, "contents: %s", string_buffer_print); } else { proto_tree_add_bytes_format(string_tree, hfindex, tvb, offset, string_length_copy, - string_buffer_print, + string_buffer_print, "contents: %s", string_buffer_print); } } @@ -632,7 +632,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, } offset += fill_length_copy; } - + if (string_item) { proto_item_set_len(string_item, offset - old_offset); } @@ -720,7 +720,7 @@ dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, lock_item = proto_tree_add_item(tree, hfindex, tvb, offset, -1, FALSE); - lock_tree = proto_item_add_subtree(lock_item, ett_rpc_array); + lock_tree = proto_item_add_subtree(lock_item, ett_rpc_array); offset = dissect_rpc_uint32(tvb, lock_tree, hf_rpc_array_len, offset); @@ -773,7 +773,7 @@ dissect_rpc_authunix_cred(tvbuff_t* tvb, proto_tree* tree, int offset) gtree = proto_item_add_subtree(gitem, ett_rpc_gids); } offset += 4; - + for (gids_i = 0 ; gids_i < gids_count ; gids_i++) { gids_entry = tvb_get_ntohl(tvb,offset+0); if (gtree) @@ -800,28 +800,28 @@ dissect_rpc_authgss_cred(tvbuff_t* tvb, proto_tree* tree, int offset) proto_tree_add_uint(tree, hf_rpc_authgss_v, tvb, offset+0, 4, agc_v); offset += 4; - + agc_proc = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_rpc_authgss_proc, tvb, offset+0, 4, agc_proc); offset += 4; - + agc_seq = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_rpc_authgss_seq, tvb, offset+0, 4, agc_seq); offset += 4; - + agc_svc = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_rpc_authgss_svc, tvb, offset+0, 4, agc_svc); offset += 4; - + offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_ctx, offset); - + return offset; } @@ -837,7 +837,7 @@ int hfindex, int offset) if (tree) { proto_tree_add_text(tree, tvb, offset, 8, - "%s: 0x%x%08x", proto_registrar_get_name(hfindex), value_high, + "%s: 0x%x%08x", proto_registrar_get_name(hfindex), value_high, value_low); } @@ -860,7 +860,7 @@ dissect_rpc_authdes_cred(tvbuff_t* tvb, proto_tree* tree, int offset) switch(adc_namekind) { case AUTHDES_NAMEKIND_FULLNAME: - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_rpc_authdes_netname, offset, NULL); offset = dissect_rpc_authdes_desblock(tvb, tree, hf_rpc_authdes_convkey, offset); @@ -915,7 +915,7 @@ dissect_rpc_cred(tvbuff_t* tvb, proto_tree* tree, int offset) case AUTH_DES: dissect_rpc_authdes_cred(tvb, ctree, offset+8); break; - + case RPCSEC_GSS: dissect_rpc_authgss_cred(tvb, ctree, offset+8); break; @@ -939,7 +939,7 @@ dissect_rpc_verf(tvbuff_t* tvb, proto_tree* tree, int offset, int msg_type) { guint flavor; guint length; - + proto_item *vitem; proto_tree *vtree; @@ -971,7 +971,7 @@ dissect_rpc_verf(tvbuff_t* tvb, proto_tree* tree, int offset, int msg_type) dissect_rpc_authdes_desblock(tvb, vtree, hf_rpc_authdes_timestamp, offset+8); window = tvb_get_ntohl(tvb, offset+16); - proto_tree_add_uint(vtree, hf_rpc_authdes_windowverf, tvb, + proto_tree_add_uint(vtree, hf_rpc_authdes_windowverf, tvb, offset+16, 4, window); } else @@ -982,7 +982,7 @@ dissect_rpc_verf(tvbuff_t* tvb, proto_tree* tree, int offset, int msg_type) dissect_rpc_authdes_desblock(tvb, vtree, hf_rpc_authdes_timeverf, offset+8); nickname = tvb_get_ntohl(tvb, offset+16); - proto_tree_add_uint(vtree, hf_rpc_authdes_nickname, tvb, + proto_tree_add_uint(vtree, hf_rpc_authdes_nickname, tvb, offset+16, 4, nickname); } break; @@ -1058,10 +1058,10 @@ dissect_rpc_authgss_initres(tvbuff_t* tvb, proto_tree* tree, int offset, packet_info *pinfo) { int major, minor, window; - + offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_ctx, offset); - + major = tvb_get_ntohl(tvb,offset+0); if (tree) proto_tree_add_uint(tree, hf_rpc_authgss_major, tvb, @@ -1116,7 +1116,7 @@ dissect_rpc_authgss_integ_data(tvbuff_t *tvb, packet_info *pinfo, const char *progname) { guint32 length, rounded_length, seq; - + proto_item *gitem; proto_tree *gtree = NULL; @@ -1654,13 +1654,13 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } prog = tvb_get_ntohl(tvb, offset + 4); - + if (rpc_tree) { proto_tree_add_uint_format(rpc_tree, hf_rpc_program, tvb, offset+4, 4, prog, "Program: %s (%u)", progname, prog); } - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { /* Set the protocol name to the underlying program name. */ @@ -1692,7 +1692,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, sprintf(procname_static, "proc-%u", proc); procname = procname_static; } - + if (rpc_tree) { proto_tree_add_uint_format(rpc_tree, hf_rpc_procedure, tvb, offset+12, 4, proc, @@ -2067,7 +2067,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ dissect_rpc = FALSE; break; - } + } break; /* end of RPC reply */ default: @@ -2168,7 +2168,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RPCSEC_GSS_DATA: if (gss_svc == RPCSEC_GSS_SVC_NONE) { - offset = call_dissect_function(tvb, + offset = call_dissect_function(tvb, pinfo, ptree, offset, dissect_function, progname); @@ -2203,7 +2203,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RPC_CALL: if(rpc_call && rpc_call->rep_num){ fhd=(nfs_fhandle_data_t *)g_hash_table_lookup( - nfs_fhandle_frame_table, + nfs_fhandle_frame_table, (gconstpointer)rpc_call->rep_num); if(fhd){ dissect_fhandle_hidden(pinfo, @@ -2214,7 +2214,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RPC_REPLY: if(rpc_call && rpc_call->req_num){ fhd=(nfs_fhandle_data_t *)g_hash_table_lookup( - nfs_fhandle_frame_table, + nfs_fhandle_frame_table, (gconstpointer)rpc_call->req_num); if(fhd){ dissect_fhandle_hidden(pinfo, @@ -2633,7 +2633,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, if (ipfd_head == NULL) { /* - * fragment_add() returned NULL, This means that + * fragment_add() returned NULL, This means that * defragmentation is not completed yet. * * We must add an entry to the hash table with @@ -2894,22 +2894,22 @@ proto_register_rpc(void) "RPC Version", "rpc.version", FT_UINT32, BASE_DEC, NULL, 0, "RPC Version", HFILL }}, { &hf_rpc_version_min, { - "RPC Version (Minimum)", "rpc.version.min", FT_UINT32, + "RPC Version (Minimum)", "rpc.version.min", FT_UINT32, BASE_DEC, NULL, 0, "Program Version (Minimum)", HFILL }}, { &hf_rpc_version_max, { - "RPC Version (Maximum)", "rpc.version.max", FT_UINT32, + "RPC Version (Maximum)", "rpc.version.max", FT_UINT32, BASE_DEC, NULL, 0, "RPC Version (Maximum)", HFILL }}, { &hf_rpc_program, { "Program", "rpc.program", FT_UINT32, BASE_DEC, NULL, 0, "Program", HFILL }}, { &hf_rpc_programversion, { - "Program Version", "rpc.programversion", FT_UINT32, + "Program Version", "rpc.programversion", FT_UINT32, BASE_DEC, NULL, 0, "Program Version", HFILL }}, { &hf_rpc_programversion_min, { - "Program Version (Minimum)", "rpc.programversion.min", FT_UINT32, + "Program Version (Minimum)", "rpc.programversion.min", FT_UINT32, BASE_DEC, NULL, 0, "Program Version (Minimum)", HFILL }}, { &hf_rpc_programversion_max, { - "Program Version (Maximum)", "rpc.programversion.max", FT_UINT32, + "Program Version (Maximum)", "rpc.programversion.max", FT_UINT32, BASE_DEC, NULL, 0, "Program Version (Maximum)", HFILL }}, { &hf_rpc_procedure, { "Procedure", "rpc.procedure", FT_UINT32, BASE_DEC, @@ -2978,7 +2978,7 @@ proto_register_rpc(void) "Window (encrypted)", "rpc.authdes.window", FT_UINT32, BASE_HEX, NULL, 0, "Windows (encrypted)", HFILL }}, { &hf_rpc_authdes_nickname, { - "Nickname", "rpc.authdes.nickname", FT_UINT32, + "Nickname", "rpc.authdes.nickname", FT_UINT32, BASE_HEX, NULL, 0, "Nickname", HFILL }}, { &hf_rpc_authdes_timestamp, { "Timestamp (encrypted)", "rpc.authdes.timestamp", FT_UINT32, @@ -2990,7 +2990,7 @@ proto_register_rpc(void) "Timestamp verifier (encrypted)", "rpc.authdes.timeverf", FT_UINT32, BASE_HEX, NULL, 0, "Timestamp verifier (encrypted)", HFILL }}, { &hf_rpc_auth_machinename, { - "Machine Name", "rpc.auth.machinename", FT_STRING, + "Machine Name", "rpc.auth.machinename", FT_STRING, BASE_DEC, NULL, 0, "Machine Name", HFILL }}, { &hf_rpc_dup, { "Duplicate Transaction", "rpc.dup", FT_UINT32, BASE_DEC, diff --git a/packet-rpc.h b/packet-rpc.h index 23f5adfb81..60f45b38cf 100644 --- a/packet-rpc.h +++ b/packet-rpc.h @@ -1,6 +1,6 @@ /* packet-rpc.h * - * $Id: packet-rpc.h,v 1.36 2002/05/09 12:10:05 sahlberg Exp $ + * $Id: packet-rpc.h,v 1.37 2002/08/28 21:00:29 jmayer Exp $ * * (c) 1999 Uwe Girlich * @@ -8,17 +8,17 @@ * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rquota.c b/packet-rquota.c index 43acbe8b82..1a374967a4 100644 --- a/packet-rquota.c +++ b/packet-rquota.c @@ -2,7 +2,7 @@ * Routines for rquota dissection * Copyright 2001, Mike Frisch <frisch@hummingbird.com> * - * $Id: packet-rquota.c,v 1.8 2002/08/02 23:35:57 jmayer Exp $ + * $Id: packet-rquota.c,v 1.9 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -77,34 +77,34 @@ dissect_rquota(tvbuff_t *tvb, int offset, proto_tree *tree) lock_tree = proto_item_add_subtree(lock_item, ett_rquota_rquota); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_bsize, offset); offset = dissect_rpc_bool(tvb, lock_tree, hf_rquota_active, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_bhardlimit, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_bsoftlimit, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_curblocks, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_fhardlimit, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_fsoftlimit, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_curfiles, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_btimeleft, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_rquota_ftimeleft, offset); return offset; @@ -117,7 +117,7 @@ dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto status = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_rquota_status, offset); if (status==Q_OK) { @@ -130,10 +130,10 @@ dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto static int dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_rquota_pathp, offset, NULL); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_rquota_uid, offset); return offset; @@ -142,13 +142,13 @@ dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t /* proc number, "proc name", dissect_request, dissect_reply */ /* NULL as function pointer means: type of arguments is "void". */ static const vsff rquota1_proc[] = { - { RQUOTAPROC_NULL, "NULL", + { RQUOTAPROC_NULL, "NULL", NULL, NULL }, { RQUOTAPROC_GETQUOTA, "GETQUOTA", dissect_getquota_call, dissect_getquota_result }, { RQUOTAPROC_GETACTIVEQUOTA, "GETACTIVEQUOTA", dissect_getquota_call, dissect_getquota_result }, - { 0, NULL, + { 0, NULL, NULL, NULL } }; /* end of RQUOTA version 1 */ diff --git a/packet-rquota.h b/packet-rquota.h index e8d683e6d2..588e9d5653 100644 --- a/packet-rquota.h +++ b/packet-rquota.h @@ -1,22 +1,22 @@ /* packet-rquota.h * - * $Id: packet-rquota.h,v 1.2 2001/04/21 08:00:12 guy Exp $ + * $Id: packet-rquota.h,v 1.3 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rsh.c b/packet-rsh.c index 93de7a561a..ca5b6329c0 100644 --- a/packet-rsh.c +++ b/packet-rsh.c @@ -4,22 +4,22 @@ * Robert Tsai <rtsai@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-rsh.c,v 1.19 2002/08/02 23:35:58 jmayer Exp $ + * $Id: packet-rsh.c,v 1.20 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -90,11 +90,11 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = next_offset; } - if (pinfo->match_port == pinfo->destport) - proto_tree_add_boolean_hidden(rsh_tree, + if (pinfo->match_port == pinfo->destport) + proto_tree_add_boolean_hidden(rsh_tree, hf_rsh_request, tvb, 0, 0, 1); else - proto_tree_add_boolean_hidden(rsh_tree, + proto_tree_add_boolean_hidden(rsh_tree, hf_rsh_response, tvb, 0, 0, 1); } } @@ -105,7 +105,7 @@ proto_register_rsh(void) static hf_register_info hf[] = { { &hf_rsh_response, - { "Response", "rsh.response", + { "Response", "rsh.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if rsh response", HFILL }}, { &hf_rsh_request, diff --git a/packet-rsvp.c b/packet-rsvp.c index 86c884083e..b45987d370 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,22 +3,22 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-rsvp.c,v 1.72 2002/08/02 23:35:58 jmayer Exp $ + * $Id: packet-rsvp.c,v 1.73 2002/08/28 21:00:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,15 +30,15 @@ * This module defines routines to disassemble RSVP packets, as defined in * RFC 2205. All objects from RFC2205 are supported, in IPv4 and IPv6 mode. * In addition, the Integrated Services traffic specification objects - * defined in RFC2210 are also supported. + * defined in RFC2210 are also supported. * * IPv6 support is not completely tested * - * Mar 3, 2000: Added support for MPLS/TE objects, as defined in + * Mar 3, 2000: Added support for MPLS/TE objects, as defined in * <draft-ietf-mpls-rsvp-lsp-tunnel-04.txt> */ - + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -146,7 +146,7 @@ typedef enum { Manager ID from July 1997 */ } rsvp_message_types; -static value_string message_type_vals[] = { +static value_string message_type_vals[] = { {RSVP_MSG_PATH, "PATH Message. "}, {RSVP_MSG_RESV, "RESV Message. "}, {RSVP_MSG_PERR, "PATH ERROR Message. "}, @@ -162,7 +162,7 @@ static value_string message_type_vals[] = { {0, NULL} }; -/* +/* * RSVP classes */ #define MAX_RSVP_CLASS 15 @@ -214,7 +214,7 @@ enum rsvp_classes { RSVP_CLASS_LSP_TUNNEL_IF_ID = 227 }; -static value_string rsvp_class_vals[] = { +static value_string rsvp_class_vals[] = { {RSVP_CLASS_NULL, "NULL object"}, {RSVP_CLASS_SESSION, "SESSION object"}, {RSVP_CLASS_HOP, "HOP object"}, @@ -369,7 +369,7 @@ enum intsrv_services { INTSRV_QUALITATIVE = 128 }; -static value_string intsrv_services_str[] = { +static value_string intsrv_services_str[] = { {INTSRV_GENERAL, "Default General Parameters"}, {INTSRV_GTD, "Guaranteed Rate"}, {INTSRV_CLOAD, "Controlled Load"}, @@ -399,7 +399,7 @@ enum intsrv_field_name { }; #endif -static value_string adspec_params[] = { +static value_string adspec_params[] = { {4, "IS Hop Count"}, {6, "Path b/w estimate"}, {8, "Minimum path latency"}, @@ -478,7 +478,7 @@ static const value_string gmpls_gpid_str[] = { static const value_string gmpls_sonet_signal_type_str[] = { { 1, "VT1.5 SPE / VC-11"}, - { 2, "VT2 SPE / VC-12"}, + { 2, "VT2 SPE / VC-12"}, { 3, "VT3 SPE"}, { 4, "VT6 SPE / VC-2"}, { 5, "STS-1 SPE / VC-3"}, @@ -585,7 +585,7 @@ enum rsvp_filter_keys { RSVPF_NOTIFY_REQUEST, RSVPF_ADMIN_STATUS, RSVPF_GENERALIZED_UNI, - RSVPF_UNKNOWN_OBJ, + RSVPF_UNKNOWN_OBJ, /* Session object */ RSVPF_SESSION_IP, @@ -608,244 +608,244 @@ static int rsvp_filter[RSVPF_MAX]; static hf_register_info rsvpf_info[] = { /* Message type number */ - {&rsvp_filter[RSVPF_MSG], + {&rsvp_filter[RSVPF_MSG], { "Message Type", "rsvp.msg", FT_UINT8, BASE_DEC, VALS(message_type_vals), 0x0, "", HFILL }}, /* Message type shorthands */ - {&rsvp_filter[RSVPF_PATH], + {&rsvp_filter[RSVPF_PATH], { "Path Message", "rsvp.path", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RESV], + {&rsvp_filter[RSVPF_RESV], { "Resv Message", "rsvp.resv", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_PATHERR], + {&rsvp_filter[RSVPF_PATHERR], { "Path Error Message", "rsvp.perr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RESVERR], + {&rsvp_filter[RSVPF_RESVERR], { "Resv Error Message", "rsvp.rerr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_PATHTEAR], + {&rsvp_filter[RSVPF_PATHTEAR], { "Path Tear Message", "rsvp.ptear", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RESVTEAR], + {&rsvp_filter[RSVPF_RESVTEAR], { "Resv Tear Message", "rsvp.rtear", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RCONFIRM], + {&rsvp_filter[RSVPF_RCONFIRM], { "Resv Confirm Message", "rsvp.resvconf", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RTEARCONFIRM], + {&rsvp_filter[RSVPF_RTEARCONFIRM], { "Resv Tear Confirm Message", "rsvp.rtearconf", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_BUNDLE], + {&rsvp_filter[RSVPF_BUNDLE], { "Bundle Message", "rsvp.bundle", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_ACK], + {&rsvp_filter[RSVPF_ACK], { "Ack Message", "rsvp.ack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SREFRESH], + {&rsvp_filter[RSVPF_SREFRESH], { "Srefresh Message", "rsvp.srefresh", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_HELLO], + {&rsvp_filter[RSVPF_HELLO], { "HELLO Message", "rsvp.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, /* Object class */ - {&rsvp_filter[RSVPF_OBJECT], + {&rsvp_filter[RSVPF_OBJECT], { "Object class", "rsvp.object", FT_UINT8, BASE_DEC, VALS(rsvp_class_vals), 0x0, "", HFILL }}, /* Object present shorthands */ - {&rsvp_filter[RSVPF_SESSION], + {&rsvp_filter[RSVPF_SESSION], { "SESSION", "rsvp.session", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_HOP], + {&rsvp_filter[RSVPF_HOP], { "HOP", "rsvp.hop", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_HELLO_OBJ], + {&rsvp_filter[RSVPF_HELLO_OBJ], { "HELLO Request/Ack", "rsvp.hello_obj", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_INTEGRITY], + {&rsvp_filter[RSVPF_INTEGRITY], { "INTEGRITY", "rsvp.integrity", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_TIME_VALUES], + {&rsvp_filter[RSVPF_TIME_VALUES], { "TIME VALUES", "rsvp.time", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_ERROR], + {&rsvp_filter[RSVPF_ERROR], { "ERROR", "rsvp.error", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SCOPE], + {&rsvp_filter[RSVPF_SCOPE], { "SCOPE", "rsvp.scope", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_STYLE], + {&rsvp_filter[RSVPF_STYLE], { "STYLE", "rsvp.style", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_FLOWSPEC], + {&rsvp_filter[RSVPF_FLOWSPEC], { "FLOWSPEC", "rsvp.flowspec", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_FILTER_SPEC], + {&rsvp_filter[RSVPF_FILTER_SPEC], { "FILTERSPEC", "rsvp.filter", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SENDER], + {&rsvp_filter[RSVPF_SENDER], { "SENDER TEMPLATE", "rsvp.sender", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_TSPEC], + {&rsvp_filter[RSVPF_TSPEC], { "SENDER TSPEC", "rsvp.tspec", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_ADSPEC], + {&rsvp_filter[RSVPF_ADSPEC], { "ADSPEC", "rsvp.adspec", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_POLICY], + {&rsvp_filter[RSVPF_POLICY], { "POLICY", "rsvp.policy", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_CONFIRM], + {&rsvp_filter[RSVPF_CONFIRM], { "CONFIRM", "rsvp.confirm", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_LABEL], + {&rsvp_filter[RSVPF_LABEL], { "LABEL", "rsvp.label", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RECOVERY_LABEL], + {&rsvp_filter[RSVPF_RECOVERY_LABEL], { "RECOVERY LABEL", "rsvp.recovery_label", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_UPSTREAM_LABEL], + {&rsvp_filter[RSVPF_UPSTREAM_LABEL], { "UPSTREAM LABEL", "rsvp.upstream_label", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SUGGESTED_LABEL], + {&rsvp_filter[RSVPF_SUGGESTED_LABEL], { "SUGGESTED LABEL", "rsvp.suggested_label", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_LABEL_SET], + {&rsvp_filter[RSVPF_LABEL_SET], { "RESTRICTED LABEL SET", "rsvp.label_set", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_ACCEPTABLE_LABEL_SET], + {&rsvp_filter[RSVPF_ACCEPTABLE_LABEL_SET], { "ACCEPTABLE LABEL SET", "rsvp.acceptable_label_set", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_PROTECTION], + {&rsvp_filter[RSVPF_PROTECTION], { "PROTECTION", "rsvp.protection", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RESTART_CAP], + {&rsvp_filter[RSVPF_RESTART_CAP], { "RESTART CAPABILITY", "rsvp.restart", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_LABEL_REQUEST], + {&rsvp_filter[RSVPF_LABEL_REQUEST], { "LABEL REQUEST", "rsvp.label_request", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SESSION_ATTRIBUTE], + {&rsvp_filter[RSVPF_SESSION_ATTRIBUTE], { "SESSION ATTRIBUTE", "rsvp.session_attribute", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_EXPLICIT_ROUTE], + {&rsvp_filter[RSVPF_EXPLICIT_ROUTE], { "EXPLICIT ROUTE", "rsvp.explicit_route", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_RECORD_ROUTE], + {&rsvp_filter[RSVPF_RECORD_ROUTE], { "RECORD ROUTE", "rsvp.record_route", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_MESSAGE_ID], + {&rsvp_filter[RSVPF_MESSAGE_ID], { "MESSAGE-ID", "rsvp.msgid", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_MESSAGE_ID_ACK], + {&rsvp_filter[RSVPF_MESSAGE_ID_ACK], { "MESSAGE-ID ACK", "rsvp.ack", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_MESSAGE_ID_LIST], + {&rsvp_filter[RSVPF_MESSAGE_ID_LIST], { "MESSAGE-ID LIST", "rsvp.msgid_list", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_HELLO_OBJ], + {&rsvp_filter[RSVPF_HELLO_OBJ], { "HELLO", "rsvp.hello", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_DCLASS], + {&rsvp_filter[RSVPF_DCLASS], { "DCLASS", "rsvp.dclass", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_LSP_TUNNEL_IF_ID], + {&rsvp_filter[RSVPF_LSP_TUNNEL_IF_ID], { "LSP INTERFACE-ID", "rsvp.lsp_tunnel_if_id", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_ADMIN_STATUS], + {&rsvp_filter[RSVPF_ADMIN_STATUS], { "ADMIN STATUS", "rsvp.admin_status", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_NOTIFY_REQUEST], + {&rsvp_filter[RSVPF_NOTIFY_REQUEST], { "NOTIFY REQUEST", "rsvp.notify_request", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_GENERALIZED_UNI], + {&rsvp_filter[RSVPF_GENERALIZED_UNI], { "GENERALIZED UNI", "rsvp.generalized_uni", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_UNKNOWN_OBJ], + {&rsvp_filter[RSVPF_UNKNOWN_OBJ], { "Unknown object", "rsvp.obj_unknown", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, /* Session fields */ - {&rsvp_filter[RSVPF_SESSION_IP], + {&rsvp_filter[RSVPF_SESSION_IP], { "Destination address", "rsvp.session.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SESSION_PORT], + {&rsvp_filter[RSVPF_SESSION_PORT], { "Port number", "rsvp.session.port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SESSION_PROTO], + {&rsvp_filter[RSVPF_SESSION_PROTO], { "Protocol", "rsvp.session.proto", FT_UINT8, BASE_DEC, VALS(proto_vals), 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SESSION_TUNNEL_ID], + {&rsvp_filter[RSVPF_SESSION_TUNNEL_ID], { "Tunnel ID", "rsvp.session.tunnel_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], + {&rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], { "Extended tunnel ID", "rsvp.session.ext_tunnel_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, /* Sender template/Filterspec fields */ - {&rsvp_filter[RSVPF_SENDER_IP], + {&rsvp_filter[RSVPF_SENDER_IP], { "Sender IPv4 address", "rsvp.sender.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SENDER_PORT], + {&rsvp_filter[RSVPF_SENDER_PORT], { "Sender port number", "rsvp.sender.port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, - {&rsvp_filter[RSVPF_SENDER_LSP_ID], + {&rsvp_filter[RSVPF_SENDER_LSP_ID], { "Sender LSP ID", "rsvp.sender.lsp_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }} }; @@ -874,7 +874,7 @@ static inline int rsvp_class_to_filter_num(int classnum) case RSVP_CLASS_RECORD_ROUTE : case RSVP_CLASS_MESSAGE_ID : case RSVP_CLASS_MESSAGE_ID_ACK : - case RSVP_CLASS_MESSAGE_ID_LIST : + case RSVP_CLASS_MESSAGE_ID_LIST : return classnum + RSVPF_OBJECT; break; @@ -902,7 +902,7 @@ static inline int rsvp_class_to_filter_num(int classnum) return RSVPF_DCLASS; case RSVP_CLASS_LSP_TUNNEL_IF_ID : return RSVPF_LSP_TUNNEL_IF_ID; - + default: return RSVPF_UNKNOWN_OBJ; } @@ -949,20 +949,20 @@ static char *summary_session (tvbuff_t *tvb, int offset) switch(tvb_get_guint8(tvb, offset+3)) { case RSVP_SESSION_TYPE_IPV4: - snprintf(buf, 80, "SESSION: IPv4, Destination %s, Protocol %d, Port %d. ", - ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), + snprintf(buf, 80, "SESSION: IPv4, Destination %s, Protocol %d, Port %d. ", + ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), tvb_get_guint8(tvb, offset+8), tvb_get_ntohs(tvb, offset+10)); break; case RSVP_SESSION_TYPE_IPV4_LSP: - snprintf(buf, 80, "SESSION: IPv4-LSP, Destination %s, Tunnel ID %d, Ext ID %0x. ", - ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), + snprintf(buf, 80, "SESSION: IPv4-LSP, Destination %s, Tunnel ID %d, Ext ID %0x. ", + ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), tvb_get_ntohs(tvb, offset+10), tvb_get_ntohl(tvb, offset+12)); break; case RSVP_SESSION_TYPE_IPV4_UNI: - snprintf(buf, 80, "SESSION: IPv4-UNI, Destination %s, Tunnel ID %d, Ext Address %s. ", - ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), + snprintf(buf, 80, "SESSION: IPv4-UNI, Destination %s, Tunnel ID %d, Ext Address %s. ", + ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), tvb_get_ntohs(tvb, offset+10), ip_to_str(tvb_get_ptr(tvb, offset+12, 4))); break; @@ -986,12 +986,12 @@ static char *summary_template (tvbuff_t *tvb, int offset) switch(tvb_get_guint8(tvb, offset+3)) { case 1: snprintf(buf, 80, "%s: IPv4, Sender %s, Port %d. ", objtype, - ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), + ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), tvb_get_ntohs(tvb, offset+10)); break; case 7: snprintf(buf, 80, "%s: IPv4-LSP, Tunnel Source: %s, LSP ID: %d. ", objtype, - ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), + ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), tvb_get_ntohs(tvb, offset+10)); break; default: @@ -1004,10 +1004,10 @@ static char *summary_template (tvbuff_t *tvb, int offset) /*------------------------------------------------------------------------------ * SESSION *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1016,11 +1016,11 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_session); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, summary_session(tvb, offset)); - + switch(type) { case RSVP_SESSION_TYPE_IPV4: proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, @@ -1028,23 +1028,23 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SESSION_IP], tvb, offset2, 4, FALSE); - + proto_tree_add_item(rsvp_object_tree, - rsvp_filter[RSVPF_SESSION_PROTO], tvb, + rsvp_filter[RSVPF_SESSION_PROTO], tvb, offset2+4, 1, FALSE); proto_tree_add_text(rsvp_object_tree, tvb, offset2+5, 1, "Flags: %x", tvb_get_guint8(tvb, offset2+5)); proto_tree_add_item(rsvp_object_tree, - rsvp_filter[RSVPF_SESSION_PORT], tvb, + rsvp_filter[RSVPF_SESSION_PORT], tvb, offset2+6, 2, FALSE); break; - + case RSVP_SESSION_TYPE_IPV6: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, - "Destination address: %s", + "Destination address: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, 1, "Protocol: %u", @@ -1053,22 +1053,22 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, "Flags: %x", tvb_get_guint8(tvb, offset2+17)); proto_tree_add_text(rsvp_object_tree, tvb, offset2+18, 2, - "Destination port: %u", + "Destination port: %u", tvb_get_ntohs(tvb, offset2+18)); break; - - case RSVP_SESSION_TYPE_IPV4_LSP: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + + case RSVP_SESSION_TYPE_IPV4_LSP: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 7 - IPv4 LSP"); proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SESSION_IP], tvb, offset2, 4, FALSE); - + proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SESSION_TUNNEL_ID], tvb, offset2+6, 2, FALSE); - - proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, + + proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, "Extended Tunnel ID: %u (%s)", tvb_get_ntohl(tvb, offset2+8), ip_to_str(tvb_get_ptr(tvb, offset2+8, 4))); @@ -1077,8 +1077,8 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, tvb, offset2+8, 4, FALSE); break; - case RSVP_SESSION_TYPE_IPV4_UNI: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case RSVP_SESSION_TYPE_IPV4_UNI: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 9 - IPv4 UNI"); proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SESSION_IP], @@ -1088,7 +1088,7 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, rsvp_filter[RSVPF_SESSION_TUNNEL_ID], tvb, offset2+6, 2, FALSE); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, "Extended IPv4 Address: %s", ip_to_str(tvb_get_ptr(tvb, offset2+8, 4))); proto_tree_add_item_hidden(rsvp_object_tree, @@ -1096,8 +1096,8 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, tvb, offset2+8, 4, FALSE); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length-4, @@ -1108,10 +1108,10 @@ dissect_rsvp_session (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * HOP *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1122,75 +1122,75 @@ dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, - "Neighbor address: %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + "Neighbor address: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 4, - "Logical interface: %u", + "Logical interface: %u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_set_text(ti, "HOP: IPv4, %s", + proto_item_set_text(ti, "HOP: IPv4, %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); break; case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, - "Neighbor address: %s", + "Neighbor address: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, 4, - "Logical interface: 0x%08x", + "Logical interface: 0x%08x", tvb_get_ntohl(tvb, offset2+16)); break; - + case 3: { guint16 tlv_off; guint16 tlv_type; guint16 tlv_len; char *ifindex_name; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 3 - IPv4 Out-Of-Band"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, - "Neighbor address: %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + "Neighbor address: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 4, - "Logical interface: %u", + "Logical interface: %u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_set_text(ti, "HOP: Out-of-band. Control IPv4: %s. ", + proto_item_set_text(ti, "HOP: Out-of-band. Control IPv4: %s. ", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); for (tlv_off = 0; tlv_off < obj_length - 12; ) { tlv_type = tvb_get_ntohs(tvb, offset2+8+tlv_off); tlv_len = tvb_get_ntohs(tvb, offset2+8+tlv_off+2); switch(tlv_type) { - case 1: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + case 1: + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8+tlv_off, 8, "IPv4 TLV - %s", ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4))); - rsvp_hop_subtree = - proto_item_add_subtree(ti2, ett_rsvp_hop_subobj); + rsvp_hop_subtree = + proto_item_add_subtree(ti2, ett_rsvp_hop_subobj); proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off, 2, "Type: 1 (IPv4)"); proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+2, 2, "Length: %u", tvb_get_ntohs(tvb, offset2+8+tlv_off+2)); - proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+4, 4, - "IPv4 address: %s", + proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+4, 4, + "IPv4 address: %s", ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4))); - proto_item_append_text(ti, "Data IPv4: %s. ", + proto_item_append_text(ti, "Data IPv4: %s. ", ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4))); break; - case 3: + case 3: ifindex_name = ""; goto hop_ifindex; case 4: @@ -1199,33 +1199,33 @@ dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, case 5: ifindex_name = " Reverse"; hop_ifindex: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8+tlv_off, 12, "Interface-Index%s TLV - %s, %d", ifindex_name, ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4)), tvb_get_ntohl(tvb, offset2+8+tlv_off+8)); - rsvp_hop_subtree = - proto_item_add_subtree(ti2, ett_rsvp_hop_subobj); + rsvp_hop_subtree = + proto_item_add_subtree(ti2, ett_rsvp_hop_subobj); proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off, 2, "Type: %d (Interface Index%s)", tlv_type, ifindex_name); proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+2, 2, "Length: %u", tvb_get_ntohs(tvb, offset2+8+tlv_off+2)); - proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+4, 4, - "IPv4 address: %s", + proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+4, 4, + "IPv4 address: %s", ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4))); - proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+8, 4, - "Interface-ID: %d", + proto_tree_add_text(rsvp_hop_subtree, tvb, offset2+8+tlv_off+8, 4, + "Interface-ID: %d", tvb_get_ntohl(tvb, offset2+8+tlv_off+8)); - proto_item_append_text(ti, "Data If-Index%s: %s, %d. ", ifindex_name, - ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4)), + proto_item_append_text(ti, "Data If-Index%s: %s, %d. ", ifindex_name, + ip_to_str(tvb_get_ptr(tvb, offset2+8+tlv_off+4, 4)), tvb_get_ntohl(tvb, offset2+8+tlv_off+8)); break; default: proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 4, - "Logical interface: %u", + "Logical interface: %u", tvb_get_ntohl(tvb, offset2+4)); } tlv_off += tlv_len; @@ -1234,7 +1234,7 @@ dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, } default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1245,10 +1245,10 @@ dissect_rsvp_hop (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * TIME VALUES *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_time_values (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_time_values (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1257,23 +1257,23 @@ dissect_rsvp_time_values (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_time_values); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, "Refresh interval: %u ms (%u seconds)", tvb_get_ntohl(tvb, offset2), tvb_get_ntohl(tvb, offset2)/1000); - proto_item_set_text(ti, "TIME VALUES: %d ms", + proto_item_set_text(ti, "TIME VALUES: %d ms", tvb_get_ntohl(tvb, offset2)); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1283,12 +1283,12 @@ dissect_rsvp_time_values (proto_tree *ti, tvbuff_t *tvb, } /*------------------------------------------------------------------------------ - * ERROR + * ERROR *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1297,16 +1297,16 @@ dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_error); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: { guint8 error_code; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, "Error node: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 1, @@ -1319,7 +1319,7 @@ dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_object_tree, tvb, offset2+6, 2, "Error value: %u", tvb_get_ntohs(tvb, offset2+6)); - proto_item_set_text(ti, "ERROR: IPv4, Error code: %s, Value: %d, Error Node: %s", + proto_item_set_text(ti, "ERROR: IPv4, Error code: %s, Value: %d, Error Node: %s", val_to_str(error_code, rsvp_error_vals, "Unknown (%d)"), tvb_get_ntohs(tvb, offset2+6), ip_to_str(tvb_get_ptr(tvb, offset2, 4))); @@ -1329,7 +1329,7 @@ dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, case 2: { guint8 error_code; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, "Error node: %s", @@ -1346,9 +1346,9 @@ dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, tvb_get_ntohs(tvb, offset2+18)); break; } - + default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1359,10 +1359,10 @@ dissect_rsvp_error (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * SCOPE *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1372,16 +1372,16 @@ dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_scope); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); mylen = obj_length - 4; switch(type) { case 1: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); while (mylen > 0) { - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, "IPv4 Address: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); offset2 += 4; @@ -1391,10 +1391,10 @@ dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, } case 2: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); while (mylen > 0) { - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, "IPv6 Address: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); offset2 += 16; @@ -1402,9 +1402,9 @@ dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, } break; } - - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -1415,10 +1415,10 @@ dissect_rsvp_scope (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * STYLE *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_style (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_style (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1427,14 +1427,14 @@ dissect_rsvp_style (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_style); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: { guint32 style; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, "Flags: 0x%02x", @@ -1443,14 +1443,14 @@ dissect_rsvp_style (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 3, "Style: 0x%06X - %s", style, val_to_str(style, style_vals, "Unknown")); - proto_item_set_text(ti, "STYLE: %s (%d)", + proto_item_set_text(ti, "STYLE: %s (%d)", val_to_str(style, style_vals, "Unknown"), style); break; } - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1462,10 +1462,10 @@ dissect_rsvp_style (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * CONFIRM *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_confirm (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_confirm (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1474,32 +1474,32 @@ dissect_rsvp_confirm (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_confirm); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, - "Receiver address: %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + "Receiver address: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); - proto_item_set_text(ti, "CONFIRM: Receiver %s", + proto_item_set_text(ti, "CONFIRM: Receiver %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); break; } case 2: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, - "Receiver address: %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, + "Receiver address: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); break; } default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1510,10 +1510,10 @@ dissect_rsvp_confirm (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * SENDER TEMPLATE and FILTERSPEC *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1524,8 +1524,8 @@ dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_sender_template); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); break; @@ -1534,16 +1534,16 @@ dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_filter_spec); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); break; } proto_item_set_text(ti, summary_template(tvb, offset)); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SENDER_IP], @@ -1553,19 +1553,19 @@ dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, tvb, offset2+6, 2, FALSE); break; - case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 2: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 - IPv6"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, - "Source address: %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 16, + "Source address: %s", ip6_to_str((struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+18, 2, "Source port: %u", tvb_get_ntohs(tvb, offset2+18)); break; - - case 7: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + + case 7: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 7 - IPv4 LSP"); proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_SENDER_IP], @@ -1575,8 +1575,8 @@ dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, tvb, offset2+6, 2, FALSE); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -1587,10 +1587,10 @@ dissect_rsvp_template_filter (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * SENDER TSPEC *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1602,63 +1602,63 @@ dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_sender_tspec); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); mylen = obj_length - 4; switch(type) { - case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 2: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - Integrated Services"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Message format version: %u", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + "Message format version: %u", tvb_get_guint8(tvb, offset2)>>4); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, - "Data length: %u words, not including header", + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + "Data length: %u words, not including header", tvb_get_ntohs(tvb, offset2+2)); - + mylen -= 4; offset2 += 4; - + proto_item_set_text(ti, "SENDER TSPEC: IntServ: "); - + while (mylen > 0) { guint8 service_num; guint8 param_id; guint16 param_len; guint16 param_len_processed; guint16 length; - + service_num = tvb_get_guint8(tvb, offset2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Service header: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + "Service header: %u - %s", service_num, val_to_str(service_num, qos_vals, "Unknown")); length = tvb_get_ntohs(tvb, offset2+2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, - "Length of service %u data: %u words, " - "not including header", + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + "Length of service %u data: %u words, " + "not including header", service_num, length); - + mylen -= 4; offset2 += 4; - + /* Process all known service headers as a set of parameters */ param_len_processed = 0; while (param_len_processed < length) { param_id = tvb_get_guint8(tvb, offset2); param_len = tvb_get_ntohs(tvb, offset2+2) + 1; switch(param_id) { - case 127: + case 127: /* Token Bucket */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Token Bucket TSpec: "); tspec_tree = proto_item_add_subtree(ti2, ett_rsvp_sender_tspec_subtree); - proto_tree_add_text(tspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + proto_tree_add_text(tspec_tree, tvb, offset2, 1, + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, @@ -1666,28 +1666,28 @@ dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(tspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); proto_tree_add_text(tspec_tree, tvb, offset2+4, 4, - "Token bucket rate: %.10g", + "Token bucket rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+4)); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - "Token bucket size: %.10g", + "Token bucket size: %.10g", tvb_get_ntohieee_float(tvb, offset2+8)); proto_tree_add_text(tspec_tree, tvb, offset2+12, 4, - "Peak data rate: %.10g", + "Peak data rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+12)); proto_tree_add_text(tspec_tree, tvb, offset2+16, 4, - "Minimum policed unit [m]: %u", + "Minimum policed unit [m]: %u", tvb_get_ntohl(tvb, offset2+16)); proto_tree_add_text(tspec_tree, tvb, offset2+20, 4, - "Maximum packet size [M]: %u", + "Maximum packet size [M]: %u", tvb_get_ntohl(tvb, offset2+20)); - proto_item_append_text(ti, "Token Bucket, %.10g bytes/sec. ", + proto_item_append_text(ti, "Token Bucket, %.10g bytes/sec. ", tvb_get_ntohieee_float(tvb, offset2+4)); - proto_item_append_text(ti2, "Rate=%.10g Burst=%.10g Peak=%.10g m=%u M=%u", + proto_item_append_text(ti2, "Rate=%.10g Burst=%.10g Peak=%.10g m=%u M=%u", tvb_get_ntohieee_float(tvb, offset2+4), tvb_get_ntohieee_float(tvb, offset2+8), tvb_get_ntohieee_float(tvb, offset2+12), @@ -1698,69 +1698,69 @@ dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, case 128: /* Null Service (RFC2997) */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Null Service TSpec: "); tspec_tree = proto_item_add_subtree(ti2, ett_rsvp_sender_tspec_subtree); - - proto_tree_add_text(tspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + + proto_tree_add_text(tspec_tree, tvb, offset2, 1, + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, - "Parameter %u flags: %x", + "Parameter %u flags: %x", param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(tspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); proto_tree_add_text(tspec_tree, tvb, offset2+4, 4, - "Maximum packet size [M]: %u", + "Maximum packet size [M]: %u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_append_text(ti, "Null Service. M=%u", + proto_item_append_text(ti, "Null Service. M=%u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_append_text(ti2, "Max pkt size=%u", + proto_item_append_text(ti2, "Max pkt size=%u", tvb_get_ntohl(tvb, offset2+4)); break; case 126: /* Compression hint (RFC3006) */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Compression Hint: "); tspec_tree = proto_item_add_subtree(ti2, ett_rsvp_sender_tspec_subtree); - - proto_tree_add_text(tspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + + proto_tree_add_text(tspec_tree, tvb, offset2, 1, + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, - "Parameter %u flags: %x", + "Parameter %u flags: %x", param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(tspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); proto_tree_add_text(tspec_tree, tvb, offset2+4, 4, - "Hint: %u", + "Hint: %u", tvb_get_ntohl(tvb, offset2+4)); proto_tree_add_text(tspec_tree, tvb, offset2+4, 4, - "Compression Factor: %u", + "Compression Factor: %u", tvb_get_ntohl(tvb, offset2+8)); - proto_item_append_text(ti, "Compression Hint. Hint=%u, Factor=%u", + proto_item_append_text(ti, "Compression Hint. Hint=%u, Factor=%u", tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8)); - proto_item_append_text(ti2, "Hint=%u, Factor=%u", + proto_item_append_text(ti2, "Hint=%u, Factor=%u", tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8)); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset2, param_len*4, - "Unknown parameter %d, %d words", + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset2, param_len*4, + "Unknown parameter %d, %d words", param_id, param_len); break; } @@ -1773,118 +1773,118 @@ dissect_rsvp_tspec (proto_tree *ti, tvbuff_t *tvb, case 4: /* SONET/SDH Tspec */ proto_item_set_text(ti, "SENDER TSPEC: SONET/SDH: "); - - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 4 - SONET/SDH"); signal_type = tvb_get_guint8(tvb, offset2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, "Signal Type: %d - %s", signal_type, - val_to_str(signal_type, + val_to_str(signal_type, gmpls_sonet_signal_type_str, "Unknown")); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1, "Requested Concatenation (RCC): %d", tvb_get_guint8(tvb, offset2+1)); tspec_tree = proto_item_add_subtree(ti2, ett_rsvp_sender_tspec_subtree); proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8, - "Standard contiguous concatenation", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8, + "Standard contiguous concatenation", "No standard contiguous concatenation")); proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8, - "Arbitrary contiguous concatenation", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8, + "Arbitrary contiguous concatenation", "No arbitrary contiguous concatenation")); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, "Number of Contiguous Components (NCC): %d", tvb_get_ntohs(tvb, offset2+2)); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 2, "Number of Virtual Components (NVC): %d", tvb_get_ntohs(tvb, offset2+4)); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+6, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+6, 2, "Multiplier (MT): %d", tvb_get_ntohs(tvb, offset2+6)); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, "Transparency (T): 0x%0x", tvb_get_ntohl(tvb, offset2+8)); tspec_tree = proto_item_add_subtree(ti2, ett_rsvp_sender_tspec_subtree); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32, - "Section/Regenerator Section layer transparency", + decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32, + "Section/Regenerator Section layer transparency", "No Section/Regenerator Section layer transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32, - "Line/Multiplex Section layer transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32, + "Line/Multiplex Section layer transparency", "No Line/Multiplex Section layer transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32, - "J0 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32, + "J0 transparency", "No J0 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32, - "SOH/RSOH DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32, + "SOH/RSOH DCC transparency", "No SOH/RSOH DCC transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32, - "LOH/MSOH DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32, + "LOH/MSOH DCC transparency", "No LOH/MSOH DCC transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32, - "LOH/MSOH Extended DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32, + "LOH/MSOH Extended DCC transparency", "No LOH/MSOH Extended DCC transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32, - "K1/K2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32, + "K1/K2 transparency", "No K1/K2 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32, - "E1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32, + "E1 transparency", "No E1 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32, - "F1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32, + "F1 transparency", "No F1 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32, - "E2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32, + "E2 transparency", "No E2 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32, - "B1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32, + "B1 transparency", "No B1 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32, - "B2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32, + "B2 transparency", "No B2 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32, - "M0 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32, + "M0 transparency", "No M0 transparency")); proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32, - "M1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32, + "M1 transparency", "No M1 transparency")); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+12, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+12, 4, "Profile (P): %d", tvb_get_ntohl(tvb, offset2+12)); - proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", + proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", val_to_str(signal_type, gmpls_sonet_signal_type_str, "Unknown"), tvb_get_guint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), tvb_get_ntohs(tvb, offset2+4), tvb_get_ntohs(tvb, offset2+6), tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12)); break; - + default: /* Unknown TSpec */ - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, "Data (%d bytes)", obj_length - 4); break; - + } } /*------------------------------------------------------------------------------ * FLOWSPEC *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -1895,21 +1895,21 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_flowspec); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: %u", type); mylen = obj_length - 4; switch(type) { case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Message format version: %u", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + "Message format version: %u", tvb_get_guint8(tvb, offset2)>>4); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, - "Data length: %u words, not including header", + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + "Data length: %u words, not including header", tvb_get_ntohs(tvb, offset2+2)); proto_item_set_text(ti, "FLOWSPEC: "); @@ -1924,22 +1924,22 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, guint16 param_len_processed; service_num = tvb_get_guint8(tvb, offset2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Service header: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + "Service header: %u - %s", service_num, val_to_str(service_num, intsrv_services_str, "Unknown")); length = tvb_get_ntohs(tvb, offset2+2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, - "Length of service %u data: %u words, " - "not including header", + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + "Length of service %u data: %u words, " + "not including header", service_num, length); mylen -= 4; offset2 += 4; - proto_item_append_text(ti, "%s: ", - val_to_str(service_num, intsrv_services_str, + proto_item_append_text(ti, "%s: ", + val_to_str(service_num, intsrv_services_str, "Unknown (%d)")); /* Process all known service headers as a set of parameters */ @@ -1948,15 +1948,15 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, param_id = tvb_get_guint8(tvb, offset2); param_len = tvb_get_ntohs(tvb, offset2+2) + 1; switch(param_id) { - case 127: + case 127: /* Token Bucket */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Token Bucket: "); flowspec_tree = proto_item_add_subtree(ti2, ett_rsvp_flowspec_subtree); - proto_tree_add_text(flowspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + proto_tree_add_text(flowspec_tree, tvb, offset2, 1, + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, @@ -1964,28 +1964,28 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(flowspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); proto_tree_add_text(flowspec_tree, tvb, offset2+4, 4, - "Token bucket rate: %.10g", + "Token bucket rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+4)); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - "Token bucket size: %.10g", + "Token bucket size: %.10g", tvb_get_ntohieee_float(tvb, offset2+8)); proto_tree_add_text(flowspec_tree, tvb, offset2+12, 4, - "Peak data rate: %.10g", + "Peak data rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+12)); proto_tree_add_text(flowspec_tree, tvb, offset2+16, 4, - "Minimum policed unit [m]: %u", + "Minimum policed unit [m]: %u", tvb_get_ntohl(tvb, offset2+16)); proto_tree_add_text(flowspec_tree, tvb, offset2+20, 4, - "Maximum packet size [M]: %u", + "Maximum packet size [M]: %u", tvb_get_ntohl(tvb, offset2+20)); - proto_item_append_text(ti, "Token Bucket, %.10g bytes/sec. ", + proto_item_append_text(ti, "Token Bucket, %.10g bytes/sec. ", tvb_get_ntohieee_float(tvb, offset2+4)); - proto_item_append_text(ti2, "Rate=%.10g Burst=%.10g Peak=%.10g m=%u M=%u", + proto_item_append_text(ti2, "Rate=%.10g Burst=%.10g Peak=%.10g m=%u M=%u", tvb_get_ntohieee_float(tvb, offset2+4), tvb_get_ntohieee_float(tvb, offset2+8), tvb_get_ntohieee_float(tvb, offset2+12), @@ -1996,32 +1996,32 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, case 130: /* Guaranteed-rate RSpec */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Guaranteed-Rate RSpec: "); flowspec_tree = proto_item_add_subtree(ti2, ett_rsvp_flowspec_subtree); proto_tree_add_text(flowspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); - proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, - "Parameter %u flags: %x", + proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, + "Parameter %u flags: %x", param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(flowspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); - + proto_tree_add_text(flowspec_tree, tvb, offset2+4, 4, - "Rate: %.10g", + "Rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+4)); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - "Slack term: %u", + "Slack term: %u", tvb_get_ntohl(tvb, offset2+8)); - proto_item_append_text(ti, "RSpec, %.10g bytes/sec. ", + proto_item_append_text(ti, "RSpec, %.10g bytes/sec. ", tvb_get_ntohieee_float(tvb, offset2+4)); - proto_item_append_text(ti2, "R=%.10g, s=%u", + proto_item_append_text(ti2, "R=%.10g, s=%u", tvb_get_ntohieee_float(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8)); break; @@ -2029,35 +2029,35 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, case 128: /* Null Service (RFC2997) */ ti2 = proto_tree_add_text(rsvp_object_tree, tvb, - offset2, param_len*4, + offset2, param_len*4, "Null Service Flowspec: "); flowspec_tree = proto_item_add_subtree(ti2, ett_rsvp_flowspec_subtree); - - proto_tree_add_text(flowspec_tree, tvb, offset2, 1, - "Parameter %u - %s", + + proto_tree_add_text(flowspec_tree, tvb, offset2, 1, + "Parameter %u - %s", param_id, val_to_str(param_id, svc_vals, "Unknown")); proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, - "Parameter %u flags: %x", + "Parameter %u flags: %x", param_id, tvb_get_guint8(tvb, offset2+1)); proto_tree_add_text(flowspec_tree, tvb, offset2+2, 2, - "Parameter %u data length: %u words, " + "Parameter %u data length: %u words, " "not including header", param_id, tvb_get_ntohs(tvb, offset2+2)); proto_tree_add_text(flowspec_tree, tvb, offset2+4, 4, - "Maximum packet size [M]: %u", + "Maximum packet size [M]: %u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_append_text(ti, "Null Service. M=%u", + proto_item_append_text(ti, "Null Service. M=%u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_append_text(ti2, "Max pkt size=%u", + proto_item_append_text(ti2, "Max pkt size=%u", tvb_get_ntohl(tvb, offset2+4)); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset2, param_len*4, - "Unknown parameter %d, %d words", + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset2, param_len*4, + "Unknown parameter %d, %d words", param_id, param_len); break; } @@ -2072,100 +2072,100 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, case 4: proto_item_set_text(ti, "FLOWSPEC: SONET/SDH: "); - - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 4 - SONET/SDH"); signal_type = tvb_get_guint8(tvb, offset2); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Signal Type: %d - %s", signal_type, - val_to_str(signal_type, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + "Signal Type: %d - %s", signal_type, + val_to_str(signal_type, gmpls_sonet_signal_type_str, "Unknown")); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1, "Requested Concatenation (RCC): %d", tvb_get_guint8(tvb, offset2+1)); flowspec_tree = proto_item_add_subtree(ti2, ett_rsvp_flowspec_subtree); proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8, - "Standard contiguous concatenation", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8, + "Standard contiguous concatenation", "No standard contiguous concatenation")); proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8, - "Arbitrary contiguous concatenation", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8, + "Arbitrary contiguous concatenation", "No arbitrary contiguous concatenation")); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, "Number of Contiguous Components (NCC): %d", tvb_get_ntohs(tvb, offset2+2)); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 2, "Number of Virtual Components (NVC): %d", tvb_get_ntohs(tvb, offset2+4)); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+6, 2, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+6, 2, "Multiplier (MT): %d", tvb_get_ntohs(tvb, offset2+6)); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4, "Transparency (T): 0x%0x", tvb_get_ntohl(tvb, offset2+8)); flowspec_tree = proto_item_add_subtree(ti2, ett_rsvp_flowspec_subtree); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32, - "Section/Regenerator Section layer transparency", + decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32, + "Section/Regenerator Section layer transparency", "No Section/Regenerator Section layer transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32, - "Line/Multiplex Section layer transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32, + "Line/Multiplex Section layer transparency", "No Line/Multiplex Section layer transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32, - "J0 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32, + "J0 transparency", "No J0 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32, - "SOH/RSOH DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32, + "SOH/RSOH DCC transparency", "No SOH/RSOH DCC transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32, - "LOH/MSOH DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32, + "LOH/MSOH DCC transparency", "No LOH/MSOH DCC transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32, - "LOH/MSOH Extended DCC transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32, + "LOH/MSOH Extended DCC transparency", "No LOH/MSOH Extended DCC transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32, - "K1/K2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32, + "K1/K2 transparency", "No K1/K2 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32, - "E1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32, + "E1 transparency", "No E1 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32, - "F1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32, + "F1 transparency", "No F1 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32, - "E2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32, + "E2 transparency", "No E2 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32, - "B1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32, + "B1 transparency", "No B1 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32, - "B2 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32, + "B2 transparency", "No B2 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32, - "M0 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32, + "M0 transparency", "No M0 transparency")); proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, - decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32, - "M1 transparency", + decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32, + "M1 transparency", "No M1 transparency")); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+12, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+12, 4, "Profile (P): %d", tvb_get_ntohl(tvb, offset2+12)); - proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", + proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", val_to_str(signal_type, gmpls_sonet_signal_type_str, "Unknown"), tvb_get_guint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), tvb_get_ntohs(tvb, offset2+4), tvb_get_ntohs(tvb, offset2+6), tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12)); break; - + default: break; } @@ -2176,32 +2176,32 @@ dissect_rsvp_flowspec (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * ADSPEC *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; proto_tree *rsvp_object_tree; int mylen, i; - proto_tree *adspec_tree; + proto_tree *adspec_tree; rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_adspec); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: %u", type); mylen = obj_length - 4; proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, - "Message format version: %u", + "Message format version: %u", tvb_get_guint8(tvb, offset2)>>4); proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, - "Data length: %u words, not including header", + "Data length: %u words, not including header", tvb_get_ntohs(tvb, offset2+2)); mylen -= 4; offset2 += 4; @@ -2215,7 +2215,7 @@ dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, str = val_to_str(service_num, intsrv_services_str, "Unknown"); break_bit = tvb_get_guint8(tvb, offset2+1); length = tvb_get_ntohs(tvb, offset2+2); - ti = proto_tree_add_text(rsvp_object_tree, tvb, offset2, + ti = proto_tree_add_text(rsvp_object_tree, tvb, offset2, (length+1)*4, str); adspec_tree = proto_item_add_subtree(ti, @@ -2226,8 +2226,8 @@ dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(adspec_tree, tvb, offset2+1, 1, (break_bit&0x80)? "Break bit set":"Break bit not set"); - proto_tree_add_text(adspec_tree, tvb, offset2+2, 2, - "Data length: %u words, not including header", + proto_tree_add_text(adspec_tree, tvb, offset2+2, 2, + "Data length: %u words, not including header", length); mylen -= 4; offset2 += 4; @@ -2256,7 +2256,7 @@ dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, tvb_get_ntohl(tvb, offset2+4), id, phdr_length); break; - + case 6: /* IEEE float */ proto_tree_add_text(adspec_tree, tvb, offset2, @@ -2266,15 +2266,15 @@ dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, tvb_get_ntohieee_float(tvb, offset2+4), id, phdr_length); break; - default: - proto_tree_add_text(adspec_tree, tvb, offset2, + default: + proto_tree_add_text(adspec_tree, tvb, offset2, (phdr_length+1)<<2, "%s (type %u, length %u)", str, id, phdr_length); } } else { - proto_tree_add_text(adspec_tree, tvb, offset2, + proto_tree_add_text(adspec_tree, tvb, offset2, (phdr_length+1)<<2, "Unknown (type %u, length %u)", id, phdr_length); @@ -2289,10 +2289,10 @@ dissect_rsvp_adspec (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * INTEGRITY *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_integrity (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_integrity (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2304,35 +2304,35 @@ dissect_rsvp_integrity (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_integrity); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: %u", type); flags = tvb_get_guint8(tvb, offset2); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, "Flags: 0x%02x", flags); rsvp_integ_flags_tree = proto_item_add_subtree(ti2, ett_rsvp_integrity_flags); proto_tree_add_text(rsvp_integ_flags_tree, tvb, offset2, 1, decode_boolean_bitfield(flags, 0x01, 8, "Handshake capable", "Handshake not capable")); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 6, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 6, "Key Identifier: %s", tvb_bytes_to_str(tvb, offset2+2, 6)); sequence_number = tvb_get_ntohl(tvb, offset2+8); sequence_number <<= 32; sequence_number = tvb_get_ntohl(tvb, offset2+12); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 8, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 8, "Sequence Number: %llu", sequence_number); - proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, obj_length - 20, + proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, obj_length - 20, "Hash: %s", tvb_bytes_to_str(tvb, offset2+16, obj_length - 20)); } /*------------------------------------------------------------------------------ * POLICY *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_policy (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_policy (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2341,10 +2341,10 @@ dissect_rsvp_policy (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_policy); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: %u", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, "Data (%d bytes)", obj_length - 4); @@ -2353,10 +2353,10 @@ dissect_rsvp_policy (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * LABEL_REQUEST *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_label_request (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_label_request (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2365,13 +2365,13 @@ dissect_rsvp_label_request (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_label_request); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 1: { unsigned short l3pid = tvb_get_ntohs(tvb, offset2+2); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, "L3PID: %s (0x%04x)", @@ -2386,34 +2386,34 @@ dissect_rsvp_label_request (proto_tree *ti, tvbuff_t *tvb, case 4: { unsigned short l3pid = tvb_get_ntohs(tvb, offset2+2); unsigned char lsp_enc = tvb_get_guint8(tvb,offset2); - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 4 (Generalized Label Request)"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, "LSP Encoding Type: %s", val_to_str(lsp_enc, gmpls_lsp_enc_str, "Unknown (%d)")); proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1, "Switching Type: %s", - val_to_str(tvb_get_guint8(tvb,offset2+1), + val_to_str(tvb_get_guint8(tvb,offset2+1), gmpls_switching_type_str, "Unknown (%d)")); proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2, "G-PID: %s (0x%0x)", - val_to_str(l3pid, gmpls_gpid_str, - val_to_str(l3pid, etype_vals, + val_to_str(l3pid, gmpls_gpid_str, + val_to_str(l3pid, etype_vals, "Unknown G-PID(0x%04x)")), l3pid); proto_item_set_text(ti, "LABEL REQUEST: Generalized: LSP Encoding=%s, " "Switching Type=%s, G-PID=%s ", val_to_str(lsp_enc, gmpls_lsp_enc_str, "Unknown (%d)"), - val_to_str(tvb_get_guint8(tvb,offset2+1), + val_to_str(tvb_get_guint8(tvb,offset2+1), gmpls_switching_type_str, "Unknown (%d)"), - val_to_str(l3pid, gmpls_gpid_str, - val_to_str(l3pid, etype_vals, + val_to_str(l3pid, gmpls_gpid_str, + val_to_str(l3pid, etype_vals, "Unknown (0x%04x)"))); break; } default: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -2426,10 +2426,10 @@ dissect_rsvp_label_request (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * LABEL *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_label (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_label (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2443,41 +2443,41 @@ dissect_rsvp_label (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_label); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); mylen = obj_length - 4; switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 (Packet Label)"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, - "Label: %u", + "Label: %u", tvb_get_ntohl(tvb, offset2)); proto_item_set_text(ti, "%s: %d", name, tvb_get_ntohl(tvb, offset2)); break; - case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 2: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2 (Generalized Label)"); proto_item_set_text(ti, "%s: Generalized: ", name); for (i = 0; i < mylen; i += 4) { proto_tree_add_text(rsvp_object_tree, tvb, offset2+i, 4, - "Generalized Label: %u", + "Generalized Label: %u", tvb_get_ntohl(tvb, offset2+i)); if (i < 16) { - proto_item_append_text(ti, "%d%s", + proto_item_append_text(ti, "%d%s", tvb_get_ntohl(tvb, offset2+i), i+4<mylen?", ":""); } else if (i == 16) { proto_item_append_text(ti, "..."); - } + } } break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -2489,10 +2489,10 @@ dissect_rsvp_label (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * SESSION ATTRIBUTE *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2504,13 +2504,13 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_session_attribute); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { case 7: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 7 - IPv4 LSP"); proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1, "Setup priority: %u", @@ -2521,7 +2521,7 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, flags = tvb_get_guint8(tvb, offset2+2); ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 1, "Flags: 0x%02x", flags); - rsvp_sa_flags_tree = proto_item_add_subtree(ti2, + rsvp_sa_flags_tree = proto_item_add_subtree(ti2, ett_rsvp_session_attribute_flags); proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, decode_boolean_bitfield(flags, 0x01, 8, @@ -2535,7 +2535,7 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, decode_boolean_bitfield(flags, 0x04, 8, "Ingress node may reroute", "Ingress node may not reroute")); - + name_len = tvb_get_guint8(tvb, offset2+3); proto_tree_add_text(rsvp_object_tree, tvb, offset2+3, 1, "Name length: %u", name_len); @@ -2545,7 +2545,7 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, tvb_get_ptr(tvb, offset2+4, name_len)); proto_item_set_text(ti, "SESSION ATTRIBUTE: SetupPrio %d, HoldPrio %d, %s%s%s [%s]", - tvb_get_guint8(tvb, offset2), + tvb_get_guint8(tvb, offset2), tvb_get_guint8(tvb, offset2+1), flags &0x01 ? "Local Protection, " : "", flags &0x02 ? "Merging, " : "", @@ -2553,8 +2553,8 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, name_len ? (char*)tvb_format_text(tvb, offset2+4, name_len) : ""); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -2566,10 +2566,10 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * EXPLICIT ROUTE OBJECT *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2580,13 +2580,13 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_explicit_route); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); mylen = obj_length - 4; switch(type) { case 1: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_item_set_text(ti, "EXPLICIT ROUTE: "); for (i=1, l = 0; l < mylen; i++) { @@ -2594,13 +2594,13 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, switch(j) { case 1: /* IPv4 */ k = tvb_get_guint8(tvb, offset2+l) & 0x80; - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "IPv4 Subobject - %s, %s", ip_to_str(tvb_get_ptr(tvb, offset2+l+2, 4)), k ? "Loose" : "Strict"); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, @@ -2611,11 +2611,11 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+2, 4, "IPv4 hop: %s", ip_to_str(tvb_get_ptr(tvb, offset2+l+2, 4))); - proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+6, 1, + proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+6, 1, "Prefix length: %u", tvb_get_guint8(tvb, offset2+l+6)); if (i < 4) { - proto_item_append_text(ti, "IPv4 %s%s", + proto_item_append_text(ti, "IPv4 %s%s", ip_to_str(tvb_get_ptr(tvb, offset2+l+2, 4)), k ? " [L]":""); } @@ -2623,11 +2623,11 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, break; case 2: /* IPv6 */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 20, "IPv6 Subobject"); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); k = tvb_get_guint8(tvb, offset2+l) & 0x80; proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); @@ -2650,13 +2650,13 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, case 3: /* Label */ k = tvb_get_guint8(tvb, offset2+l) & 0x80; - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "Label Subobject - %d, %s", - tvb_get_ntohl(tvb, offset2+l+4), + tvb_get_ntohl(tvb, offset2+l+4), k ? "Loose" : "Strict"); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, @@ -2665,7 +2665,7 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, "Length: %u", tvb_get_guint8(tvb, offset2+l+1)); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+2, 1, - "Flags: %0x", + "Flags: %0x", tvb_get_guint8(tvb, offset2+l+2)); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+3, 1, "C-Type: %u", @@ -2674,22 +2674,22 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, "Label: %d", tvb_get_ntohl(tvb, offset2+l+4)); if (i < 4) { - proto_item_append_text(ti, "Label %d%s", - tvb_get_ntohl(tvb, offset2+l+4), + proto_item_append_text(ti, "Label %d%s", + tvb_get_ntohl(tvb, offset2+l+4), k ? " [L]":""); } break; case 4: /* Unnumbered Interface-ID */ k = tvb_get_guint8(tvb, offset2+l) & 0x80; - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "Unnumbered Interface-ID - %s, %d, %s", ip_to_str(tvb_get_ptr(tvb, offset2+l+4, 4)), - tvb_get_ntohl(tvb, offset2+l+8), + tvb_get_ntohl(tvb, offset2+l+8), k ? "Loose" : "Strict"); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, @@ -2704,7 +2704,7 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, "Interface-ID: %d", tvb_get_ntohl(tvb, offset2+l+8)); if (i < 4) { - proto_item_append_text(ti, "Unnum %s/%d%s", + proto_item_append_text(ti, "Unnum %s/%d%s", ip_to_str(tvb_get_ptr(tvb, offset2+l+4, 4)), tvb_get_ntohl(tvb, offset2+l+8), k ? " [L]":""); @@ -2714,12 +2714,12 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, case 32: /* AS */ k = tvb_get_ntohs(tvb, offset2+l+2); - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 4, "Autonomous System %u", k); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, "Type: 32 (Autonomous System Number)"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+1, 1, @@ -2728,7 +2728,7 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l+2, 2, "Autonomous System %u", k); if (i < 4) { - proto_item_append_text(ti, "AS %d", + proto_item_append_text(ti, "AS %d", tvb_get_ntohs(tvb, offset2+l+2)); } @@ -2739,8 +2739,8 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 4, "LSP Path Termination"); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, @@ -2755,12 +2755,12 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, default: /* Unknown subobject */ k = tvb_get_guint8(tvb, offset2+l) & 0x80; - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_guint8(tvb, offset2+l+1), "Unknown subobject: %d", j); - rsvp_ero_subtree = - proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); + rsvp_ero_subtree = + proto_item_add_subtree(ti2, ett_rsvp_explicit_route_subobj); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, k ? "Loose Hop " : "Strict Hop"); proto_tree_add_text(rsvp_ero_subtree, tvb, offset2+l, 1, @@ -2782,7 +2782,7 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, break; } default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -2794,10 +2794,10 @@ dissect_rsvp_explicit_route (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * RECORD ROUTE OBJECT *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2808,25 +2808,25 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_record_route); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, "RECORD ROUTE: "); mylen = obj_length - 4; switch(type) { case 1: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); for (i=1, l = 0; l < mylen; i++) { j = tvb_get_guint8(tvb, offset2+l); switch(j) { case 1: /* IPv4 */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "IPv4 Subobject - %s", ip_to_str(tvb_get_ptr(tvb, offset2+l+2, 4))); - rsvp_rro_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_rro_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l, 1, "Type: 1 (IPv4)"); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+1, 1, @@ -2839,18 +2839,18 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, "Prefix length: %u", tvb_get_guint8(tvb, offset2+l+6)); if (i < 4) { - proto_item_append_text(ti, "IPv4 %s", + proto_item_append_text(ti, "IPv4 %s", ip_to_str(tvb_get_ptr(tvb, offset2+l+2, 4))); } break; case 2: /* IPv6 */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 20, "IPv6 Subobject"); - rsvp_rro_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_rro_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l, 1, "Type: 2 (IPv6)"); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+1, 1, @@ -2868,19 +2868,19 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, break; case 3: /* Label */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "Label Subobject - %d", tvb_get_ntohl(tvb, offset2+l+4)); - rsvp_rro_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_rro_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l, 1, "Type: 3 (Label)"); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+1, 1, "Length: %u", tvb_get_guint8(tvb, offset2+l+1)); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+2, 1, - "Flags: %0x", + "Flags: %0x", tvb_get_guint8(tvb, offset2+l+2)); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+3, 1, "C-Type: %u", @@ -2889,19 +2889,19 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, "Label: %d", tvb_get_ntohl(tvb, offset2+l+4)); if (i < 4) { - proto_item_append_text(ti, "Label %d", + proto_item_append_text(ti, "Label %d", tvb_get_ntohl(tvb, offset2+l+4)); } break; case 4: /* Unnumbered Interface-ID */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, "Unnumbered Interface-ID - %s, %d", ip_to_str(tvb_get_ptr(tvb, offset2+l+4, 4)), tvb_get_ntohl(tvb, offset2+l+8)); - rsvp_rro_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_rro_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l, 1, "Type: 4 (Unnumbered Interface-ID)"); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+1, 1, @@ -2917,20 +2917,20 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, "Interface-ID: %d", tvb_get_ntohl(tvb, offset2+l+8)); if (i < 4) { - proto_item_append_text(ti, "Unnum %s/%d", + proto_item_append_text(ti, "Unnum %s/%d", ip_to_str(tvb_get_ptr(tvb, offset2+l+4, 4)), tvb_get_ntohl(tvb, offset2+l+8)); } break; default: /* Unknown subobject */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_guint8(tvb, offset2+l+1), "Unknown subobject: %u", j); - rsvp_rro_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_rro_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l, 1, "Type: %u (Unknown)", j); proto_tree_add_text(rsvp_rro_subtree, tvb, offset2+l+1, 1, @@ -2949,9 +2949,9 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, } break; } - + default: { - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -2964,10 +2964,10 @@ dissect_rsvp_record_route (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * MESSAGE ID *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_message_id (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_message_id (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -2976,12 +2976,12 @@ dissect_rsvp_message_id (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_policy); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_tree_add_text(rsvp_object_tree, tvb, offset+4, 1, "Flags: %d", tvb_get_guint8(tvb, offset+4)); @@ -2989,13 +2989,13 @@ dissect_rsvp_message_id (proto_tree *ti, tvbuff_t *tvb, "Epoch: %d", tvb_get_ntoh24(tvb, offset+5)); proto_tree_add_text(rsvp_object_tree, tvb, offset+8, 4, "Message-ID: %d", tvb_get_ntohl(tvb, offset+8)); - proto_item_set_text(ti, "MESSAGE-ID: %d %s", - tvb_get_ntohl(tvb, offset+8), + proto_item_set_text(ti, "MESSAGE-ID: %d %s", + tvb_get_ntohl(tvb, offset+8), tvb_get_guint8(tvb, offset+4) & 1 ? "(Ack Desired)" : ""); break; default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -3007,10 +3007,10 @@ dissect_rsvp_message_id (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * MESSAGE ID ACK *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3019,12 +3019,12 @@ dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_policy); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_tree_add_text(rsvp_object_tree, tvb, offset+4, 1, "Flags: %d", tvb_get_guint8(tvb, offset+4)); @@ -3035,8 +3035,8 @@ dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, proto_item_set_text(ti, "MESSAGE-ID ACK: %d", tvb_get_ntohl(tvb, offset+8)); break; - case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 2: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 2"); proto_tree_add_text(rsvp_object_tree, tvb, offset+4, 1, "Flags: %d", tvb_get_guint8(tvb, offset+4)); @@ -3048,7 +3048,7 @@ dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, break; default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -3060,10 +3060,10 @@ dissect_rsvp_message_id_ack (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * MESSAGE ID LIST *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_message_id_list (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_message_id_list (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3073,12 +3073,12 @@ dissect_rsvp_message_id_list (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_policy); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); proto_tree_add_text(rsvp_object_tree, tvb, offset+4, 1, "Flags: %d", tvb_get_guint8(tvb, offset+4)); @@ -3087,13 +3087,13 @@ dissect_rsvp_message_id_list (proto_tree *ti, tvbuff_t *tvb, for (mylen = 8; mylen < obj_length; mylen += 4) proto_tree_add_text(rsvp_object_tree, tvb, offset+mylen, 4, "Message-ID: %d", tvb_get_ntohl(tvb, offset+mylen)); - proto_item_set_text(ti, "MESSAGE-ID LIST: %d IDs", + proto_item_set_text(ti, "MESSAGE-ID LIST: %d IDs", (obj_length - 8)/4); break; default: mylen = obj_length - 4; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -3105,10 +3105,10 @@ dissect_rsvp_message_id_list (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * HELLO *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_hello (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_hello (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { proto_tree *rsvp_object_tree; @@ -3116,13 +3116,13 @@ dissect_rsvp_hello (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_hello_obj); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", - class, type_str); + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", + class, type_str); switch(type) { case 1: case 2: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-Type: 1 - HELLO %s object", type==1 ? "REQUEST" : "ACK"); proto_tree_add_text(rsvp_object_tree, tvb, offset+4, 4, @@ -3130,8 +3130,8 @@ dissect_rsvp_hello (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_object_tree, tvb, offset+8, 4, "Destination Instance: 0x%x",tvb_get_ntohl(tvb, offset+8)); break; - default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + default: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-Type: %d - UNKNOWN", type); break; }; @@ -3140,10 +3140,10 @@ dissect_rsvp_hello (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * DCLASS *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_dclass (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_dclass (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3153,20 +3153,20 @@ dissect_rsvp_dclass (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_dclass); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, "DCLASS: "); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); for (mylen = 4; mylen < obj_length; mylen += 4) { proto_tree_add_text(rsvp_object_tree, tvb, offset+mylen+3, 1, - "DSCP: %s", + "DSCP: %s", val_to_str(tvb_get_guint8(tvb, offset+mylen+3), dscp_vals, "Unknown (%d)")); - proto_item_append_text(ti, "%d%s", + proto_item_append_text(ti, "%d%s", tvb_get_guint8(tvb, offset+mylen+3)>>2, mylen==obj_length-4 ? "": mylen<16 ? ", ": @@ -3176,7 +3176,7 @@ dissect_rsvp_dclass (proto_tree *ti, tvbuff_t *tvb, default: mylen = obj_length - 4; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -3188,10 +3188,10 @@ dissect_rsvp_dclass (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * ADMINISTRATIVE STATUS *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3202,19 +3202,19 @@ dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_admin_status); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, "ADMIN STATUS: "); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); status = tvb_get_ntohl(tvb, offset2); ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, "Admin Status: 0x%08x", status); - rsvp_admin_subtree = - proto_item_add_subtree(ti2, ett_rsvp_admin_status_flags); + rsvp_admin_subtree = + proto_item_add_subtree(ti2, ett_rsvp_admin_status_flags); proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4, decode_boolean_bitfield(status, 0x80000000, 32, "R: Reflect", @@ -3231,7 +3231,7 @@ dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, decode_boolean_bitfield(status, 0x01, 32, "D: Delete In Progress", "D: ")); - proto_item_set_text(ti, "ADMIN-STATUS: %s %s %s %s", + proto_item_set_text(ti, "ADMIN-STATUS: %s %s %s %s", (status & (1<<31)) ? "Reflect" : "", (status & (1<<2)) ? "Testing" : "", (status & (1<<1)) ? "Admin-Down" : "", @@ -3240,7 +3240,7 @@ dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, default: mylen = obj_length - 4; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -3252,10 +3252,10 @@ dissect_rsvp_admin_status (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * LSP TUNNEL INTERFACE ID *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_lsp_tunnel_if_id (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_lsp_tunnel_if_id (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3264,26 +3264,26 @@ dissect_rsvp_lsp_tunnel_if_id (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_lsp_tunnel_if_id); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, "LSP INTERFACE-ID: "); switch(type) { - case 1: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + case 1: + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1 - IPv4"); - proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, + proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, "Router ID: %s", ip_to_str(tvb_get_ptr(tvb, offset2, 4))); proto_tree_add_text(rsvp_object_tree, tvb, offset2+4, 4, "Interface ID: %u", tvb_get_ntohl(tvb, offset2+4)); - proto_item_set_text(ti, "LSP INTERFACE-ID: IPv4, Router-ID %s, Interface-ID %d", + proto_item_set_text(ti, "LSP INTERFACE-ID: IPv4, Router-ID %s, Interface-ID %d", ip_to_str(tvb_get_ptr(tvb, offset2, 4)), tvb_get_ntohl(tvb, offset2+4)); break; default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, @@ -3295,10 +3295,10 @@ dissect_rsvp_lsp_tunnel_if_id (proto_tree *ti, tvbuff_t *tvb, /*------------------------------------------------------------------------------ * GENERALIZED UNI *------------------------------------------------------------------------------*/ -static void -dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, +static void +dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, int offset, int obj_length, - int class, int type, + int class, int type, char *type_str) { int offset2 = offset + 4; @@ -3310,8 +3310,8 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_gen_uni); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_item_set_text(ti, "GENERALIZED UNI: "); @@ -3319,23 +3319,23 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, switch(type) { case 1: { char *c; - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1"); for (i=1, l = 0; l < mylen; i++) { j = tvb_get_guint8(tvb, offset2+l+2); switch(j) { - case 1: + case 1: case 2: /* We do source and destination TNA together */ c = (j==1) ? "Source" : "Destination"; k = tvb_get_guint8(tvb, offset2+l+3); switch(k) { case 1: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 8, - "%s IPv4 TNA - %s", c, + "%s IPv4 TNA - %s", c, ip_to_str(tvb_get_ptr(tvb, offset2+l+4, 4))); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (%s)", j, c); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3353,11 +3353,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, break; case 2: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, 20, "%s IPv6 TNA", c); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (%s)", j, c); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3373,11 +3373,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, break; case 3: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "%s NSAP TNA", c); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (%s)", j, c); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3385,7 +3385,7 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l, 2, "Length: %u", tvb_get_ntohs(tvb, offset2+l)); - proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, + proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, tvb_get_ntohs(tvb, offset2+l)-4, "Data"); if (i < 4) { @@ -3394,11 +3394,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, break; default: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "%s UNKNOWN TNA", c); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (%s)", j, c); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3406,7 +3406,7 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l, 2, "Length: %u", tvb_get_ntohs(tvb, offset2+l)); - proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, + proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, tvb_get_ntohs(tvb, offset2+l)-4, "Data"); if (i < 4) { @@ -3421,11 +3421,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, switch(k) { default: case 1: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "Diversity Subobject"); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (Diversity)", j); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3434,23 +3434,23 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, "Length: %u", tvb_get_ntohs(tvb, offset2+l)); m = tvb_get_guint8(tvb, offset2+l+4) >> 4; - proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, 1, - "Diversity: %d - %s", m, + proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+4, 1, + "Diversity: %d - %s", m, val_to_str(m, ouni_guni_diversity_str, "Unknown")); s_len = tvb_get_ntohs(tvb, offset2+l+8); s_class = tvb_get_guint8(tvb, offset2+l+10); s_type = tvb_get_guint8(tvb, offset2+l+11); - ti2 = proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, + ti2 = proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, s_len, "Session"); - dissect_rsvp_session(ti2, tvb, offset2+l+8, s_len, s_class, s_type, + dissect_rsvp_session(ti2, tvb, offset2+l+8, s_len, s_class, s_type, val_to_str(s_class, rsvp_class_vals, "Unknown")); offset2 += s_len; s_len = tvb_get_ntohs(tvb, offset2+l+8); s_class = tvb_get_guint8(tvb, offset2+l+10); s_type = tvb_get_guint8(tvb, offset2+l+11); - ti2 = proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, + ti2 = proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, s_len, "Template"); - dissect_rsvp_template_filter(ti2, tvb, offset2+l+8, s_len, s_class, s_type, + dissect_rsvp_template_filter(ti2, tvb, offset2+l+8, s_len, s_class, s_type, val_to_str(s_class, rsvp_class_vals, "Unknown")); if (i < 4) { @@ -3466,11 +3466,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, switch(k) { default: case 1: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "Egress Label Subobject"); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (Egress Label)", j); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3489,9 +3489,9 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, 4, "Logical Port ID: %u", tvb_get_ntohl(tvb, offset2+l+8)); proto_item_append_text(ti2, ": %s, Label type %d, Port ID %d, Label ", - tvb_get_guint8(tvb, offset2+l+4) & 0x80 ? - "Upstream" : "Downstream", - tvb_get_guint8(tvb, offset2+l+7), + tvb_get_guint8(tvb, offset2+l+4) & 0x80 ? + "Upstream" : "Downstream", + tvb_get_guint8(tvb, offset2+l+7), tvb_get_ntohl(tvb, offset2+l+8)); for (j=12; j < tvb_get_ntohs(tvb, offset2+l); j+=4) { proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+8, 4, @@ -3510,11 +3510,11 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, switch(k) { default: case 1: - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "Service Level Subobject"); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_gen_uni_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+2, 1, "Class: %d (Egress Label)", j); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+3, 1, @@ -3533,13 +3533,13 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, break; default: /* Unknown subobject */ - ti2 = proto_tree_add_text(rsvp_object_tree, tvb, + ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), "Unknown subobject: %u", j); - rsvp_gen_uni_subtree = - proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); + rsvp_gen_uni_subtree = + proto_item_add_subtree(ti2, ett_rsvp_record_route_subobj); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l, 1, "Type: %u (Unknown)", j); proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+1, 1, @@ -3558,9 +3558,9 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, } break; } - + default: - proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, + proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: Unknown (%u)", type); proto_tree_add_text(rsvp_object_tree, tvb, offset2, mylen, @@ -3573,13 +3573,13 @@ dissect_rsvp_gen_uni (proto_tree *ti, tvbuff_t *tvb, * Dissect a single RSVP message in a tree *------------------------------------------------------------------------------*/ static void -dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, +dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int tree_mode) { proto_tree *rsvp_tree = NULL; proto_tree *rsvp_header_tree; proto_tree *rsvp_object_tree; - proto_tree *ti; + proto_tree *ti; guint16 cksum, computed_cksum; vec_t cksum_vec[1]; int offset = 0; @@ -3601,24 +3601,24 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, FALSE); rsvp_tree = proto_item_add_subtree(ti, tree_mode); proto_item_append_text(rsvp_tree, ": "); - proto_item_append_text(rsvp_tree, val_to_str(message_type, message_type_vals, - "Unknown (%u). ")); + proto_item_append_text(rsvp_tree, val_to_str(message_type, message_type_vals, + "Unknown (%u). ")); find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off); - if (session_off) + if (session_off) proto_item_append_text(rsvp_tree, summary_session(tvb, session_off)); - if (tempfilt_off) + if (tempfilt_off) proto_item_append_text(rsvp_tree, summary_template(tvb, tempfilt_off)); - ti = proto_tree_add_text(rsvp_tree, tvb, offset, 8, "RSVP Header. %s", - val_to_str(message_type, message_type_vals, - "Unknown Message (%u). ")); + ti = proto_tree_add_text(rsvp_tree, tvb, offset, 8, "RSVP Header. %s", + val_to_str(message_type, message_type_vals, + "Unknown Message (%u). ")); rsvp_header_tree = proto_item_add_subtree(ti, ett_rsvp_hdr); - proto_tree_add_text(rsvp_header_tree, tvb, offset, 1, "RSVP Version: %u", - (ver_flags & 0xf0)>>4); + proto_tree_add_text(rsvp_header_tree, tvb, offset, 1, "RSVP Version: %u", + (ver_flags & 0xf0)>>4); proto_tree_add_text(rsvp_header_tree, tvb, offset, 1, "Flags: %02x", ver_flags & 0xf); - proto_tree_add_uint(rsvp_header_tree, rsvp_filter[RSVPF_MSG], tvb, + proto_tree_add_uint(rsvp_header_tree, rsvp_filter[RSVPF_MSG], tvb, offset+1, 1, message_type); switch (RSVPF_MSG + message_type) { @@ -3634,7 +3634,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVPF_ACK: case RSVPF_SREFRESH: case RSVPF_HELLO: - proto_tree_add_boolean_hidden(rsvp_header_tree, rsvp_filter[RSVPF_MSG + message_type], tvb, + proto_tree_add_boolean_hidden(rsvp_header_tree, rsvp_filter[RSVPF_MSG + message_type], tvb, offset+1, 1, 1); break; @@ -3695,7 +3695,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } while (len < msg_length) { - guint8 class; + guint8 class; guint8 type; char *type_str; @@ -3703,7 +3703,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, class = tvb_get_guint8(tvb, offset+2); type = tvb_get_guint8(tvb, offset+3); type_str = val_to_str(class, rsvp_class_vals, "Unknown"); - proto_tree_add_uint_hidden(rsvp_tree, rsvp_filter[RSVPF_OBJECT], tvb, + proto_tree_add_uint_hidden(rsvp_tree, rsvp_filter[RSVPF_OBJECT], tvb, offset, obj_length, class); ti = proto_tree_add_item(rsvp_tree, rsvp_filter[rsvp_class_to_filter_num(class)], tvb, offset, obj_length, FALSE); @@ -3715,11 +3715,11 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVP_CLASS_SESSION: dissect_rsvp_session(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_HOP: dissect_rsvp_hop(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_TIME_VALUES: dissect_rsvp_time_values(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3731,11 +3731,11 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVP_CLASS_SCOPE: dissect_rsvp_scope(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_STYLE: dissect_rsvp_style(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_CONFIRM: dissect_rsvp_confirm(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3768,13 +3768,13 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVP_CLASS_LABEL_REQUEST: dissect_rsvp_label_request(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_UPSTREAM_LABEL: case RSVP_CLASS_SUGGESTED_LABEL: case RSVP_CLASS_LABEL: dissect_rsvp_label(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_SESSION_ATTRIBUTE: dissect_rsvp_session_attribute(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3786,7 +3786,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSVP_CLASS_RECORD_ROUTE: dissect_rsvp_record_route(ti, tvb, offset, obj_length, class, type, type_str); break; - + case RSVP_CLASS_MESSAGE_ID: dissect_rsvp_message_id(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3807,7 +3807,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_rsvp_dclass(ti, tvb, offset, obj_length, class, type, type_str); break; - case RSVP_CLASS_ADMIN_STATUS: + case RSVP_CLASS_ADMIN_STATUS: dissect_rsvp_admin_status(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3815,7 +3815,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_rsvp_lsp_tunnel_if_id(ti, tvb, offset, obj_length, class, type, type_str); break; - case RSVP_CLASS_GENERALIZED_UNI: + case RSVP_CLASS_GENERALIZED_UNI: dissect_rsvp_gen_uni(ti, tvb, offset, obj_length, class, type, type_str); break; @@ -3824,14 +3824,14 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_unknown_class); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); - proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, - "Class number: %u - %s", + proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1, + "Class number: %u - %s", class, type_str); proto_tree_add_text(rsvp_object_tree, tvb, offset2, obj_length - 4, "Data (%d bytes)", obj_length - 4); break; - } - + } + if (obj_length == 0) break; offset += obj_length; @@ -3842,8 +3842,8 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /*------------------------------------------------------------------------------ * The main loop *------------------------------------------------------------------------------*/ -static void -dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void +dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 ver_flags; guint8 message_type; @@ -3861,27 +3861,27 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, - val_to_str(message_type, message_type_vals, "Unknown (%u). ")); + val_to_str(message_type, message_type_vals, "Unknown (%u). ")); find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off); - if (session_off) + if (session_off) col_append_str(pinfo->cinfo, COL_INFO, summary_session(tvb, session_off)); - if (tempfilt_off) + if (tempfilt_off) col_append_str(pinfo->cinfo, COL_INFO, summary_template(tvb, tempfilt_off)); } if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, - val_to_str(message_type, message_type_vals, "Unknown (%u). ")); + val_to_str(message_type, message_type_vals, "Unknown (%u). ")); if (message_type == RSVP_MSG_BUNDLE) { - col_add_str(pinfo->cinfo, COL_INFO, - rsvp_bundle_dissect ? + col_add_str(pinfo->cinfo, COL_INFO, + rsvp_bundle_dissect ? "Component Messages Dissected" : "Component Messages Not Dissected"); } else { find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off); - if (session_off) + if (session_off) col_append_str(pinfo->cinfo, COL_INFO, summary_session(tvb, session_off)); - if (tempfilt_off) + if (tempfilt_off) col_append_str(pinfo->cinfo, COL_INFO, summary_template(tvb, tempfilt_off)); } } @@ -3891,14 +3891,14 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void +static void register_rsvp_prefs (void) { module_t *rsvp_module; rsvp_module = prefs_register_protocol(proto_rsvp, NULL); prefs_register_bool_preference( - rsvp_module, "rsvp_process_bundle", + rsvp_module, "rsvp_process_bundle", "Dissect sub-messages in BUNDLE message", "Specifies whether Ethereal should decode and display sub-messages within BUNDLE messages", &rsvp_bundle_dissect); diff --git a/packet-rtcp.c b/packet-rtcp.c index b1efa55c49..5f038b0d75 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -1,27 +1,27 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c,v 1.34 2002/08/02 23:35:59 jmayer Exp $ + * $Id: packet-rtcp.c,v 1.35 2002/08/28 21:00:29 jmayer Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol - * + * * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <andreas.sikkema@philips.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -32,7 +32,7 @@ * of ITU-T Recommendation H.225.0 (02/98) and RFC 1889 * H.225.0 literally copies RFC 1889, but omitting a few sections. * - * RTCP traffic is handled by an uneven UDP portnumber. This can be any + * RTCP traffic is handled by an uneven UDP portnumber. This can be any * port number, but there is a registered port available, port 5005 * See Annex B of ITU-T Recommendation H.225.0, section B.7 * @@ -65,7 +65,7 @@ /* Receiver/ Sender count is the 5 last bits */ #define RTCP_COUNT(octet) ((octet) & 0x1F) -static const value_string rtcp_version_vals[] = +static const value_string rtcp_version_vals[] = { { 0, "Old VAT Version" }, { 1, "First Draft Version" }, @@ -83,7 +83,7 @@ static const value_string rtcp_version_vals[] = #define RTCP_FIR 192 #define RTCP_NACK 193 -static const value_string rtcp_packet_type_vals[] = +static const value_string rtcp_packet_type_vals[] = { { RTCP_SR, "Sender Report" }, { RTCP_RR, "Receiver Report" }, @@ -106,7 +106,7 @@ static const value_string rtcp_packet_type_vals[] = #define RTCP_SDES_NOTE 7 #define RTCP_SDES_PRIV 8 -static const value_string rtcp_sdes_type_vals[] = +static const value_string rtcp_sdes_type_vals[] = { { RTCP_SDES_END, "END" }, { RTCP_SDES_CNAME, "CNAME (user and domain)" }, @@ -136,7 +136,7 @@ static int hf_rtcp_sender_oct_cnt = -1; static int hf_rtcp_ssrc_source = -1; static int hf_rtcp_ssrc_fraction = -1; static int hf_rtcp_ssrc_cum_nr = -1; -/* First the 32 bit number, then the split +/* First the 32 bit number, then the split * up 16 bit values */ /* These two are added to a subtree */ static int hf_rtcp_ssrc_ext_high_seq = -1; @@ -203,7 +203,7 @@ void rtcp_add_address( packet_info *pinfo, const unsigned char* ip_addr, } /* - * Check if the ip address and port combination is not + * Check if the ip address and port combination is not * already registered */ pconv = find_conversation( &src_addr, &fake_addr, PT_UDP, prt, 0, 0 ); @@ -221,7 +221,7 @@ void rtcp_add_address( packet_info *pinfo, const unsigned char* ip_addr, } #if 0 -static void rtcp_init( void ) +static void rtcp_init( void ) { unsigned char* tmp_data; int i; @@ -295,7 +295,7 @@ dissect_rtcp_nack( tvbuff_t *tvb, int offset, proto_tree *tree ) /* SSRC */ proto_tree_add_uint( tree, hf_rtcp_ssrc_source, tvb, offset, 4, tvb_get_ntohl( tvb, offset ) ); offset += 4; - + /* FSN, 16 bits */ proto_tree_add_uint( tree, hf_rtcp_fsn, tvb, offset, 2, tvb_get_ntohs( tvb, offset ) ); offset += 2; @@ -324,7 +324,7 @@ dissect_rtcp_fir( tvbuff_t *tvb, int offset, proto_tree *tree ) /* SSRC */ proto_tree_add_uint( tree, hf_rtcp_ssrc_source, tvb, offset, 4, tvb_get_ntohl( tvb, offset ) ); offset += 4; - + return offset; } @@ -352,7 +352,7 @@ dissect_rtcp_app( tvbuff_t *tvb, int offset, proto_tree *tree, /* Applications specific data */ if ( padding ) { - /* If there's padding present, we have to remove that from the data part + /* If there's padding present, we have to remove that from the data part * The last octet of the packet contains the length of the padding */ packet_len -= tvb_get_guint8( tvb, offset + packet_len - 1 ); @@ -415,7 +415,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, unsigned int counter = 0; unsigned int prefix_len = 0; char *prefix_string = NULL; - + while ( chunk <= count ) { /* Create a subtree for this chunk; we don't yet know the length. */ @@ -431,12 +431,12 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, offset += 4; /* Create a subtree for the SDES items; we don't yet know - the length */ + the length */ items_start_offset = offset; ti = proto_tree_add_text(sdes_tree, tvb, offset, -1, "SDES items" ); sdes_item_tree = proto_item_add_subtree( ti, ett_sdes_item ); - + /* * Not every message is ended with "null" bytes, so check for * end of frame instead. @@ -486,8 +486,8 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, /* Set the length of the items subtree. */ proto_item_set_len(ti, offset - items_start_offset); - /* 32 bits = 4 bytes, so..... - * If offset % 4 != 0, we divide offset by 4, add one and then + /* 32 bits = 4 bytes, so..... + * If offset % 4 != 0, we divide offset by 4, add one and then * multiply by 4 again to reach the boundary */ if ( offset % 4 != 0 ) @@ -517,11 +517,11 @@ dissect_rtcp_rr( tvbuff_t *tvb, int offset, proto_tree *tree, ti = proto_tree_add_text(tree, tvb, offset, 24, "Source %u", counter ); ssrc_tree = proto_item_add_subtree( ti, ett_ssrc ); - + /* SSRC_n source identifier, 32 bits */ proto_tree_add_uint( ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, tvb_get_ntohl( tvb, offset ) ); offset += 4; - + ti = proto_tree_add_text(ssrc_tree, tvb, offset, 20, "SSRC contents" ); ssrc_sub_tree = proto_item_add_subtree( ti, ett_ssrc_item ); @@ -630,7 +630,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTCP" ); } - + if ( check_col( pinfo->cinfo, COL_INFO) ) { /* The second octet contains the packet type */ /* switch ( pd[ offset + 1 ] ) { */ @@ -664,14 +664,14 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( tree ) { - /* - * Check if there are at least 4 bytes left in the frame, - * the last 16 bits of those is the length of the current + /* + * Check if there are at least 4 bytes left in the frame, + * the last 16 bits of those is the length of the current * RTCP message. The last compound message contains padding, * that enables us to break from the while loop. */ while ( tvb_bytes_exist( tvb, offset, 4) ) { - /* + /* * First retreive the packet_type */ packet_type = tvb_get_guint8( tvb, offset + 1 ); @@ -681,13 +681,13 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) */ if ( ( packet_type < 192 ) || ( packet_type > 204 ) ) break; - + /* * get the packet-length for the complete RTCP packet */ packet_length = ( tvb_get_ntohs( tvb, offset + 2 ) + 1 ) * 4; - ti = proto_tree_add_item(tree, proto_rtcp, tvb, offset, packet_length, FALSE ); + ti = proto_tree_add_item(tree, proto_rtcp, tvb, offset, packet_length, FALSE ); rtcp_tree = proto_item_add_subtree( ti, ett_rtcp ); temp_byte = tvb_get_guint8( tvb, offset ); @@ -772,13 +772,13 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) break; } } - /* If the padding bit is set, the last octet of the - * packet contains the length of the padding + /* If the padding bit is set, the last octet of the + * packet contains the length of the padding * We only have to check for this at the end of the LAST RTCP message */ if ( padding_set ) { - /* If everything went according to plan offset should now point to the - * first octet of the padding + /* If everything went according to plan offset should now point to the + * first octet of the padding */ proto_tree_add_item( rtcp_tree, hf_rtcp_padding_data, tvb, offset, tvb_length_remaining( tvb, offset) - 1, FALSE ); offset += tvb_length_remaining( tvb, offset) - 1; @@ -790,407 +790,407 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_register_rtcp(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_rtcp_version, - { - "Version", - "rtcp.version", - FT_UINT8, - BASE_DEC, - VALS(rtcp_version_vals), + { + "Version", + "rtcp.version", + FT_UINT8, + BASE_DEC, + VALS(rtcp_version_vals), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_padding, - { - "Padding", - "rtcp.padding", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Padding", + "rtcp.padding", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_rc, - { - "Reception report count", - "rtcp.rc", - FT_UINT8, - BASE_DEC, - NULL, + { + "Reception report count", + "rtcp.rc", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_sc, - { - "Source count", - "rtcp.sc", - FT_UINT8, - BASE_DEC, - NULL, + { + "Source count", + "rtcp.sc", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_pt, - { - "Packet type", - "rtcp.pt", - FT_UINT8, - BASE_DEC, - VALS( rtcp_packet_type_vals ), + { + "Packet type", + "rtcp.pt", + FT_UINT8, + BASE_DEC, + VALS( rtcp_packet_type_vals ), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_length, - { - "Length", - "rtcp.length", - FT_UINT16, - BASE_DEC, - NULL, + { + "Length", + "rtcp.length", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_sender, - { - "Sender SSRC", - "rtcp.senderssrc", - FT_UINT32, - BASE_DEC, - NULL, + { + "Sender SSRC", + "rtcp.senderssrc", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ntp, - { - "NTP timestamp", - "rtcp.timestamp.ntp", - FT_STRING, - BASE_NONE, - NULL, + { + "NTP timestamp", + "rtcp.timestamp.ntp", + FT_STRING, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_rtp_timestamp, - { - "RTP timestamp", - "rtcp.timestamp.rtp", - FT_UINT32, - BASE_DEC, - NULL, + { + "RTP timestamp", + "rtcp.timestamp.rtp", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_sender_pkt_cnt, - { - "Sender's packet count", - "rtcp.sender.packetcount", - FT_UINT32, - BASE_DEC, - NULL, + { + "Sender's packet count", + "rtcp.sender.packetcount", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_sender_oct_cnt, - { - "Sender's octet count", - "rtcp.sender.octetcount", - FT_UINT32, - BASE_DEC, - NULL, + { + "Sender's octet count", + "rtcp.sender.octetcount", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_source, - { - "Identifier", - "rtcp.ssrc.identifier", - FT_UINT32, - BASE_DEC, - NULL, + { + "Identifier", + "rtcp.ssrc.identifier", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_fraction, - { - "Fraction lost", - "rtcp.ssrc.fraction", - FT_UINT8, - BASE_DEC, - NULL, + { + "Fraction lost", + "rtcp.ssrc.fraction", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_cum_nr, - { - "Cumulative number of packets lost", - "rtcp.ssrc.cum_nr", - FT_UINT32, - BASE_DEC, - NULL, + { + "Cumulative number of packets lost", + "rtcp.ssrc.cum_nr", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_ext_high_seq, - { - "Extended highest sequence number received", - "rtcp.ssrc.ext_high", - FT_UINT32, - BASE_DEC, - NULL, + { + "Extended highest sequence number received", + "rtcp.ssrc.ext_high", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_high_seq, - { - "Highest sequence number received", - "rtcp.ssrc.high_seq", - FT_UINT16, - BASE_DEC, - NULL, + { + "Highest sequence number received", + "rtcp.ssrc.high_seq", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_high_cycles, - { - "Sequence number cycles count", - "rtcp.ssrc.high_cycles", - FT_UINT16, - BASE_DEC, - NULL, + { + "Sequence number cycles count", + "rtcp.ssrc.high_cycles", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_jitter, - { - "Interarrival jitter", - "rtcp.ssrc.jitter", - FT_UINT32, - BASE_DEC, - NULL, + { + "Interarrival jitter", + "rtcp.ssrc.jitter", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_lsr, - { - "Last SR timestamp", - "rtcp.ssrc.lsr", - FT_UINT32, - BASE_DEC, - NULL, + { + "Last SR timestamp", + "rtcp.ssrc.lsr", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_dlsr, - { - "Delay since last SR timestamp", - "rtcp.ssrc.dlsr", - FT_UINT32, - BASE_DEC, - NULL, + { + "Delay since last SR timestamp", + "rtcp.ssrc.dlsr", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_csrc, - { - "SSRC / CSRC identifier", - "rtcp.sdes.ssrc_csrc", - FT_UINT32, - BASE_DEC, - NULL, + { + "SSRC / CSRC identifier", + "rtcp.sdes.ssrc_csrc", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_type, - { - "Type", - "rtcp.sdes.type", - FT_UINT8, - BASE_DEC, - VALS( rtcp_sdes_type_vals ), + { + "Type", + "rtcp.sdes.type", + FT_UINT8, + BASE_DEC, + VALS( rtcp_sdes_type_vals ), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_length, - { - "Length", - "rtcp.sdes.length", - FT_UINT32, - BASE_DEC, - NULL, + { + "Length", + "rtcp.sdes.length", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_text, - { - "Text", - "rtcp.sdes.text", - FT_STRING, - BASE_NONE, - NULL, + { + "Text", + "rtcp.sdes.text", + FT_STRING, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_prefix_len, - { - "Prefix length", - "rtcp.sdes.prefix.length", - FT_UINT8, - BASE_DEC, - NULL, + { + "Prefix length", + "rtcp.sdes.prefix.length", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_ssrc_prefix_string, - { - "Prefix string", - "rtcp.sdes.prefix.string", - FT_STRING, - BASE_NONE, - NULL, + { + "Prefix string", + "rtcp.sdes.prefix.string", + FT_STRING, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_subtype, - { - "Subtype", - "rtcp.app.subtype", - FT_UINT8, - BASE_DEC, - NULL, + { + "Subtype", + "rtcp.app.subtype", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_name_ascii, - { - "Name (ASCII)", - "rtcp.app.name", - FT_STRING, - BASE_NONE, - NULL, + { + "Name (ASCII)", + "rtcp.app.name", + FT_STRING, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_app_data, - { - "Application specific data", - "rtcp.app.data", - FT_BYTES, - BASE_NONE, - NULL, + { + "Application specific data", + "rtcp.app.data", + FT_BYTES, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_fsn, - { - "First sequence number", - "rtcp.nack.fsn", - FT_UINT16, - BASE_DEC, - NULL, + { + "First sequence number", + "rtcp.nack.fsn", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_blp, - { - "Bitmask of following lost packets", - "rtcp.nack.blp", - FT_UINT16, - BASE_DEC, - NULL, + { + "Bitmask of following lost packets", + "rtcp.nack.blp", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_padding_count, - { - "Padding count", - "rtcp.padding.count", - FT_UINT8, - BASE_DEC, - NULL, + { + "Padding count", + "rtcp.padding.count", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtcp_padding_data, - { - "Padding data", - "rtcp.padding.data", - FT_BYTES, - BASE_NONE, - NULL, + { + "Padding data", + "rtcp.padding.data", + FT_BYTES, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_rtcp, &ett_ssrc, diff --git a/packet-rtcp.h b/packet-rtcp.h index 3c5e35911c..f596ba4fc2 100644 --- a/packet-rtcp.h +++ b/packet-rtcp.h @@ -1,27 +1,27 @@ /* packet-rtcp.h * - * $Id: packet-rtcp.h,v 1.7 2001/11/27 07:13:26 guy Exp $ + * $Id: packet-rtcp.h,v 1.8 2002/08/28 21:00:30 jmayer Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol - * + * * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <andreas.sikkema@philips.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rtp.c b/packet-rtp.c index 6e353836b6..c57713fd5e 100644 --- a/packet-rtp.c +++ b/packet-rtp.c @@ -2,26 +2,26 @@ * * Routines for RTP dissection * RTP = Real time Transport Protocol - * + * * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <andreas.sikkema@philips.com> * - * $Id: packet-rtp.c,v 1.35 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-rtp.c,v 1.36 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -31,7 +31,7 @@ * This dissector tries to dissect the RTP protocol according to Annex A * of ITU-T Recommendation H.225.0 (02/98) or RFC 1889 * - * RTP traffic is handled by an even UDP portnumber. This can be any + * RTP traffic is handled by an even UDP portnumber. This can be any * port number, but there is a registered port available, port 5004 * See Annex B of ITU-T Recommendation H.225.0, section B.7 * @@ -116,7 +116,7 @@ static void dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, /* CSRC count is the last four bits */ #define RTP_CSRC_COUNT(octet) ((octet) & 0xF) -static const value_string rtp_version_vals[] = +static const value_string rtp_version_vals[] = { { 0, "Old VAT Version" }, { 1, "First Draft Version" }, @@ -134,8 +134,8 @@ static const value_string rtp_version_vals[] = /* Payload type is the last 7 bits */ #define RTP_PAYLOAD_TYPE(octet) ((octet) & 0x7F) -/* - * RTP Payload types +/* + * RTP Payload types * Table B.2 / H.225.0 * Also RFC 1890 */ @@ -162,7 +162,7 @@ static const value_string rtp_version_vals[] = #define PT_MP2T 33 #define PT_H263 34 -static const value_string rtp_payload_type_vals[] = +static const value_string rtp_payload_type_vals[] = { { PT_PCMU, "ITU-T G.711 PCMU" }, { PT_1016, "USA Federal Standard FS-1016" }, @@ -220,7 +220,7 @@ void rtp_add_address( packet_info *pinfo, const unsigned char* ip_addr, } /* - * Check if the ip address an dport combination is not + * Check if the ip address an dport combination is not * already registered */ pconv = find_conversation( &src_addr, &fake_addr, PT_UDP, prt, 0, 0 ); @@ -238,7 +238,7 @@ void rtp_add_address( packet_info *pinfo, const unsigned char* ip_addr, } #if 0 -static void rtp_init( void ) +static void rtp_init( void ) { unsigned char* tmp_data; int i; @@ -290,7 +290,7 @@ dissect_rtp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) return TRUE; } -static void +static void dissect_rtp_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *rtp_tree, int offset, unsigned int data_len, unsigned int data_reported_len, unsigned int payload_type ) @@ -308,7 +308,7 @@ dissect_rtp_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, newtvb = tvb_new_subset( tvb, offset, data_len, data_reported_len ); call_dissector(mpeg1_handle, newtvb, pinfo, tree); - break; + break; default: proto_tree_add_item( rtp_tree, hf_rtp_data, tvb, offset, data_len, FALSE ); @@ -350,7 +350,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP" ); } - + if ( check_col( pinfo->cinfo, COL_INFO) ) { col_add_fstr( pinfo->cinfo, COL_INFO, "Unknown RTP version %u", version); @@ -359,7 +359,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( tree ) { ti = proto_tree_add_item( tree, proto_rtp, tvb, offset, -1, FALSE ); rtp_tree = proto_item_add_subtree( ti, ett_rtp ); - + proto_tree_add_uint( rtp_tree, hf_rtp_version, tvb, offset, 1, version ); } @@ -383,7 +383,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP" ); } - + if ( check_col( pinfo->cinfo, COL_INFO) ) { col_add_fstr( pinfo->cinfo, COL_INFO, "Payload type=%s, SSRC=%u, Seq=%u, Time=%u%s", @@ -398,7 +398,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( tree ) { ti = proto_tree_add_item( tree, proto_rtp, tvb, offset, -1, FALSE ); rtp_tree = proto_item_add_subtree( ti, ett_rtp ); - + proto_tree_add_uint( rtp_tree, hf_rtp_version, tvb, offset, 1, version ); proto_tree_add_boolean( rtp_tree, hf_rtp_padding, tvb, @@ -550,203 +550,203 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_register_rtp(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_rtp_version, - { - "Version", - "rtp.version", - FT_UINT8, - BASE_DEC, - VALS(rtp_version_vals), + { + "Version", + "rtp.version", + FT_UINT8, + BASE_DEC, + VALS(rtp_version_vals), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_padding, - { - "Padding", - "rtp.padding", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Padding", + "rtp.padding", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_extension, - { - "Extension", - "rtp.ext", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Extension", + "rtp.ext", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_csrc_count, - { - "Contributing source identifiers count", - "rtp.cc", - FT_UINT8, - BASE_DEC, - NULL, + { + "Contributing source identifiers count", + "rtp.cc", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_marker, - { - "Marker", - "rtp.marker", - FT_BOOLEAN, - BASE_NONE, - NULL, + { + "Marker", + "rtp.marker", + FT_BOOLEAN, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_payload_type, - { - "Payload type", - "rtp.p_type", - FT_UINT8, - BASE_DEC, - VALS(rtp_payload_type_vals), + { + "Payload type", + "rtp.p_type", + FT_UINT8, + BASE_DEC, + VALS(rtp_payload_type_vals), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_seq_nr, - { - "Sequence number", - "rtp.seq", - FT_UINT16, - BASE_DEC, - NULL, + { + "Sequence number", + "rtp.seq", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_timestamp, - { - "Timestamp", - "rtp.timestamp", - FT_UINT32, - BASE_DEC, - NULL, + { + "Timestamp", + "rtp.timestamp", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_ssrc, - { - "Synchronization Source identifier", - "rtp.ssrc", - FT_UINT32, - BASE_DEC, - NULL, + { + "Synchronization Source identifier", + "rtp.ssrc", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_prof_define, - { - "Defined by profile", - "rtp.ext.profile", - FT_UINT16, - BASE_DEC, - NULL, + { + "Defined by profile", + "rtp.ext.profile", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_length, - { - "Extension length", - "rtp.ext.len", - FT_UINT16, - BASE_DEC, - NULL, + { + "Extension length", + "rtp.ext.len", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_csrc_item, - { - "CSRC item", - "rtp.csrc.item", - FT_UINT32, - BASE_DEC, - NULL, + { + "CSRC item", + "rtp.csrc.item", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_hdr_ext, - { - "Header extension", - "rtp.hdr_ext", - FT_UINT32, - BASE_DEC, - NULL, + { + "Header extension", + "rtp.hdr_ext", + FT_UINT32, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_data, - { - "Payload", - "rtp.payload", - FT_BYTES, - BASE_HEX, - NULL, + { + "Payload", + "rtp.payload", + FT_BYTES, + BASE_HEX, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_padding_data, - { - "Padding data", - "rtp.padding.data", - FT_BYTES, - BASE_HEX, - NULL, + { + "Padding data", + "rtp.padding.data", + FT_BYTES, + BASE_HEX, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_padding_count, - { - "Padding count", - "rtp.padding.count", - FT_UINT8, - BASE_DEC, - NULL, + { + "Padding count", + "rtp.padding.count", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_rtp, &ett_csrc_list, diff --git a/packet-rtp.h b/packet-rtp.h index e64ed3d623..4eecb3d26f 100644 --- a/packet-rtp.h +++ b/packet-rtp.h @@ -3,25 +3,25 @@ * Routines for RTP dissection * RTP = Real time Transport Protocol * - * $Id: packet-rtp.h,v 1.6 2001/11/27 07:13:26 guy Exp $ - * + * $Id: packet-rtp.h,v 1.7 2002/08/28 21:00:30 jmayer Exp $ + * * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <andreas.sikkema@philips.com> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rtsp.c b/packet-rtsp.c index 6b8c57797e..5c95cad965 100644 --- a/packet-rtsp.c +++ b/packet-rtsp.c @@ -4,22 +4,22 @@ * Jason Lango <jal@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-rtsp.c,v 1.49 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-rtsp.c,v 1.50 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -103,7 +103,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, rf_len = tvb_get_ntohs(tvb, offset+2); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "Interleaved channel 0x%02x, %u bytes", rf_chan, rf_len); diff --git a/packet-rwall.c b/packet-rwall.c index ad63a4d21e..6351042268 100644 --- a/packet-rwall.c +++ b/packet-rwall.c @@ -1,6 +1,6 @@ /* packet-rwall.c * - * $Id: packet-rwall.c,v 1.6 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-rwall.c,v 1.7 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,7 +39,7 @@ static int dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_rpc_string(tvb, tree, hf_rwall_message, offset, NULL); - + return offset; } diff --git a/packet-rwall.h b/packet-rwall.h index 0348d16d15..b3f6459855 100644 --- a/packet-rwall.h +++ b/packet-rwall.h @@ -1,21 +1,21 @@ /* packet-rwall.h * - * $Id: packet-rwall.h,v 1.2 2001/06/12 06:31:14 guy Exp $ + * $Id: packet-rwall.h,v 1.3 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-rx.c b/packet-rx.c index c5eb401a9e..e9040b170c 100644 --- a/packet-rx.c +++ b/packet-rx.c @@ -4,7 +4,7 @@ * Based on routines from tcpdump patches by * Ken Hornstein <kenh@cmf.nrl.navy.mil> * - * $Id: packet-rx.c,v 1.36 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-rx.c,v 1.37 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -71,7 +71,7 @@ static const value_string rx_reason[] = { { RX_ACK_REQUESTED, "Ack Requested" }, { RX_ACK_DUPLICATE, "Duplicate Packet" }, { RX_ACK_OUT_OF_SEQUENCE, "Out Of Sequence" }, - { RX_ACK_EXEEDS_WINDOW, "Exceeds Window" }, + { RX_ACK_EXEEDS_WINDOW, "Exceeds Window" }, { RX_ACK_NOSPACE, "No Space" }, { RX_ACK_PING, "Ping" }, { RX_ACK_PING_RESPONSE, "Ping Response" }, @@ -156,7 +156,7 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset nstime_t ts; ts.secs = tvb_get_ntohl(tvb, offset); ts.nsecs = 0; - + proto_tree_add_time(tree, hf_rx_epoch, tvb, offset, 4, &ts); offset += 4; @@ -188,11 +188,11 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset /* level : 4 bytes */ proto_tree_add_item(tree, hf_rx_level, tvb, offset, 4, FALSE); offset += 4; - - proto_item_set_len(item, offset-old_offset); + + proto_item_set_len(item, offset-old_offset); return offset; } - + static int dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset, guint32 seq, guint32 callnumber) @@ -234,18 +234,18 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, /* kvno */ proto_tree_add_item(tree, hf_rx_kvno, tvb, offset, 4, FALSE); offset += 4; - + /* ticket_len */ tl = tvb_get_ntohl(tvb, offset); proto_tree_add_uint(tree, hf_rx_ticket_len, tvb, offset, 4, tl); offset += 4; - + proto_tree_add_item(tree, hf_rx_ticket, tvb, offset, tl, FALSE); - offset += tl; + offset += tl; } - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -276,8 +276,8 @@ dissect_rx_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* kvno */ proto_tree_add_item(tree, hf_rx_abortcode, tvb, offset, 4, FALSE); offset += 4; - - proto_item_set_len(item, offset-old_offset); + + proto_item_set_len(item, offset-old_offset); return offset; } @@ -320,7 +320,7 @@ dissect_rx_challenge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset += 4; } - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -353,20 +353,20 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* bufferspace: 2 bytes*/ proto_tree_add_item(tree, hf_rx_bufferspace, tvb, offset, 2, FALSE); offset += 2; - + /* maxskew: 2 bytes*/ proto_tree_add_item(tree, hf_rx_maxskew, tvb, offset, 2, FALSE); offset += 2; - + /* first packet: 4 bytes*/ proto_tree_add_item(tree, hf_rx_first_packet, tvb, offset, 4, FALSE); offset += 4; - + /* prev packet: 4 bytes*/ proto_tree_add_item(tree, hf_rx_prev_packet, tvb, offset, 4, FALSE); offset += 4; - /* serial : 4 bytes */ + /* serial : 4 bytes */ proto_tree_add_item(tree, hf_rx_serial, tvb, offset, 4, FALSE); offset += 4; @@ -418,7 +418,7 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int } } - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); return offset; } @@ -468,7 +468,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_protocol_format(parent_tree, proto_rx, tvb, + item = proto_tree_add_protocol_format(parent_tree, proto_rx, tvb, offset, 28, "RX Protocol"); tree = proto_item_add_subtree(item, ett_rx); @@ -477,7 +477,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) nstime_t ts;; ts.secs = tvb_get_ntohl(tvb, offset); ts.nsecs = 0; - + proto_tree_add_time(tree, hf_rx_epoch, tvb, offset, 4, &ts); offset += 4; @@ -542,10 +542,10 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) switch (type) { case RX_PACKET_TYPE_ACK: - /*dissect_rx_acks(tvb, pinfo, parent_tree, offset, + /*dissect_rx_acks(tvb, pinfo, parent_tree, offset, cant create it in a parallell tree, then ett seasrch wont work */ - dissect_rx_acks(tvb, pinfo, tree, offset, + dissect_rx_acks(tvb, pinfo, tree, offset, seq, callnumber); break; case RX_PACKET_TYPE_ACKALL: diff --git a/packet-sap.c b/packet-sap.c index 25ca3989be..0b114d5f53 100644 --- a/packet-sap.c +++ b/packet-sap.c @@ -4,24 +4,24 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-sap.c,v 1.29 2002/08/21 21:25:23 tpot Exp $ + * $Id: packet-sap.c,v 1.30 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -133,7 +133,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + vers_flags = tvb_get_guint8(tvb, offset); is_ipv6 = vers_flags&MCAST_SAP_BIT_A; is_del = vers_flags&MCAST_SAP_BIT_T; diff --git a/packet-scsi.c b/packet-scsi.c index f68bc0a658..a9b016d9e0 100644 --- a/packet-scsi.c +++ b/packet-scsi.c @@ -2,22 +2,22 @@ * Routines for decoding SCSI CDBs and responses * Author: Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-scsi.c,v 1.19 2002/08/21 10:40:09 guy Exp $ + * $Id: packet-scsi.c,v 1.20 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2002 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -38,7 +38,7 @@ * There are four main routines that are provided: * o dissect_scsi_cdb - invoked on receiving a SCSI Command * void dissect_scsi_cdb (tvbuff_t *, packet_info *, proto_tree *, guint, - * guint); + * guint); * o dissect_scsi_payload - invoked to decode SCSI responses * void dissect_scsi_payload (tvbuff_t *, packet_info *, proto_tree *, guint, * gboolean, guint32); @@ -72,7 +72,7 @@ * SCSI command set (SPC-2/3) is decoded for all SCSI devices. If there is a * mixture of devices in the trace, some with Inquiry response and some * without, the user preference is used only for those devices whose type the - * decoder has not been able to determine. + * decoder has not been able to determine. * */ #ifdef HAVE_CONFIG_H @@ -197,8 +197,8 @@ typedef guint32 scsi_device_type; #define SCSI_SPC2_RELEASE10 0x57 #define SCSI_SPC2_REPORTDEVICEID 0xA3 #define SCSI_SPC2_REPORTLUNS 0xA0 -#define SCSI_SPC2_REQSENSE 0x03 -#define SCSI_SPC2_RESERVE6 0x16 +#define SCSI_SPC2_REQSENSE 0x03 +#define SCSI_SPC2_RESERVE6 0x16 #define SCSI_SPC2_RESERVE10 0x56 #define SCSI_SPC2_SENDDIAG 0x1D #define SCSI_SPC2_SETDEVICEID 0xA4 @@ -1255,7 +1255,7 @@ scsi_new_task (packet_info *pinfo) { scsi_task_data_t *cdata = NULL; scsi_task_id_t ckey, *req_key; - + if ((pinfo != NULL) && (pinfo->private_data)) { ckey = *(scsi_task_id_t *)pinfo->private_data; @@ -1264,9 +1264,9 @@ scsi_new_task (packet_info *pinfo) if (!cdata) { req_key = g_mem_chunk_alloc (scsi_req_keys); *req_key = *(scsi_task_id_t *)pinfo->private_data; - + cdata = g_mem_chunk_alloc (scsi_req_vals); - + g_hash_table_insert (scsi_req_hash, req_key, cdata); } } @@ -1388,7 +1388,7 @@ dissect_scsi_evpd (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, val_to_str (pcode, scsi_evpd_pagecode_val, "Unknown (0x%08x)")); evpd_tree = proto_item_add_subtree (ti, ett_scsi_page); - + proto_tree_add_text (evpd_tree, tvb, offset, 1, "Peripheral Qualifier: 0x%x", (tvb_get_guint8 (tvb, offset) & 0xF0)>>4); @@ -1426,9 +1426,9 @@ dissect_scsi_evpd (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, scsi_devid_assoc_val, "Unknown (0x%02x)")); proto_tree_add_text (evpd_tree, tvb, offset+1, 1, - "Identifier Type: %s", + "Identifier Type: %s", val_to_str ((flags & 0x0F), - scsi_devid_idtype_val, + scsi_devid_idtype_val, "Unknown (0x%02x)")); idlen = tvb_get_guint8 (tvb, offset+3); proto_tree_add_text (evpd_tree, tvb, offset+3, 1, @@ -1508,23 +1508,23 @@ dissect_scsi_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!devdata) { req_key = g_mem_chunk_alloc (scsidev_req_keys); COPY_ADDRESS (&(req_key->devid), &(pinfo->src)); - + devdata = g_mem_chunk_alloc (scsidev_req_vals); devdata->devtype = tvb_get_guint8 (tvb, offset) & 0x3F; - + g_hash_table_insert (scsidev_req_hash, req_key, devdata); } } if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); if (cdata != NULL) { cdata->flags = flags; } - + proto_tree_add_uint_format (tree, hf_scsi_inquiry_flags, tvb, offset, 1, flags, "CMDT = %u, EVPD = %u", flags & 0x2, flags & 0x1); @@ -1584,7 +1584,7 @@ dissect_scsi_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_get_nstringz0 (tvb, offset+32, 4, str); proto_tree_add_text (tree, tvb, offset+32, 4, "Product Revision: %s", str); - + offset += 58; if ((tot_len > 58) && tvb_bytes_exist (tvb, offset, 16)) { for (i = 0; i < 8; i++) { @@ -1601,11 +1601,11 @@ dissect_scsi_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_scsi_extcopy (tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_, guint offset _U_, +dissect_scsi_extcopy (tvbuff_t *tvb _U_, packet_info *pinfo _U_, + proto_tree *tree _U_, guint offset _U_, gboolean isreq _U_, gboolean iscdb _U_) { - + } static void @@ -1613,13 +1613,13 @@ dissect_scsi_logselect (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb) { guint8 flags; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_logsel_flags, tvb, offset, 1, flags, "PCR = %u, SP = %u", flags & 0x2, flags & 0x1); @@ -1643,13 +1643,13 @@ dissect_scsi_logsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb) { guint8 flags; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_logsns_flags, tvb, offset, 1, flags, "PPC = %u, SP = %u", flags & 0x2, flags & 0x1); @@ -1816,7 +1816,7 @@ dissect_scsi_blockdescs (tvbuff_t *tvb, packet_info *pinfo _U_, } static gboolean -dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, +dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint8 pcode) { guint8 flags, proto; @@ -1941,7 +1941,7 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, } static gboolean -dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, +dissect_scsi_sbc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint8 pcode) { guint8 flags; @@ -2086,7 +2086,7 @@ static const value_string compression_algorithm_vals[] = { }; static gboolean -dissect_scsi_ssc2_modepage (tvbuff_t *tvb _U_, packet_info *pinfo _U_, +dissect_scsi_ssc2_modepage (tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint offset _U_, guint8 pcode) { @@ -2130,7 +2130,7 @@ dissect_scsi_ssc2_modepage (tvbuff_t *tvb _U_, packet_info *pinfo _U_, } static gboolean -dissect_scsi_smc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, +dissect_scsi_smc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint8 pcode) { guint8 flags; @@ -2237,7 +2237,7 @@ dissect_scsi_smc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_, } static guint -dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo, +dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo, proto_tree *scsi_tree, guint offset, scsi_device_type devtype) { @@ -2298,7 +2298,7 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo, "Unknown (0x%08x)")); tree = proto_item_add_subtree (ti, ett_scsi_page); proto_tree_add_text (tree, tvb, offset, 1, "PS: %u", (pcode & 0x80) >> 7); - + proto_tree_add_item (tree, hf_pagecode, tvb, offset, 1, 0); proto_tree_add_text (tree, tvb, offset+1, 1, "Page Length: %u", plen); @@ -2307,7 +2307,7 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo, /* XXX - why not just drive on and throw an exception? */ return (plen + 2); } - + if (!(*dissect_modepage)(tvb, pinfo, tree, offset, pcode & 0x3F)) { proto_tree_add_text (tree, tvb, offset+2, plen, "Unknown Page"); @@ -2322,13 +2322,13 @@ dissect_scsi_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { guint8 flags; guint tot_len, desclen, plen; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_modesel_flags, tvb, offset, 1, flags, "PF = %u, SP = %u", flags & 0x10, flags & 0x1); @@ -2406,13 +2406,13 @@ dissect_scsi_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 flags; gboolean longlba; guint tot_len, desclen, plen; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_modesel_flags, tvb, offset, 1, flags, "PF = %u, SP = %u", flags & 0x10, flags & 0x1); @@ -2535,13 +2535,13 @@ dissect_scsi_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { guint8 flags; guint tot_len, desclen, plen; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_modesns_flags, tvb, offset, 1, flags, "DBD = %u", flags & 0x8); proto_tree_add_item (tree, hf_scsi_modesns_pc, tvb, offset+1, 1, 0); @@ -2625,13 +2625,13 @@ dissect_scsi_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 flags; gboolean longlba; guint tot_len, desclen, plen; - + if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); - + proto_tree_add_uint_format (tree, hf_scsi_modesns_flags, tvb, offset, 1, flags, "LLBAA = %u, DBD = %u", flags & 0x10, flags & 0x8); @@ -2726,7 +2726,7 @@ dissect_scsi_persresvin (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_persresvin_svcaction, tvb, offset+1, 1, 0); @@ -2753,13 +2753,13 @@ dissect_scsi_persresvin (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_text (tree, tvb, offset, 4, "Additional Length: %u", len); len = (payload_len > len) ? len : payload_len; - + if ((flags & 0x1F) == SCSI_SPC2_RESVIN_SVCA_RDKEYS) { /* XXX - what if len is < 8? That may be illegal, but that doesn't make it impossible.... */ numrec = (len - 8)/8; offset += 8; - + for (i = 0; i < numrec; i++) { proto_tree_add_item (tree, hf_scsi_persresv_key, tvb, offset, 8, 0); @@ -2789,7 +2789,7 @@ dissect_scsi_persresvout (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_persresvin_svcaction, tvb, offset, 1, 0); @@ -2816,7 +2816,7 @@ dissect_scsi_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset+4); proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+4, 1, @@ -2827,14 +2827,14 @@ dissect_scsi_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, } static void -dissect_scsi_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, +dissect_scsi_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb) { guint8 flags; if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); @@ -2861,7 +2861,7 @@ dissect_scsi_reportdeviceid (tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint offset _U_, gboolean isreq _U_, gboolean iscdb _U_) { - + } static void @@ -2874,7 +2874,7 @@ dissect_scsi_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_alloclen32, tvb, offset+5, 4, 0); @@ -2909,7 +2909,7 @@ dissect_scsi_reqsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (!tree) return; - + if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, 0); @@ -2929,7 +2929,7 @@ dissect_scsi_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset+4); proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+4, 1, @@ -2947,7 +2947,7 @@ dissect_scsi_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); @@ -2978,7 +2978,7 @@ dissect_scsi_testunitrdy (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset+4); proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+4, 1, @@ -2997,7 +2997,7 @@ dissect_scsi_formatunit (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_uint_format (tree, hf_scsi_formatunit_flags, tvb, offset, @@ -3029,7 +3029,7 @@ dissect_scsi_sbc2_rdwr6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree tvb_get_ntoh24 (tvb, offset), tvb_get_guint8 (tvb, offset+3)); } - + if (tree && isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_rdwr6_lba, tvb, offset, 3, 0); proto_tree_add_item (tree, hf_scsi_rdwr6_xferlen, tvb, offset+3, 1, 0); @@ -3134,13 +3134,13 @@ dissect_scsi_readcapacity (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_uint_format (tree, hf_scsi_readcapacity_flags, tvb, offset, 1, flags, - "LongLBA = %u, RelAddr = %u", + "LongLBA = %u, RelAddr = %u", flags & 0x2, flags & 0x1); proto_tree_add_item (tree, hf_scsi_readcapacity_lba, tvb, offset+1, 4, 0); @@ -3171,7 +3171,7 @@ dissect_scsi_readdefdata10 (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); @@ -3197,7 +3197,7 @@ dissect_scsi_readdefdata12 (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); @@ -3223,7 +3223,7 @@ dissect_scsi_reassignblks (tvbuff_t *tvb, packet_info *pinfo _U_, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); @@ -3245,7 +3245,7 @@ dissect_scsi_varlencdb (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { if (!tree) return; - + if (isreq && iscdb) { proto_tree_add_item (tree, hf_scsi_control, tvb, offset, 1, 0); proto_tree_add_item (tree, hf_scsi_add_cdblen, tvb, offset+6, 1, 0); @@ -3265,7 +3265,7 @@ dissect_scsi_ssc2_read6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree col_append_fstr (pinfo->cinfo, COL_INFO, "(Len: %u)", tvb_get_ntoh24 (tvb, offset+1)); } - + if (tree && isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (tree, tvb, offset, 1, @@ -3291,7 +3291,7 @@ dissect_scsi_ssc2_write6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre col_append_fstr (pinfo->cinfo, COL_INFO, "(Len: %u)", tvb_get_ntoh24 (tvb, offset+1)); } - + if (tree && isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (tree, tvb, offset, 1, @@ -3317,7 +3317,7 @@ dissect_scsi_ssc2_writefilemarks6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ col_append_fstr (pinfo->cinfo, COL_INFO, "(Len: %u)", tvb_get_ntoh24 (tvb, offset+1)); } - + if (tree && isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (tree, tvb, offset, 1, @@ -3370,7 +3370,7 @@ dissect_scsi_ssc2_readblocklimits (tvbuff_t *tvb, packet_info *pinfo _U_, proto_ if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset+4); proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+4, 1, @@ -3839,9 +3839,9 @@ dissect_scsi_smc2_element (tvbuff_t *tvb, packet_info *pinfo _U_, return; flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (tree, tvb, offset, 1, - "Identifier Type: %s", + "Identifier Type: %s", val_to_str ((flags & 0x0F), - scsi_devid_idtype_val, + scsi_devid_idtype_val, "Unknown (0x%02x)")); offset += 1; elem_bytecnt -= 1; @@ -3908,7 +3908,7 @@ dissect_scsi_smc2_readelementstatus (tvbuff_t *tvb, packet_info *pinfo, if (!tree) return; - + if (isreq && iscdb) { flags = tvb_get_guint8 (tvb, offset); proto_tree_add_text (tree, tvb, offset, 1, @@ -4024,7 +4024,7 @@ dissect_scsi_snsinfo (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *sns_tree; scsi_end_task (pinfo); - + if (tree) { ti = proto_tree_add_protocol_format (tree, proto_scsi, tvb, offset, snslen, "SCSI: SNS Info"); @@ -4071,7 +4071,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, scsi_task_data_t *cdata; scsi_devtype_key_t dkey; scsi_devtype_data_t *devdata; - + opcode = tvb_get_guint8 (tvb, offset); if (devtype_arg != SCSI_DEV_UNKNOWN) @@ -4131,7 +4131,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, else { cmd = SCSI_CMND_SPC2; } - + if (valstr != NULL) { if (check_col (pinfo->cinfo, COL_INFO)) { col_add_fstr (pinfo->cinfo, COL_INFO, "SCSI: %s", valstr); @@ -4150,7 +4150,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cdata->cmd = cmd; cdata->devtype = devtype; } - + if (tree) { ti = proto_tree_add_protocol_format (tree, proto_scsi, tvb, start, cdblen, "SCSI CDB"); @@ -4194,7 +4194,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item (scsi_tree, hf_scsi_spcopcode, tvb, offset, 1, 0); } } - + switch (cmd) { case SCSI_CMND_SPC2: switch (opcode) { @@ -4454,9 +4454,9 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, scsi_cmnd_type cmd = 0; /* 0 is undefined type */ scsi_device_type devtype; scsi_task_data_t *cdata = NULL; - + cdata = scsi_find_task (pinfo); - + if (!cdata) { /* we have no record of this exchange and so we can't dissect the * payload @@ -4467,7 +4467,7 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, opcode = cdata->opcode; cmd = cdata->cmd; devtype = cdata->devtype; - + if (tree) { switch (cmd) { case SCSI_CMND_SPC2: @@ -5006,7 +5006,7 @@ proto_register_scsi (void) &ett_scsi_page, }; module_t *scsi_module; - + /* Register the protocol name and description */ proto_scsi = proto_register_protocol("SCSI", "SCSI", "scsi"); diff --git a/packet-scsi.h b/packet-scsi.h index d2440605b5..a55b2830e6 100644 --- a/packet-scsi.h +++ b/packet-scsi.h @@ -1,22 +1,22 @@ /* packet-scsi.h * Author: Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-scsi.h,v 1.4 2002/08/20 22:33:17 guy Exp $ - * + * $Id: packet-scsi.h,v 1.5 2002/08/28 21:00:30 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2002 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-sctp.c b/packet-sctp.c index e26dbf34f3..7bd401008c 100644 --- a/packet-sctp.c +++ b/packet-sctp.c @@ -10,24 +10,24 @@ * - support for reassembly * - code cleanup * - * $Id: packet-sctp.c,v 1.40 2002/07/10 21:01:57 guy Exp $ + * $Id: packet-sctp.c,v 1.41 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -150,7 +150,7 @@ static dissector_handle_t data_handle; #define SCTP_ECNE_CHUNK_ID 12 #define SCTP_CWR_CHUNK_ID 13 #define SCTP_SHUTDOWN_COMPLETE_CHUNK_ID 14 -#define SCTP_FORWARD_TSN_CHUNK_ID 192 +#define SCTP_FORWARD_TSN_CHUNK_ID 192 #define SCTP_ASCONF_ACK_CHUNK_ID 0x80 #define SCTP_ASCONF_CHUNK_ID 0XC1 @@ -409,9 +409,9 @@ static const value_string sctp_payload_proto_id_values[] = { #define SHUTDOWN_CHUNK_CUMULATIVE_TSN_ACK_OFFSET CHUNK_VALUE_OFFSET #define SHUTDOWN_CHUNK_CUMULATIVE_TSN_ACK_LENGTH 4 - -#define ABORT_CHUNK_FIRST_ERROR_CAUSE_OFFSET 4 -#define ERROR_CHUNK_FIRST_ERROR_CAUSE_OFFSET 4 + +#define ABORT_CHUNK_FIRST_ERROR_CAUSE_OFFSET 4 +#define ERROR_CHUNK_FIRST_ERROR_CAUSE_OFFSET 4 #define COOKIE_ECHO_CHUNK_COOKIE_OFFSET CHUNK_VALUE_OFFSET @@ -420,7 +420,7 @@ static const value_string sctp_payload_proto_id_values[] = { #define CWR_CHUNK_LOWEST_TSN_OFFSET CHUNK_VALUE_OFFSET #define CWR_CHUNK_LOWEST_TSN_LENGTH 4 - + #define SCTP_SHUTDOWN_COMPLETE_CHUNK_T_BIT 0x01 static const true_false_string sctp_data_chunk_e_bit_value = { @@ -474,13 +474,13 @@ sctp_adler32(const unsigned char* buf, unsigned int len) unsigned int s1 = 1L; unsigned int s2 = 0L; int k; - + /* handle the first 8 bytes of the datagram */ DO8(buf,0); - buf += SOURCE_PORT_LENGTH + - DESTINATION_PORT_LENGTH + + buf += SOURCE_PORT_LENGTH + + DESTINATION_PORT_LENGTH + VERIFICATION_TAG_LENGTH; - + /* handle four 0 bytes as checksum */ s2 += CHECKSUM_LENGTH * s1; buf += CHECKSUM_LENGTH; @@ -510,98 +510,98 @@ sctp_adler32(const unsigned char* buf, unsigned int len) /* The CRC32C code is taken from draft-ietf-tsvwg-sctpcsum-01.txt. * That code is copyrighted by D. Otis and has been modified. */ - -#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF]) -static unsigned long crc_c[256] = -{ -0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, -0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, -0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL, -0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L, -0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, -0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, -0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, -0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL, -0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL, -0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, -0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, -0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, -0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L, -0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL, -0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, -0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, -0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, -0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L, -0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L, -0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, -0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, -0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, -0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L, -0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L, -0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, -0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, -0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, -0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L, -0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L, -0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, -0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, -0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, -0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL, -0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L, -0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, -0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, -0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, -0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL, -0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL, -0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, -0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, -0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, -0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL, -0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L, -0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, -0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, -0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, -0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL, -0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L, -0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, -0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, -0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, -0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL, -0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L, -0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, -0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, -0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, -0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L, -0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L, -0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, -0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, -0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, -0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL, -0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L, -}; - + +#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF]) +static unsigned long crc_c[256] = +{ +0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, +0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, +0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL, +0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L, +0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, +0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, +0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, +0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL, +0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL, +0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, +0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, +0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, +0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L, +0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL, +0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, +0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, +0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, +0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L, +0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L, +0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, +0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, +0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, +0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L, +0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L, +0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, +0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, +0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, +0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L, +0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L, +0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, +0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, +0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, +0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL, +0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L, +0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, +0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, +0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, +0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL, +0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL, +0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, +0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, +0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, +0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL, +0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L, +0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, +0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, +0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, +0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL, +0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L, +0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, +0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, +0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, +0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL, +0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L, +0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, +0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, +0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, +0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L, +0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L, +0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, +0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, +0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, +0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL, +0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L, +}; + static unsigned int sctp_crc32c(const unsigned char* buf, unsigned int len) { - unsigned int i; - unsigned long crc32 = ~0L; + unsigned int i; + unsigned long crc32 = ~0L; unsigned long result; unsigned char byte0,byte1,byte2,byte3; - for (i = 0; i < SOURCE_PORT_LENGTH + DESTINATION_PORT_LENGTH + VERIFICATION_TAG_LENGTH; i++) - { - CRC32C(crc32, buf[i]); + for (i = 0; i < SOURCE_PORT_LENGTH + DESTINATION_PORT_LENGTH + VERIFICATION_TAG_LENGTH; i++) + { + CRC32C(crc32, buf[i]); } CRC32C(crc32, 0); CRC32C(crc32, 0); CRC32C(crc32, 0); CRC32C(crc32, 0); - for (i = COMMON_HEADER_LENGTH; i < len; i++) - { - CRC32C(crc32, buf[i]); - } + for (i = COMMON_HEADER_LENGTH; i < len; i++) + { + CRC32C(crc32, buf[i]); + } result = ~crc32; - + byte0 = result & 0xff; byte1 = (result>>8) & 0xff; byte2 = (result>>16) & 0xff; @@ -610,7 +610,7 @@ sctp_crc32c(const unsigned char* buf, unsigned int len) return ( crc32 ); } -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -623,7 +623,7 @@ nr_of_padding_bytes (guint length) return 4 - remainder; } -/* +/* * TLV parameter stuff for INIT and INIT-ACK chunks */ @@ -636,7 +636,7 @@ dissect_error_cause(tvbuff_t *, packet_info *, proto_tree *); static gboolean dissect_sctp_chunk(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); -static void +static void dissect_tlv_parameter_list(tvbuff_t *parameter_list_tvb, packet_info *pinfo, proto_tree *tree) { guint offset, length, padding_length, total_length; @@ -649,7 +649,7 @@ dissect_tlv_parameter_list(tvbuff_t *parameter_list_tvb, packet_info *pinfo, pro total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ parameter_tvb = tvb_new_subset(parameter_list_tvb, offset, total_length, total_length); - dissect_parameter(parameter_tvb, pinfo, tree); + dissect_parameter(parameter_tvb, pinfo, tree); /* get rid of the handled parameter */ offset += total_length; } @@ -659,9 +659,9 @@ static void dissect_heartbeat_info_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, heartbeat_info_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + heartbeat_info_length = length - HEARTBEAT_INFO_PARAMETER_HEADER_LENGTH; proto_tree_add_text(parameter_tree, parameter_tvb, HEARTBEAT_INFO_PARAMETER_INFO_OFFSET, heartbeat_info_length, @@ -677,10 +677,10 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot { guint32 ipv4_address; - tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, PARAMETER_VALUE_OFFSET, IPV4_ADDRESS_LENGTH); + tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, PARAMETER_VALUE_OFFSET, IPV4_ADDRESS_LENGTH); proto_tree_add_ipv4(parameter_tree, hf_sctp_parameter_ipv4_address, parameter_tvb, PARAMETER_VALUE_OFFSET, IPV4_ADDRESS_LENGTH, - ipv4_address); + ipv4_address); proto_item_set_text(parameter_item, "IPV4 address parameter"); } @@ -690,7 +690,7 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot proto_tree_add_ipv6(parameter_tree, hf_sctp_parameter_ipv6_address, parameter_tvb, PARAMETER_VALUE_OFFSET, IPV6_ADDRESS_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, IPV6_ADDRESS_LENGTH)); - + proto_item_set_text(parameter_item, "IPV6 address parameter"); } @@ -698,9 +698,9 @@ static void dissect_state_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, state_cookie_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + state_cookie_length = length - STATE_COOKIE_PARAMETER_HEADER_LENGTH; proto_tree_add_text(parameter_tree, parameter_tvb, STATE_COOKIE_PARAMETER_COOKIE_OFFSET, state_cookie_length, @@ -722,11 +722,11 @@ dissect_unrecognized_parameters_parameter(tvbuff_t *parameter_tvb, packet_info * parameter_value_length = length - PARAMETER_HEADER_LENGTH + padding_length; - unrecognized_parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, + unrecognized_parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, parameter_value_length); unrecognized_parameter_type = tvb_get_ntohs(unrecognized_parameters_tvb, PARAMETER_TYPE_OFFSET); dissect_tlv_parameter_list(unrecognized_parameters_tvb, pinfo, parameter_tree); - + proto_item_set_text(parameter_item, "Unrecognized parameter of type %s (0x%x)", val_to_str(unrecognized_parameter_type, sctp_parameter_identifier_values, "unknown"), unrecognized_parameter_type); } @@ -737,12 +737,12 @@ dissect_cookie_preservative_parameter(tvbuff_t *parameter_tvb, proto_tree *param guint32 increment; increment = tvb_get_ntohl(parameter_tvb, COOKIE_PRESERVATIVE_PARAMETER_INCR_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_sctp_parameter_cookie_preservative_increment, parameter_tvb, - COOKIE_PRESERVATIVE_PARAMETER_INCR_OFFSET, + + proto_tree_add_uint(parameter_tree, hf_sctp_parameter_cookie_preservative_increment, parameter_tvb, + COOKIE_PRESERVATIVE_PARAMETER_INCR_OFFSET, COOKIE_PRESERVATIVE_PARAMETER_INCR_LENGTH, increment); - + proto_item_set_text(parameter_item, "Cookie preservative parameter requesting for a %u msec increment", increment); } @@ -754,7 +754,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, char *hostname; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + hostname_length = length - PARAMETER_HEADER_LENGTH; hostname = (char *)tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, hostname_length); proto_tree_add_string(parameter_tree, hf_sctp_parameter_hostname_hostname, parameter_tvb, @@ -780,7 +780,7 @@ dissect_supported_address_types_parameter(tvbuff_t *parameter_tvb, proto_tree *p "Supported Address Types (%u address type%s)", number_of_address_types, plurality(number_of_address_types, "", "s")); address_list_tree = proto_item_add_subtree(address_list_item, ett_sctp_supported_address_types_parameter); - + offset = PARAMETER_VALUE_OFFSET; for(address_type_number = 1; address_type_number <= number_of_address_types; address_type_number++) { address_type = tvb_get_ntohs(parameter_tvb, offset); @@ -803,7 +803,7 @@ dissect_ecn_parameter(proto_item *parameter_item) static void dissect_forward_tsn_supported_parameter(proto_item *parameter_item) -{ +{ proto_item_set_text(parameter_item, "Forward TSN supported parameter"); } @@ -823,7 +823,7 @@ dissect_add_ip_address_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pr correlation_id = tvb_get_ntohs(parameter_tvb, CORRELATION_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_sctp_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, correlation_id); address_tvb = tvb_new_subset(parameter_tvb, ADDRESS_PARAMETER_OFFSET, parameter_value_length, parameter_value_length); - dissect_parameter(address_tvb, pinfo, parameter_tree); + dissect_parameter(address_tvb, pinfo, parameter_tree); proto_item_set_text(parameter_item, "Add IP address parameter"); } @@ -840,7 +840,7 @@ dissect_del_ip_address_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pr correlation_id = tvb_get_ntohs(parameter_tvb, CORRELATION_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_sctp_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, correlation_id); address_tvb = tvb_new_subset(parameter_tvb, ADDRESS_PARAMETER_OFFSET, parameter_value_length, parameter_value_length); - dissect_parameter(address_tvb, pinfo, parameter_tree); + dissect_parameter(address_tvb, pinfo, parameter_tree); proto_item_set_text(parameter_item, "Delete IP address parameter"); } @@ -863,7 +863,7 @@ dissect_error_cause_indication_parameter(tvbuff_t *parameter_tvb, packet_info *p total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ error_cause_tvb = tvb_new_subset(parameter_tvb, offset , total_length, total_length); - dissect_error_cause(error_cause_tvb, pinfo, parameter_tree); + dissect_error_cause(error_cause_tvb, pinfo, parameter_tree); /* get rid of the handled parameter */ offset += total_length; } @@ -883,7 +883,7 @@ dissect_set_primary_address_parameter(tvbuff_t *parameter_tvb, packet_info *pinf correlation_id = tvb_get_ntohs(parameter_tvb, CORRELATION_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_sctp_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, correlation_id); address_tvb = tvb_new_subset(parameter_tvb, ADDRESS_PARAMETER_OFFSET, parameter_value_length, parameter_value_length); - dissect_parameter(address_tvb, pinfo, parameter_tree); + dissect_parameter(address_tvb, pinfo, parameter_tree); proto_item_set_text(parameter_item, "Set primary address parameter"); } @@ -892,10 +892,10 @@ static void dissect_success_report_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 correlation_id; - + correlation_id = tvb_get_ntohs(parameter_tvb, CORRELATION_ID_OFFSET); proto_tree_add_uint(parameter_tree, hf_sctp_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, correlation_id); - + proto_item_set_text(parameter_item, "Success report parameter"); } @@ -916,10 +916,10 @@ static void dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 type, length, parameter_value_length; - + type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - + parameter_value_length = length - PARAMETER_HEADER_LENGTH; proto_tree_add_text(parameter_tree, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, @@ -941,19 +941,19 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *chunk length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); total_length = length + padding_length; - + parameter_item = proto_tree_add_text(chunk_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "%s parameter", val_to_str(type, sctp_parameter_identifier_values, "Unknown")); parameter_tree = proto_item_add_subtree(parameter_item, ett_sctp_chunk_parameter); - - proto_tree_add_uint(parameter_tree, hf_sctp_chunk_parameter_type, + + proto_tree_add_uint(parameter_tree, hf_sctp_chunk_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_LENGTH, type); - proto_tree_add_uint(parameter_tree, hf_sctp_chunk_parameter_length, + proto_tree_add_uint(parameter_tree, hf_sctp_chunk_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); - + switch(type) { case HEARTBEAT_INFO_PARAMETER_ID: dissect_heartbeat_info_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -996,13 +996,13 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *chunk break; case SET_PRIMARY_ADDRESS_PARAMETER_ID: dissect_set_primary_address_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item); - break; + break; case SUCCESS_REPORT_PARAMETER_ID: dissect_success_report_parameter(parameter_tvb, parameter_tree, parameter_item); - break; + break; case ADAP_LAYER_INDICATION_PARAMETER_ID: dissect_adap_indication_parameter(parameter_tvb, parameter_tree, parameter_item); - break; + break; default: dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); break; @@ -1022,7 +1022,7 @@ dissect_invalid_stream_identifier_cause(tvbuff_t *cause_tvb, proto_tree *cause_t guint16 stream_identifier; stream_identifier = tvb_get_ntohs(cause_tvb, CAUSE_STREAM_IDENTIFIER_OFFSET); - proto_tree_add_uint(cause_tree, hf_sctp_cause_stream_identifier, + proto_tree_add_uint(cause_tree, hf_sctp_cause_stream_identifier, cause_tvb, CAUSE_STREAM_IDENTIFIER_OFFSET, CAUSE_STREAM_IDENTIFIER_LENGTH, stream_identifier); proto_tree_add_text(cause_tree, cause_tvb, CAUSE_RESERVED_OFFSET, CAUSE_RESERVED_LENGTH, @@ -1040,7 +1040,7 @@ dissect_missing_mandatory_parameters_cause(tvbuff_t *cause_tvb, proto_tree *caus guint offset; number_of_missing_parameters = tvb_get_ntohl(cause_tvb, CAUSE_NUMBER_OF_MISSING_PARAMETERS_OFFSET); - proto_tree_add_uint(cause_tree, hf_sctp_cause_number_of_missing_parameters, + proto_tree_add_uint(cause_tree, hf_sctp_cause_number_of_missing_parameters, cause_tvb, CAUSE_NUMBER_OF_MISSING_PARAMETERS_OFFSET, CAUSE_NUMBER_OF_MISSING_PARAMETERS_LENGTH, number_of_missing_parameters); offset = CAUSE_FIRST_MISSING_PARAMETER_TYPE_OFFSET; @@ -1062,12 +1062,12 @@ dissect_stale_cookie_error_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, pr guint32 measure_of_staleness; measure_of_staleness = tvb_get_ntohl(cause_tvb, CAUSE_MEASURE_OF_STALENESS_OFFSET); - - proto_tree_add_uint(cause_tree, hf_sctp_cause_measure_of_staleness, cause_tvb, - CAUSE_MEASURE_OF_STALENESS_OFFSET, + + proto_tree_add_uint(cause_tree, hf_sctp_cause_measure_of_staleness, cause_tvb, + CAUSE_MEASURE_OF_STALENESS_OFFSET, CAUSE_MEASURE_OF_STALENESS_LENGTH, measure_of_staleness); - + proto_item_set_text(cause_item, "Error cause reporting a measure of staleness of %u usec", measure_of_staleness); } @@ -1086,20 +1086,20 @@ dissect_unresolvable_address_cause(tvbuff_t *cause_tvb, packet_info *pinfo, prot code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); - + parameter_length = length - CAUSE_HEADER_LENGTH; - parameter_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, + parameter_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, parameter_length, parameter_length); dissect_parameter(parameter_tvb, pinfo, cause_tree); parameter_type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET); - + proto_item_set_text(cause_item, "Error cause reporting unresolvable address of type 0x%04x (%s)", parameter_type, val_to_str(parameter_type, sctp_parameter_identifier_values, "unknown") ); } static void -dissect_unrecognized_chunk_type_cause(tvbuff_t *cause_tvb, packet_info *pinfo, +dissect_unrecognized_chunk_type_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *cause_tree, proto_item *cause_item) { guint16 length, chunk_length; @@ -1107,14 +1107,14 @@ dissect_unrecognized_chunk_type_cause(tvbuff_t *cause_tvb, packet_info *pinfo, tvbuff_t *unrecognized_chunk_tvb; length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); - + chunk_length = length - CAUSE_HEADER_LENGTH; unrecognized_chunk_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, chunk_length, chunk_length); dissect_sctp_chunk(unrecognized_chunk_tvb, pinfo, cause_tree,cause_tree); unrecognized_type = tvb_get_guint8(unrecognized_chunk_tvb, CHUNK_TYPE_OFFSET); - + proto_item_set_text(cause_item, "Error cause reporting unrecognized chunk of type %u (%s)", unrecognized_type, val_to_str(unrecognized_type, sctp_chunk_type_values, "unknown")); @@ -1138,7 +1138,7 @@ dissect_unrecognized_parameters_cause(tvbuff_t *cause_tvb, packet_info *pinfo, p unrecognized_parameters_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, cause_info_length); dissect_tlv_parameter_list(unrecognized_parameters_tvb, pinfo, cause_tree); - + proto_item_set_text(cause_item, "Error cause reporting unrecognized parameters"); } @@ -1148,8 +1148,8 @@ dissect_no_user_data_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_it guint32 tsn; tsn = tvb_get_ntohl(cause_tvb, CAUSE_TSN_OFFSET); - proto_tree_add_uint(cause_tree, hf_sctp_cause_tsn, cause_tvb, - CAUSE_TSN_OFFSET, + proto_tree_add_uint(cause_tree, hf_sctp_cause_tsn, cause_tvb, + CAUSE_TSN_OFFSET, CAUSE_TSN_LENGTH, tsn); @@ -1172,7 +1172,7 @@ dissect_delete_last_address_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); cause_info_length = length - CAUSE_HEADER_LENGTH; parameter_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, cause_info_length); - dissect_parameter(parameter_tvb, pinfo, cause_tree); + dissect_parameter(parameter_tvb, pinfo, cause_tree); proto_item_set_text(cause_item, "Delete last address cause"); } @@ -1185,7 +1185,7 @@ dissect_resource_outage_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tre length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); cause_info_length = length - CAUSE_HEADER_LENGTH; parameter_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, cause_info_length); - dissect_parameter(parameter_tvb, pinfo, cause_tree); + dissect_parameter(parameter_tvb, pinfo, cause_tree); proto_item_set_text(cause_item, "Operation refused due to resource shortage"); } @@ -1198,7 +1198,7 @@ dissect_delete_source_address_cause(tvbuff_t *cause_tvb, packet_info *pinfo, pro length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); cause_info_length = length - CAUSE_HEADER_LENGTH; parameter_tvb = tvb_new_subset(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, cause_info_length); - dissect_parameter(parameter_tvb, pinfo, cause_tree); + dissect_parameter(parameter_tvb, pinfo, cause_tree); proto_item_set_text(cause_item, "Delete source address cause"); } @@ -1209,7 +1209,7 @@ dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *c code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); - + cause_info_length = length - CAUSE_HEADER_LENGTH; proto_tree_add_text(cause_tree, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, @@ -1236,14 +1236,14 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t CAUSE_HEADER_OFFSET, total_length, "BAD ERROR CAUSE"); cause_tree = proto_item_add_subtree(cause_item, ett_sctp_chunk_cause); - - proto_tree_add_uint(cause_tree, hf_sctp_cause_code, + + proto_tree_add_uint(cause_tree, hf_sctp_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, code); - proto_tree_add_uint(cause_tree, hf_sctp_cause_length, + proto_tree_add_uint(cause_tree, hf_sctp_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, length); - + switch(code) { case INVALID_STREAM_IDENTIFIER: dissect_invalid_stream_identifier_cause(cause_tvb, cause_tree, cause_item); @@ -1295,7 +1295,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t } /* - * Code to actually dissect the packets + * Code to actually dissect the packets */ static gboolean @@ -1345,13 +1345,13 @@ dissect_payload(tvbuff_t *payload_tvb, packet_info *pinfo, proto_tree *tree, gui static gboolean dissect_data_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) -{ +{ guint8 flags; guint16 length, total_payload_length, payload_length, padding_length, stream_id, stream_seq_number; guint32 tsn, payload_proto_id; proto_tree *flag_tree; tvbuff_t *payload_tvb; - + length = tvb_get_ntohs(chunk_tvb, CHUNK_LENGTH_OFFSET); payload_length = length - DATA_CHUNK_HEADER_LENGTH; padding_length = nr_of_padding_bytes(length); @@ -1362,7 +1362,7 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, if (chunk_tree) { flags = tvb_get_guint8(chunk_tvb, CHUNK_FLAGS_OFFSET); - + flag_tree = proto_item_add_subtree(flags_item, ett_sctp_data_chunk_flags); proto_tree_add_boolean(flag_tree, hf_sctp_data_chunk_e_bit, chunk_tvb, CHUNK_FLAGS_OFFSET, CHUNK_FLAGS_LENGTH, flags); @@ -1370,24 +1370,24 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, CHUNK_FLAGS_OFFSET, CHUNK_FLAGS_LENGTH, flags); proto_tree_add_boolean(flag_tree, hf_sctp_data_chunk_u_bit, chunk_tvb, CHUNK_FLAGS_OFFSET, CHUNK_FLAGS_LENGTH, flags); - + tsn = tvb_get_ntohl(chunk_tvb, DATA_CHUNK_TSN_OFFSET); stream_id = tvb_get_ntohs(chunk_tvb, DATA_CHUNK_STREAM_ID_OFFSET); stream_seq_number = tvb_get_ntohs(chunk_tvb, DATA_CHUNK_STREAM_SEQ_NUMBER_OFFSET); - - proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_tsn, + + proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_tsn, chunk_tvb, DATA_CHUNK_TSN_OFFSET, DATA_CHUNK_TSN_LENGTH, tsn); - proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_stream_id, - chunk_tvb, + proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_stream_id, + chunk_tvb, DATA_CHUNK_STREAM_ID_OFFSET, DATA_CHUNK_STREAM_ID_LENGTH, stream_id); - proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_stream_seq_number, - chunk_tvb, + proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_stream_seq_number, + chunk_tvb, DATA_CHUNK_STREAM_SEQ_NUMBER_OFFSET, DATA_CHUNK_STREAM_SEQ_NUMBER_LENGTH, stream_seq_number); - proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_payload_proto_id, + proto_tree_add_uint(chunk_tree, hf_sctp_data_chunk_payload_proto_id, chunk_tvb, DATA_CHUNK_PAYLOAD_PROTOCOL_ID_OFFSET, DATA_CHUNK_PAYLOAD_PROTOCOL_ID_LENGTH, payload_proto_id); if (padding_length > 0) @@ -1396,25 +1396,25 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, padding_length, plurality(padding_length, "", "s")); proto_item_set_text(chunk_item, "DATA chunk with TSN %u (%u:%u) containing %u byte%s of payload", - tsn, stream_id, stream_seq_number, + tsn, stream_id, stream_seq_number, payload_length, plurality(payload_length, "", "s")); proto_item_set_len(chunk_item, DATA_CHUNK_HEADER_LENGTH); - }; - return dissect_payload(payload_tvb, pinfo, tree, payload_proto_id); + }; + return dissect_payload(payload_tvb, pinfo, tree, payload_proto_id); } static void dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 initiate_tag, adv_rec_window_credit, initial_tsn; guint16 number_of_inbound_streams, number_of_outbound_streams; guint8 type; tvbuff_t *parameter_list_tvb; type = tvb_get_guint8(chunk_tvb, CHUNK_TYPE_OFFSET); - + if (check_col(pinfo->cinfo, COL_INFO)) { if (type == SCTP_INIT_CHUNK_ID) { col_append_str(pinfo->cinfo, COL_INFO, "INIT "); @@ -1422,66 +1422,66 @@ dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, col_append_str(pinfo->cinfo, COL_INFO, "INIT_ACK "); }; }; - + if (chunk_tree) { initiate_tag = tvb_get_ntohl(chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET); adv_rec_window_credit = tvb_get_ntohl(chunk_tvb, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET); number_of_inbound_streams = tvb_get_ntohs(chunk_tvb, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_OFFSET); number_of_outbound_streams = tvb_get_ntohs(chunk_tvb, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_OFFSET); initial_tsn = tvb_get_ntohl(chunk_tvb, INIT_CHUNK_INITIAL_TSN_OFFSET); - + /* handle fixed parameters */ - proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_initiate_tag, + proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_initiate_tag, chunk_tvb, INIT_CHUNK_INITIATE_TAG_OFFSET, INIT_CHUNK_INITIATE_TAG_LENGTH, initiate_tag); - proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_adv_rec_window_credit, + proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_adv_rec_window_credit, chunk_tvb, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET, INIT_CHUNK_ADV_REC_WINDOW_CREDIT_LENGTH, adv_rec_window_credit); - proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_number_of_outbound_streams, + proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_number_of_outbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_OUTBOUND_STREAMS_LENGTH, number_of_outbound_streams); - proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_number_of_inbound_streams, + proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_number_of_inbound_streams, chunk_tvb, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_OFFSET, INIT_CHUNK_NUMBER_OF_INBOUND_STREAMS_LENGTH, number_of_inbound_streams); - proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_initial_tsn, + proto_tree_add_uint(chunk_tree, hf_sctp_init_chunk_initial_tsn, chunk_tvb, INIT_CHUNK_INITIAL_TSN_OFFSET, INIT_CHUNK_INITIAL_TSN_LENGTH, initial_tsn); - + /* handle variable paramters */ parameter_list_tvb = tvb_new_subset(chunk_tvb, INIT_CHUNK_VARIABLE_LENGTH_PARAMETER_OFFSET, -1, -1); dissect_tlv_parameter_list(parameter_list_tvb, pinfo, chunk_tree); - - proto_item_set_text(chunk_item, + + proto_item_set_text(chunk_item, "%s chunk requesting for %u outbound stream%s and accepting up to %u inbound stream%s", val_to_str(type, sctp_chunk_type_values, "unknown"), number_of_outbound_streams, plurality(number_of_outbound_streams, "", "s"), number_of_inbound_streams, plurality(number_of_inbound_streams, "", "s")); } -} +} static void dissect_init_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ dissect_init_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); -} +} static void dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 cumulative_tsn_ack, adv_rec_window_credit, dup_tsn; guint16 number_of_gap_blocks, number_of_dup_tsns; guint16 gap_block_number, dup_tsn_number, start, end; gint gap_block_offset, dup_tsn_offset; proto_item *block_item; proto_tree *block_tree; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "SACK "); @@ -1490,24 +1490,24 @@ dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, adv_rec_window_credit = tvb_get_ntohl(chunk_tvb, SACK_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET); number_of_gap_blocks = tvb_get_ntohs(chunk_tvb, SACK_CHUNK_NUMBER_OF_GAP_BLOCKS_OFFSET); number_of_dup_tsns = tvb_get_ntohs(chunk_tvb, SACK_CHUNK_NUMBER_OF_DUP_TSNS_OFFSET); - - proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_cumulative_tsn_ack, + + proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_cumulative_tsn_ack, chunk_tvb, SACK_CHUNK_CUMULATIVE_TSN_ACK_OFFSET, SACK_CHUNK_CUMULATIVE_TSN_ACK_LENGTH, cumulative_tsn_ack); - proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_adv_rec_window_credit, + proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_adv_rec_window_credit, chunk_tvb, SACK_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET, SACK_CHUNK_ADV_REC_WINDOW_CREDIT_LENGTH, adv_rec_window_credit); - proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_number_of_gap_blocks, + proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_number_of_gap_blocks, chunk_tvb, SACK_CHUNK_NUMBER_OF_GAP_BLOCKS_OFFSET, SACK_CHUNK_NUMBER_OF_GAP_BLOCKS_LENGTH, number_of_gap_blocks); - proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_number_of_dup_tsns, + proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_number_of_dup_tsns, chunk_tvb, SACK_CHUNK_NUMBER_OF_DUP_TSNS_OFFSET, SACK_CHUNK_NUMBER_OF_DUP_TSNS_LENGTH, number_of_dup_tsns); - + /* handle the gap acknowledgement blocks */ gap_block_offset = SACK_CHUNK_GAP_BLOCK_OFFSET; for(gap_block_number = 1; gap_block_number <= number_of_gap_blocks; gap_block_number++) { @@ -1518,35 +1518,35 @@ dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, "Gap Acknowledgement for %u TSN%s", 1 + end - start, plurality(1 + end - start, "", "s")); block_tree = proto_item_add_subtree(block_item, ett_sctp_sack_chunk_gap_block); - proto_tree_add_uint(block_tree, hf_sctp_sack_chunk_gap_block_start, + proto_tree_add_uint(block_tree, hf_sctp_sack_chunk_gap_block_start, chunk_tvb, gap_block_offset, SACK_CHUNK_GAP_BLOCK_START_LENGTH, start); - proto_tree_add_uint(block_tree, hf_sctp_sack_chunk_gap_block_end, + proto_tree_add_uint(block_tree, hf_sctp_sack_chunk_gap_block_end, chunk_tvb, gap_block_offset + SACK_CHUNK_GAP_BLOCK_START_LENGTH, SACK_CHUNK_GAP_BLOCK_END_LENGTH, end); gap_block_offset += SACK_CHUNK_GAP_BLOCK_LENGTH; }; - + /* handle the duplicate TSNs */ dup_tsn_offset = SACK_CHUNK_GAP_BLOCK_OFFSET + number_of_gap_blocks * SACK_CHUNK_GAP_BLOCK_LENGTH; for(dup_tsn_number = 1; dup_tsn_number <= number_of_dup_tsns; dup_tsn_number++) { dup_tsn = tvb_get_ntohl(chunk_tvb, dup_tsn_offset); - proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_duplicate_tsn, + proto_tree_add_uint(chunk_tree, hf_sctp_sack_chunk_duplicate_tsn, chunk_tvb, dup_tsn, SACK_CHUNK_DUP_TSN_LENGTH, dup_tsn); dup_tsn_offset += SACK_CHUNK_DUP_TSN_LENGTH; } - - proto_item_set_text(chunk_item, + + proto_item_set_text(chunk_item, "SACK chunk acknowledging TSN %u and reporting %u gap%s and %u duplicate TSN%s", cumulative_tsn_ack, number_of_gap_blocks, plurality(number_of_gap_blocks, "", "s"), number_of_dup_tsns, plurality(number_of_dup_tsns, "", "s")); - } + } } static void @@ -1555,7 +1555,7 @@ dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, { tvbuff_t *parameter_tvb; guint chunk_length, info_length, padding_length, total_length; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "HEARTBEAT "); @@ -1565,20 +1565,20 @@ dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, padding_length = nr_of_padding_bytes(info_length); total_length = info_length + padding_length; parameter_tvb = tvb_new_subset(chunk_tvb, HEARTBEAT_CHUNK_INFO_OFFSET, total_length, total_length); - + dissect_parameter(parameter_tvb, pinfo, chunk_tree); - + proto_item_set_text(chunk_item, "HEARTBEAT chunk"); } } - + static void dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ tvbuff_t *parameter_tvb; guint chunk_length, info_length, padding_length, total_length; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "HEARTBEAT_ACK "); @@ -1589,11 +1589,11 @@ dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, total_length = info_length + padding_length; parameter_tvb = tvb_new_subset(chunk_tvb, HEARTBEAT_CHUNK_INFO_OFFSET, total_length, total_length); - + dissect_parameter(parameter_tvb, pinfo, chunk_tree); - + proto_item_set_text(chunk_item, "HEARTBEAT ACK chunk"); - } + } } static void @@ -1620,58 +1620,58 @@ dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_t total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ cause_tvb = tvb_new_subset(chunk_tvb, offset, total_length, total_length); - dissect_error_cause(cause_tvb, pinfo, chunk_tree); + dissect_error_cause(cause_tvb, pinfo, chunk_tree); /* get rid of the handled parameter */ offset += total_length; number_of_causes++; }; - + proto_item_set_text(chunk_item, "Abort chunk with %u cause%s", number_of_causes, plurality(number_of_causes, "", "s")); - } + } } static void dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 cumulative_tsn_ack; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "SHUTDOWN "); if (chunk_tree) { cumulative_tsn_ack = tvb_get_ntohl(chunk_tvb, SHUTDOWN_CHUNK_CUMULATIVE_TSN_ACK_OFFSET); - proto_tree_add_uint(chunk_tree, hf_sctp_shutdown_chunk_cumulative_tsn_ack, + proto_tree_add_uint(chunk_tree, hf_sctp_shutdown_chunk_cumulative_tsn_ack, chunk_tvb, SHUTDOWN_CHUNK_CUMULATIVE_TSN_ACK_OFFSET, SHUTDOWN_CHUNK_CUMULATIVE_TSN_ACK_LENGTH, cumulative_tsn_ack); - + proto_item_set_text(chunk_item, "SHUTDOWN chunk acknowledging up to TSN %u", cumulative_tsn_ack); - } + } } static void dissect_shutdown_ack_chunk(packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "SHUTDOWN_ACK "); if (chunk_tree) { proto_item_set_text(chunk_item, "SHUTDOWN ACK chunk"); - } + } } static void dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint offset, number_of_causes; guint16 length, padding_length, total_length; tvbuff_t *cause_tvb; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "ERROR "); @@ -1684,117 +1684,117 @@ dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ cause_tvb = tvb_new_subset(chunk_tvb, offset, total_length, total_length); - dissect_error_cause(cause_tvb, pinfo, chunk_tree); + dissect_error_cause(cause_tvb, pinfo, chunk_tree); /* get rid of the handled parameter */ offset += total_length; number_of_causes++; } while(tvb_reported_length_remaining(chunk_tvb, offset)); - + proto_item_set_text(chunk_item, "Error chunk with %u cause%s", number_of_causes, plurality(number_of_causes, "", "s")); - } + } } static void dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint length, cookie_length, padding_length; length = tvb_get_ntohs(chunk_tvb, CHUNK_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); cookie_length = length - CHUNK_HEADER_LENGTH; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "COOKIE_ECHO "); - if (chunk_tree) { + if (chunk_tree) { proto_tree_add_text(chunk_tree, chunk_tvb, COOKIE_ECHO_CHUNK_COOKIE_OFFSET, cookie_length, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s")); proto_item_set_text(chunk_item, "COOKIE ECHO chunk containing a cookie of %u byte%s", cookie_length, plurality(cookie_length, "", "s")); - + if (padding_length > 0) proto_tree_add_text(chunk_tree, chunk_tvb, CHUNK_HEADER_OFFSET + length, padding_length, "Padding: %u byte%s", padding_length, plurality(padding_length, "", "s")); - } + } } static void dissect_cookie_ack_chunk(packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "COOKIE_ACK "); if (chunk_tree) { proto_item_set_text(chunk_item, "COOKIE ACK chunk"); - } + } } static void dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 lowest_tsn; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "ECNE "); if (chunk_tree) { lowest_tsn = tvb_get_ntohl(chunk_tvb, ECNE_CHUNK_LOWEST_TSN_OFFSET); - proto_tree_add_uint(chunk_tree, hf_sctp_ecne_chunk_lowest_tsn, + proto_tree_add_uint(chunk_tree, hf_sctp_ecne_chunk_lowest_tsn, chunk_tvb, ECNE_CHUNK_LOWEST_TSN_OFFSET, ECNE_CHUNK_LOWEST_TSN_LENGTH, lowest_tsn); - + proto_item_set_text(chunk_item, "ECNE chunk"); - } + } } static void dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 lowest_tsn; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "CWR "); if (chunk_tree) { lowest_tsn = tvb_get_ntohl(chunk_tvb, CWR_CHUNK_LOWEST_TSN_OFFSET); - proto_tree_add_uint(chunk_tree, hf_sctp_cwr_chunk_lowest_tsn, + proto_tree_add_uint(chunk_tree, hf_sctp_cwr_chunk_lowest_tsn, chunk_tvb, CWR_CHUNK_LOWEST_TSN_OFFSET, CWR_CHUNK_LOWEST_TSN_LENGTH, lowest_tsn); - + proto_item_set_text(chunk_item, "CWR chunk"); - } + } } static void dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) -{ +{ guint8 flags; guint16 length; proto_tree *flag_tree; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "SHUTDOWN_COMPLETE "); if (chunk_tree) { flags = tvb_get_guint8(chunk_tvb, CHUNK_FLAGS_OFFSET); length = tvb_get_ntohs(chunk_tvb, CHUNK_LENGTH_OFFSET); - + flag_tree = proto_item_add_subtree(flags_item, ett_sctp_shutdown_complete_chunk_flags); proto_tree_add_boolean(flag_tree, hf_sctp_shutdown_complete_chunk_t_bit, chunk_tvb, CHUNK_FLAGS_OFFSET, CHUNK_FLAGS_LENGTH, flags); - + proto_item_set_text(chunk_item, "SHUTDOWN COMPLETE chunk"); - } + } } #define FORWARD_TSN_CHUNK_TSN_LENGTH 4 @@ -1806,11 +1806,11 @@ dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, static void dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 tsn; guint offset; guint16 number_of_affected_streams, affected_stream, length, sid, ssn; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "FORWARD TSN "); @@ -1821,18 +1821,18 @@ dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *c number_of_affected_streams = (length - CHUNK_HEADER_LENGTH - FORWARD_TSN_CHUNK_TSN_LENGTH) / (FORWARD_TSN_CHUNK_SID_LENGTH + FORWARD_TSN_CHUNK_SSN_LENGTH); offset = CHUNK_VALUE_OFFSET + FORWARD_TSN_CHUNK_TSN_LENGTH; - + for(affected_stream = 0; affected_stream < number_of_affected_streams; affected_stream++) { sid = tvb_get_ntohs(chunk_tvb, offset + FORWARD_TSN_CHUNK_SID_OFFSET); ssn = tvb_get_ntohs(chunk_tvb, offset + FORWARD_TSN_CHUNK_SSN_OFFSET); - proto_tree_add_uint(chunk_tree, hf_sctp_forward_tsn_chunk_sid, + proto_tree_add_uint(chunk_tree, hf_sctp_forward_tsn_chunk_sid, chunk_tvb, offset + FORWARD_TSN_CHUNK_SID_OFFSET, FORWARD_TSN_CHUNK_SID_LENGTH, sid); - proto_tree_add_uint(chunk_tree, hf_sctp_forward_tsn_chunk_ssn, + proto_tree_add_uint(chunk_tree, hf_sctp_forward_tsn_chunk_ssn, chunk_tvb, offset + FORWARD_TSN_CHUNK_SSN_OFFSET, FORWARD_TSN_CHUNK_SSN_LENGTH, ssn); offset = offset + (FORWARD_TSN_CHUNK_SID_LENGTH + FORWARD_TSN_CHUNK_SSN_LENGTH); } proto_item_set_text(chunk_item, "FORWARD TSN chunk (new cumulative TSN %u)", tsn); - } + } } #define SERIAL_NUMBER_LENGTH 4 @@ -1840,7 +1840,7 @@ dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *c static void dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 serial_number; guint offset, length, padding_length, total_length; tvbuff_t *parameter_tvb; @@ -1854,23 +1854,23 @@ dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_ proto_tree_add_uint(chunk_tree, hf_sctp_asconf_serial, chunk_tvb, offset, SERIAL_NUMBER_LENGTH, serial_number); offset += SERIAL_NUMBER_LENGTH; proto_item_set_text(chunk_item, "ASCONF chunk"); - + while(tvb_reported_length_remaining(chunk_tvb, offset)) { length = tvb_get_ntohs(chunk_tvb, offset + PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ parameter_tvb = tvb_new_subset(chunk_tvb, offset, total_length, total_length); - dissect_parameter(parameter_tvb, pinfo, chunk_tree); + dissect_parameter(parameter_tvb, pinfo, chunk_tree); /* get rid of the handled parameter */ offset += total_length; } - } + } } static void dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint32 serial_number; guint offset, length, padding_length, total_length; tvbuff_t *parameter_tvb; @@ -1882,7 +1882,7 @@ dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *ch serial_number = tvb_get_ntohl(chunk_tvb, SERIAL_NUMBER_OFFSET); proto_tree_add_uint(chunk_tree, hf_sctp_asconf_ack_serial, chunk_tvb, SERIAL_NUMBER_OFFSET, SERIAL_NUMBER_LENGTH, serial_number); proto_item_set_text(chunk_item, "ASCONF-ACK chunk"); - + offset = SERIAL_NUMBER_OFFSET + SERIAL_NUMBER_LENGTH; while(tvb_reported_length_remaining(chunk_tvb, offset)) { length = tvb_get_ntohs(chunk_tvb, offset + PARAMETER_LENGTH_OFFSET); @@ -1890,20 +1890,20 @@ dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *ch total_length = length + padding_length; /* create a tvb for the chunk including the padding bytes */ parameter_tvb = tvb_new_subset(chunk_tvb, offset, total_length, total_length); - dissect_parameter(parameter_tvb, pinfo, chunk_tree); + dissect_parameter(parameter_tvb, pinfo, chunk_tree); /* get rid of the handled parameter */ offset += total_length; } - } + } } static void dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) -{ +{ guint length, chunk_value_length, padding_length; guint8 type; - + if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN "); @@ -1911,27 +1911,27 @@ dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, length = tvb_get_ntohs(chunk_tvb, CHUNK_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); type = tvb_get_guint8(chunk_tvb, CHUNK_TYPE_OFFSET); - + chunk_value_length = length - CHUNK_HEADER_LENGTH; - + proto_tree_add_text(chunk_tree, chunk_tvb, CHUNK_VALUE_OFFSET, chunk_value_length, "Chunk value (%u byte%s)", chunk_value_length, plurality(chunk_value_length, "", "s")); - + if (padding_length > 0) proto_tree_add_text(chunk_tree, chunk_tvb, CHUNK_HEADER_OFFSET + length, padding_length, "Padding: %u byte%s", padding_length, plurality(padding_length, "", "s")); - + proto_item_set_text(chunk_item, "Chunk of type %u and %u byte%s value", type, chunk_value_length, plurality(chunk_value_length, "", "s")); } -} +} static gboolean dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *sctp_tree) -{ +{ guint8 type, flags; guint16 length; gboolean result; @@ -1940,17 +1940,17 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, pr proto_tree *chunk_tree; result = FALSE; - + /* first extract the chunk header */ type = tvb_get_guint8(chunk_tvb, CHUNK_TYPE_OFFSET); flags = tvb_get_guint8(chunk_tvb, CHUNK_FLAGS_OFFSET); length = tvb_get_ntohs(chunk_tvb, CHUNK_LENGTH_OFFSET); - + if (tree) { /* create proto_tree stuff */ chunk_item = proto_tree_add_text(sctp_tree, chunk_tvb, CHUNK_HEADER_OFFSET, -1, "Incomplete chunk"); chunk_tree = proto_item_add_subtree(chunk_item, ett_sctp_chunk); - + /* then insert the chunk header components into the protocol tree */ proto_tree_add_uint(chunk_tree, hf_sctp_chunk_type, chunk_tvb, CHUNK_TYPE_OFFSET, CHUNK_TYPE_LENGTH, type); flags_item = proto_tree_add_uint(chunk_tree, hf_sctp_chunk_flags, chunk_tvb, CHUNK_FLAGS_OFFSET, CHUNK_FLAGS_LENGTH, flags); @@ -1960,7 +1960,7 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, pr chunk_item = NULL; flags_item = NULL; }; - + /* now dissect the chunk value */ switch(type) { @@ -1975,7 +1975,7 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, pr break; case SCTP_SACK_CHUNK_ID: dissect_sack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); - break; + break; case SCTP_HEARTBEAT_CHUNK_ID: dissect_heartbeat_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; @@ -2027,7 +2027,7 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, pr static void dissect_sctp_chunks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *sctp_item, proto_tree *sctp_tree) -{ +{ tvbuff_t *chunk_tvb; guint16 length, padding_length, total_length; gint last_offset, offset; @@ -2061,7 +2061,7 @@ dissect_sctp_chunks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i offset += total_length; } }; - if (!sctp_item_length_set && (tree)) { + if (!sctp_item_length_set && (tree)) { proto_item_set_len(sctp_item, offset - last_offset); }; } @@ -2092,20 +2092,20 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->destport = destination_port; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCTP"); /* Clear entries in Info column on summary display */ if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, ""); - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { /* create the sctp protocol tree */ sctp_item = proto_tree_add_item(tree, proto_sctp, tvb, 0, -1, FALSE); sctp_tree = proto_item_add_subtree(sctp_item, ett_sctp); - + /* add the components of the common header to the protocol tree */ proto_tree_add_uint(sctp_tree, hf_sctp_source_port, tvb, SOURCE_PORT_OFFSET, SOURCE_PORT_LENGTH, source_port); proto_tree_add_uint(sctp_tree, hf_sctp_destination_port, tvb, DESTINATION_PORT_OFFSET, DESTINATION_PORT_LENGTH, destination_port); @@ -2125,8 +2125,8 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, checksum, "Checksum: 0x%08x (correct Adler32)", checksum); else - proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, - checksum, "Checksum: 0x%08x (incorrect Adler32, should be 0x%08x)", checksum, calculated_adler32); + proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, + checksum, "Checksum: 0x%08x (incorrect Adler32, should be 0x%08x)", checksum, calculated_adler32); proto_tree_add_boolean_hidden(sctp_tree, hf_sctp_checksum_bad, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, !(adler32_correct)); break; case SCTP_CHECKSUM_CRC32C: @@ -2136,8 +2136,8 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, checksum, "Checksum: 0x%08x (correct CRC32C)", checksum); else - proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, - checksum, "Checksum: 0x%08x (incorrect CRC32C, should be 0x%08x)", checksum, calculated_crc32c); + proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, + checksum, "Checksum: 0x%08x (incorrect CRC32C, should be 0x%08x)", checksum, calculated_crc32c); proto_tree_add_boolean_hidden(sctp_tree, hf_sctp_checksum_bad, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, !(crc32c_correct)); break; case SCTP_CHECKSUM_AUTOMATIC: @@ -2155,7 +2155,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, checksum, "Checksum: 0x%08x (correct Adler32 and CRC32C)", checksum); else - proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, + proto_tree_add_uint_format(sctp_tree, hf_sctp_checksum, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, checksum, "Checksum: 0x%08x (incorrect, should be 0x%08x (Adler32) or 0x%08x (CRC32C))", checksum, calculated_adler32, calculated_crc32c); proto_tree_add_boolean_hidden(sctp_tree, hf_sctp_checksum_bad, tvb, CHECKSUM_OFFSET, CHECKSUM_LENGTH, !(crc32c_correct || adler32_correct)); @@ -2172,170 +2172,170 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_sctp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_sctp_source_port, { "Source port", "sctp.srcport", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sctp_destination_port, { "Destination port", "sctp.dstport", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sctp_port, { "Port", "sctp.port", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sctp_verification_tag, { "Verification tag", "sctp.verfication_tag", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_sctp_checksum, { "Checksum", "sctp.checksum", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_sctp_checksum_bad, { "Bad checksum", "sctp.checksum_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_sctp_chunk_type, { "Identifier", "sctp.chunk_type", - FT_UINT8, BASE_DEC, VALS(sctp_chunk_type_values), 0x0, + FT_UINT8, BASE_DEC, VALS(sctp_chunk_type_values), 0x0, "", HFILL } }, { &hf_sctp_chunk_flags, { "Flags", "sctp.chunk_flags", - FT_UINT8, BASE_BIN, NULL, 0x0, + FT_UINT8, BASE_BIN, NULL, 0x0, "", HFILL } }, { &hf_sctp_chunk_length, { "Length", "sctp.chunk_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sctp_init_chunk_initiate_tag, { "Initiate tag", "sctp.init.chunk.initiate.tag", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_sctp_init_chunk_adv_rec_window_credit, { "Advertised reciever window credit (a_rwnd)", "sctp.init.chunk.credit", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sctp_init_chunk_number_of_outbound_streams, { "Number of outbound streams", "sctp.init.chunk.nr.out.streams", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sctp_init_chunk_number_of_inbound_streams, { "Number of inbound streams", "sctp.init.chunk.nr.in.streams", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_init_chunk_initial_tsn, { "Initial TSN", "sctp.init.chunk.initial.tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_cumulative_tsn_ack, { "Cumulative TSN Ack", "sctp.cumulative.tsn.ack", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_data_chunk_tsn, { "TSN", "sctp.tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_data_chunk_stream_id, { "Stream Identifier", "sctp.stream_id", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } }, {&hf_sctp_data_chunk_stream_seq_number, { "Stream sequence number", "sctp.stream_seq_number", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_data_chunk_payload_proto_id, { "Payload protocol identifier", "sctp.payload_proto_id", - FT_UINT32, BASE_DEC, VALS(sctp_payload_proto_id_values), 0x0, + FT_UINT32, BASE_DEC, VALS(sctp_payload_proto_id_values), 0x0, "", HFILL } }, {&hf_sctp_data_chunk_e_bit, { "E-Bit", "sctp.data.e_bit", - FT_BOOLEAN, 8, TFS(&sctp_data_chunk_e_bit_value), SCTP_DATA_CHUNK_E_BIT, + FT_BOOLEAN, 8, TFS(&sctp_data_chunk_e_bit_value), SCTP_DATA_CHUNK_E_BIT, "", HFILL } }, {&hf_sctp_data_chunk_b_bit, { "B-Bit", "sctp.data.b_bit", - FT_BOOLEAN, 8, TFS(&sctp_data_chunk_b_bit_value), SCTP_DATA_CHUNK_B_BIT, + FT_BOOLEAN, 8, TFS(&sctp_data_chunk_b_bit_value), SCTP_DATA_CHUNK_B_BIT, "", HFILL } }, {&hf_sctp_data_chunk_u_bit, { "U-Bit", "sctp.data.u.bit", - FT_BOOLEAN, 8, TFS(&sctp_data_chunk_u_bit_value), SCTP_DATA_CHUNK_U_BIT, + FT_BOOLEAN, 8, TFS(&sctp_data_chunk_u_bit_value), SCTP_DATA_CHUNK_U_BIT, "", HFILL } }, {&hf_sctp_sack_chunk_cumulative_tsn_ack, { "Cumulative TSN ACK", "sctp.sack.cumulative_tsn_ack", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_sack_chunk_adv_rec_window_credit, { "Advertised receiver window credit (a_rwnd)", "sctp.sack.a_rwnd", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_sack_chunk_number_of_gap_blocks, { "Number of gap acknowldgement blocks ", "sctp.sack.number_of_gap_blocks", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_sack_chunk_number_of_dup_tsns, { "Number of duplicated TSNs", "sctp.sack.number_of_duplicated_tsns", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_sack_chunk_gap_block_start, { "Start", "sctp.sack.gap_block_start", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_sack_chunk_gap_block_end, { "End", "sctp.sack.gap_block_end", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_sack_chunk_duplicate_tsn, { "Duplicate TSN", "sctp.sack.duplicate.tsn", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_shutdown_chunk_cumulative_tsn_ack, { "Cumulative TSN Ack", "sctp.shutdown.cumulative_tsn_ack", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_ecne_chunk_lowest_tsn, { "Lowest TSN", "sctp.ecne.lowest_tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_cwr_chunk_lowest_tsn, { "Lowest TSN", "sctp.cwr.lowest_tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_shutdown_complete_chunk_t_bit, { "T-Bit", "sctp.shutdown_complete.t_bit", FT_BOOLEAN, 8, TFS(&sctp_shutdown_complete_chunk_t_bit_value), SCTP_SHUTDOWN_COMPLETE_CHUNK_T_BIT, @@ -2348,19 +2348,19 @@ proto_register_sctp(void) }, {&hf_sctp_forward_tsn_chunk_tsn, { "New cumulative TSN", "sctp.forward_tsn.tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_forward_tsn_chunk_sid, { "Stream identifier", "sctp.forward_tsn.sid", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_forward_tsn_chunk_ssn, { "Stream sequence number", "sctp.forward_tsn.ssn", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_chunk_parameter_type, { "Parameter type", "sctp.parameter.type", FT_UINT16, BASE_HEX, VALS(sctp_parameter_identifier_values), 0x0, @@ -2368,7 +2368,7 @@ proto_register_sctp(void) }, {&hf_sctp_chunk_parameter_length, { "Parameter length", "sctp.parameter.length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_parameter_ipv4_address, @@ -2383,59 +2383,59 @@ proto_register_sctp(void) }, {&hf_sctp_parameter_cookie_preservative_increment, { "Suggested Cookie life-span increment (msec)", "sctp.parameter.cookie_preservative_incr", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_parameter_hostname_hostname, { "Hostname", "sctp.parameter.hostname.hostname", - FT_STRING, BASE_NONE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_supported_address_types_parameter, { "Supported address type", "sctp.parameter.supported_addres_type", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_asconf_serial, { "Serial Number", "sctp.asconf.serial_number", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_asconf_ack_serial, { "Serial Number", "sctp.asconf_ack.serial_number", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_correlation_id, { "Correlation_id", "sctp.correlation_id", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, {&hf_sctp_adap_indication, { "Indication", "sctp.adapation_layer_indication.indication", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_cause_code, { "Cause code", "sctp.cause.code", - FT_UINT16, BASE_HEX, VALS(sctp_cause_code_values), 0x0, + FT_UINT16, BASE_HEX, VALS(sctp_cause_code_values), 0x0, "", HFILL } }, {&hf_sctp_cause_length, { "Cause length", "sctp.cause.length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_cause_stream_identifier, { "Stream identifier", "sctp.cause.stream_identifier", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_cause_number_of_missing_parameters, { "Number of missing parameters", "sctp.cause.nr_of_missing_parameters", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sctp_cause_missing_parameter_type, { "Missing parameter type", "sctp.cause.missing_parameter_type", FT_UINT16, BASE_HEX, VALS(sctp_parameter_identifier_values), 0x0, @@ -2443,16 +2443,16 @@ proto_register_sctp(void) }, {&hf_sctp_cause_measure_of_staleness, { "Measure of staleness in usec", "sctp.cause.measure_of_staleness", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sctp_cause_tsn, { "TSN", "sctp.cause.tsn", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_sctp, @@ -2466,7 +2466,7 @@ proto_register_sctp(void) &ett_sctp_supported_address_types_parameter, &ett_sctp_unrecognized_parameter_parameter, }; - + static enum_val_t sctp_checksum_options[] = { { "None", SCTP_CHECKSUM_NONE }, { "Adler 32", SCTP_CHECKSUM_ADLER32 }, @@ -2474,7 +2474,7 @@ proto_register_sctp(void) { "Automatic", SCTP_CHECKSUM_AUTOMATIC}, { NULL, 0 } }; - + /* Register the protocol name and description */ proto_sctp = proto_register_protocol("Stream Control Transmission Protocol", "SCTP", "sctp"); sctp_module = prefs_register_protocol(proto_sctp, NULL); diff --git a/packet-sdp.c b/packet-sdp.c index ceefcd3142..71cf27569e 100644 --- a/packet-sdp.c +++ b/packet-sdp.c @@ -4,22 +4,22 @@ * Jason Lango <jal@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-sdp.c,v 1.32 2002/08/19 12:57:12 guy Exp $ + * $Id: packet-sdp.c,v 1.33 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -261,7 +261,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf = hf_media_attribute; } else{ - hf = hf_session_attribute; + hf = hf_session_attribute; } break; case 'z': @@ -279,7 +279,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)string, offset + tokenoffset, linelen - tokenoffset); string[linelen - tokenoffset] = '\0'; - sub_ti = proto_tree_add_string_format(sdp_tree,hf,tvb, offset, + sub_ti = proto_tree_add_string_format(sdp_tree,hf,tvb, offset, linelen, string, "%s: %s", proto_registrar_get_name(hf), @@ -299,7 +299,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void +static void call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti){ if(hf == hf_owner){ dissect_sdp_owner(tvb,ti); @@ -324,7 +324,7 @@ call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti){ } } -static void +static void dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ proto_tree *sdp_owner_tree; gint offset,next_offset,tokenlen; @@ -334,7 +334,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ tokenlen = 0; sdp_owner_tree = proto_item_add_subtree(ti,ett_sdp_owner); - + /* Find the username */ next_offset = tvb_find_guint8(tvb,offset,-1,' '); if( next_offset == -1 ) @@ -351,7 +351,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_sessionid, tvb, + proto_tree_add_item(sdp_owner_tree,hf_owner_sessionid, tvb, offset,tokenlen,FALSE); offset = next_offset + 1; @@ -371,17 +371,17 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_network_type, tvb, + proto_tree_add_item(sdp_owner_tree,hf_owner_network_type, tvb, offset,tokenlen,FALSE); offset = next_offset + 1; - + /* Find the address type */ next_offset = tvb_find_guint8(tvb,offset,-1,' '); if( next_offset == -1 ) return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_address_type, tvb, + proto_tree_add_item(sdp_owner_tree,hf_owner_address_type, tvb, offset,tokenlen,FALSE); offset = next_offset + 1; @@ -389,7 +389,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ proto_tree_add_item(sdp_owner_tree,hf_owner_address, tvb, offset, -1, FALSE); } -static void +static void dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ proto_tree *sdp_connection_info_tree; gint offset,next_offset,tokenlen; @@ -397,10 +397,10 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ offset = 0; next_offset = 0; tokenlen = 0; - + sdp_connection_info_tree = proto_item_add_subtree(ti, ett_sdp_connection_info); - + /* Find the network type */ next_offset = tvb_find_guint8(tvb,offset,-1,' '); if( next_offset == -1 ) @@ -408,7 +408,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ tokenlen = next_offset - offset; proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_network_type,tvb, + hf_connection_info_network_type,tvb, offset,tokenlen,FALSE); offset = next_offset + 1; @@ -419,7 +419,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ tokenlen = next_offset - offset; proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_address_type,tvb, + hf_connection_info_address_type,tvb, offset,tokenlen,FALSE); offset = next_offset + 1; @@ -431,7 +431,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ tokenlen = next_offset - offset; } proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_connection_address, tvb, + hf_connection_info_connection_address, tvb, offset,tokenlen,FALSE); if(next_offset != -1){ offset = next_offset + 1; @@ -452,11 +452,11 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ } } -static void +static void dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){ proto_tree * sdp_bandwidth_tree; gint offset, next_offset, tokenlen; - + offset = 0; next_offset = 0; tokenlen = 0; @@ -468,14 +468,14 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){ if( next_offset == -1) return; - + tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_modifier, tvb, offset, tokenlen, FALSE); offset = next_offset + 1; - + proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_value, tvb, offset, -1, FALSE); @@ -488,7 +488,7 @@ static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){ offset = 0; next_offset = 0; tokenlen = 0; - + sdp_time_tree = proto_item_add_subtree(ti,ett_sdp_time); /* get start time */ @@ -513,7 +513,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ offset = 0; next_offset = 0; tokenlen = 0; - + sdp_repeat_time_tree = proto_item_add_subtree(ti,ett_sdp_time); /* get interval */ @@ -547,24 +547,24 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_offset, tvb, offset, tokenlen, FALSE); } while( next_offset != -1 ); - + } -static void +static void dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){ proto_tree* sdp_timezone_tree; gint offset, next_offset, tokenlen; offset = 0; next_offset = 0; tokenlen = 0; - + sdp_timezone_tree = proto_item_add_subtree(ti,ett_sdp_timezone); - + do{ next_offset = tvb_find_guint8(tvb,offset,-1,' '); if(next_offset == -1) break; tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_timezone_tree,hf_timezone_time,tvb, offset, tokenlen, FALSE); offset = next_offset + 1; @@ -578,7 +578,7 @@ dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){ offset, tokenlen, FALSE); offset = next_offset + 1; } while (next_offset != -1); - + } @@ -598,10 +598,10 @@ static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti){ return; tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_type, tvb, offset, tokenlen, FALSE); - + offset = next_offset + 1; proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_data, tvb, offset, -1, FALSE); @@ -627,11 +627,11 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){ return; tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_field, tvb, offset, tokenlen, FALSE); - + offset = next_offset + 1; proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_value, @@ -639,7 +639,7 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){ } -static void +static void dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ proto_tree *sdp_media_tree; gint offset, next_offset, tokenlen; @@ -651,13 +651,13 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ sdp_media_tree = proto_item_add_subtree(ti,ett_sdp_media); next_offset = tvb_find_guint8(tvb,offset, -1, ' '); - + if(next_offset == -1) return; tokenlen = next_offset - offset; - - proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, + + proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, offset, tokenlen, FALSE); offset = next_offset + 1; @@ -667,11 +667,11 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; next_offset = tvb_find_guint8(tvb,offset, tokenlen, '/'); - + if(next_offset != -1){ tokenlen = next_offset - offset; - - proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, + + proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, FALSE); offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset, -1, ' '); @@ -683,21 +683,21 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ offset = next_offset + 1; } else { next_offset = tvb_find_guint8(tvb,offset, -1, ' '); - + if(next_offset == -1) return; tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, FALSE); offset = next_offset + 1; } next_offset = tvb_find_guint8(tvb,offset,-1,' '); - + if( next_offset == -1) return; - + tokenlen = next_offset - offset; proto_tree_add_item(sdp_media_tree, hf_media_proto, tvb, @@ -706,7 +706,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ do{ offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset,-1,' '); - + if(next_offset == -1){ tokenlen = -1; /* End of tvbuff */ } else { @@ -736,11 +736,11 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti){ return; tokenlen = next_offset - offset; - + proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_field, tvb, offset, tokenlen, FALSE); - + offset = next_offset + 1; proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value, @@ -756,7 +756,7 @@ proto_register_sdp(void) { "Session Description Protocol Version (v)", "sdp.version", FT_STRING, BASE_NONE,NULL,0x0, "Session Description Protocol Version", HFILL }}, - { &hf_owner, + { &hf_owner, { "Owner/Creator, Session Id (o)", "sdp.owner", FT_STRING, BASE_NONE, NULL, 0x0, "Owner/Creator, Session Id", HFILL}}, @@ -765,7 +765,7 @@ proto_register_sdp(void) "sdp.session_name", FT_STRING, BASE_NONE,NULL, 0x0, "Session Name", HFILL }}, { &hf_session_info, - { "Session Information (i)", + { "Session Information (i)", "sdp.session_info", FT_STRING, BASE_NONE, NULL, 0x0, "Session Information", HFILL }}, { &hf_uri, @@ -773,7 +773,7 @@ proto_register_sdp(void) "sdp.uri", FT_STRING, BASE_NONE,NULL, 0x0, "URI of Description", HFILL }}, { &hf_email, - { "E-mail Address (e)", + { "E-mail Address (e)", "sdp.email", FT_STRING, BASE_NONE, NULL, 0x0, "E-mail Address", HFILL }}, { &hf_phone, @@ -796,12 +796,12 @@ proto_register_sdp(void) { "Encryption Key (k)", "sdp.encryption_key", FT_STRING, BASE_NONE, NULL, 0x0, "Encryption Key", HFILL }}, - { &hf_session_attribute, - { "Session Attribute (a)", + { &hf_session_attribute, + { "Session Attribute (a)", "sdp.session_attr", FT_STRING, BASE_NONE, NULL, 0x0, "Session Attribute", HFILL }}, - { &hf_media_attribute, - { "Media Attribute (a)", + { &hf_media_attribute, + { "Media Attribute (a)", "sdp.media_attr", FT_STRING, BASE_NONE, NULL, 0x0, "Media Attribute", HFILL }}, { &hf_time, @@ -875,11 +875,11 @@ proto_register_sdp(void) { &hf_bandwidth_modifier, { "Bandwidth Modifier", "sdp.bandwidth.modifier",FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Modifier", HFILL }}, + "Bandwidth Modifier", HFILL }}, { &hf_bandwidth_value, { "Bandwidth Value", "sdp.bandwidth.value",FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Value", HFILL }}, + "Bandwidth Value", HFILL }}, { &hf_time_start, { "Session Start Time", "sdp.time.start",FT_STRING, BASE_NONE, NULL, 0x0, @@ -967,12 +967,12 @@ proto_register_sdp(void) &ett_sdp_media, &ett_sdp_media_attribute, }; - + proto_sdp = proto_register_protocol("Session Description Protocol", "SDP", "sdp"); proto_register_field_array(proto_sdp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* * Register the dissector by name, so other dissectors can * grab it by name rather than just referring to it directly diff --git a/packet-sip.c b/packet-sip.c index de4cc9438c..ee7bb7ed51 100644 --- a/packet-sip.c +++ b/packet-sip.c @@ -1,7 +1,7 @@ /* packet-sip.c * Routines for the Session Initiation Protocol (SIP) dissection. * RFC 2543 - * + * * TODO: Pay attention to Content-Type: It might not always be SDP. * Add hf_* fields for filtering support. * Add sip msg body dissection based on Content-Type for: @@ -15,24 +15,24 @@ * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2001, Jean-Francois Mule <jfm@clarent.com> * - * $Id: packet-sip.c,v 1.31 2002/07/25 21:43:53 guy Exp $ + * $Id: packet-sip.c,v 1.32 2002/08/28 21:00:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-cops.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -82,7 +82,7 @@ static const char *sip_methods[] = { static gboolean sip_is_request(tvbuff_t *tvb, gint eol); static gboolean sip_is_known_request(tvbuff_t *tvb, guint32 offset); static gint sip_get_msg_offset(tvbuff_t *tvb, guint32 offset); - + static dissector_handle_t sdp_handle; static dissector_handle_t data_handle; @@ -115,9 +115,9 @@ static void dissect_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_strneql(tvb, 0, SIP2_HDR, SIP2_HDR_LEN) != 0 && ! is_request) goto bad; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIP"); - + req_descr = is_known_request ? "Request" : "Unknown request"; if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", @@ -248,8 +248,8 @@ static gint sip_get_msg_offset(tvbuff_t *tvb, guint32 offset) while ((eol = tvb_find_guint8(tvb, offset, -1, '\r')) > 0 && tvb_bytes_exist(tvb, eol, 4)) { - if (tvb_get_guint8(tvb, eol + 1) == '\n' && - tvb_get_guint8(tvb, eol + 2) == '\r' && + if (tvb_get_guint8(tvb, eol + 1) == '\n' && + tvb_get_guint8(tvb, eol + 2) == '\r' && tvb_get_guint8(tvb, eol + 3) == '\n') return eol + 4; offset = eol + 2; @@ -261,7 +261,7 @@ static gint sip_get_msg_offset(tvbuff_t *tvb, guint32 offset) /* From section 4.1 of RFC 2543: * * Request-Line = Method SP Request-URI SP SIP-Version CRLF - */ + */ static gboolean sip_is_request(tvbuff_t *tvb, gint eol) { @@ -287,7 +287,7 @@ static gboolean sip_is_request(tvbuff_t *tvb, gint eol) if (req_colon_pos < 0 || req_colon_pos > ver_start) return FALSE; /* XXX - Check for a proper URI prefix? */ - + /* Do we have a proper version string? */ if (tvb_strneql(tvb, ver_start, SIP2_HDR, SIP2_HDR_LEN)) return TRUE; @@ -311,7 +311,7 @@ static gboolean sip_is_known_request(tvbuff_t *tvb, guint32 offset) /* Register the protocol with Ethereal */ void proto_register_sip(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { diff --git a/packet-skinny.c b/packet-skinny.c index bf4cc9692a..91a44b4f16 100644 --- a/packet-skinny.c +++ b/packet-skinny.c @@ -4,14 +4,14 @@ * (The "D-Channel"-Protocol for Cisco Systems' IP-Phones) * Copyright 2001, Joerg Mayer (email: see AUTHORS file) * - * Paul E. Erkkila (pee@erkkila.org) - fleshed out the decode - * skeleton to report values for most message/message fields. + * Paul E. Erkkila (pee@erkkila.org) - fleshed out the decode + * skeleton to report values for most message/message fields. * Much help from Guy Harris on figuring out the ethereal api. * * This file is based on packet-aim.c, which is * Copyright 2000, Ralf Hoelzer <ralf@well.com> * - * $Id: packet-skinny.c,v 1.19 2002/05/30 08:34:18 guy Exp $ + * $Id: packet-skinny.c,v 1.20 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -21,12 +21,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -117,7 +117,7 @@ static const value_string message_id[] = { {0x0029, "RegisterTokenReq"}, {0x002B, "unknownClientMessage1"}, {0x002D, "unknownClientMessage2"}, - + /* Callmanager -> Station */ /* 0x0000, 0x0003? */ {0x0081, "RegisterAckMessage"}, @@ -425,7 +425,7 @@ static const value_string keySetNames[] = { }; /* Define soft key labels for the Telecaster station */ -static const value_string softKeyLabel[] = { +static const value_string softKeyLabel[] = { {0 , "undefined"}, {1 , "Redial"}, {2 , "NewCall"}, @@ -446,16 +446,16 @@ static const value_string softKeyLabel[] = { {17 , "PickUp"}, {18 , "GPickUp"}, {0 , NULL} -}; +}; -/* - * define lamp modes; - * lamp cadence is defined as follows - * Wink (on 80%) = 448msec on / 64msec off - * Flash (fast flash) = 32msec on / 32msec off - * Blink (on 50%) = 512msec on / 512msec off - * On (on steady) +/* + * define lamp modes; + * lamp cadence is defined as follows + * Wink (on 80%) = 448msec on / 64msec off + * Flash (fast flash) = 32msec on / 32msec off + * Blink (on 50%) = 512msec on / 512msec off + * On (on steady) */ static const value_string stationLampModes[] = { {0 , "Undefined"}, @@ -465,41 +465,41 @@ static const value_string stationLampModes[] = { {0x4 , "Flash"}, {0x5 , "Blink"}, {0 , NULL} -}; +}; -/* Defined the Call States to be sent to the Telecaste station. - * These are NOT the call states used in CM internally. Instead, - * they are the call states sent from CM and understood by the Telecaster station +/* Defined the Call States to be sent to the Telecaste station. + * These are NOT the call states used in CM internally. Instead, + * they are the call states sent from CM and understood by the Telecaster station */ static const value_string skinny_stationCallStates[] = { {1 , "OffHook"}, {2 , "OnHook"}, {3 , "RingOut"}, - {4 , "RingIn"}, - {5 , "Connected"}, - {6 , "Busy"}, - {7 , "Congestion"}, - {8 , "Hold"}, - {9 , "CallWaiting"}, - {10 , "CallTransfer"}, - {11 , "CallPark"}, - {12 , "Proceed"}, - {13 , "CallRemoteMultiline"}, - {14 , "InvalidNumber"}, + {4 , "RingIn"}, + {5 , "Connected"}, + {6 , "Busy"}, + {7 , "Congestion"}, + {8 , "Hold"}, + {9 , "CallWaiting"}, + {10 , "CallTransfer"}, + {11 , "CallPark"}, + {12 , "Proceed"}, + {13 , "CallRemoteMultiline"}, + {14 , "InvalidNumber"}, {0 , NULL} }; /* Defined Call Type */ -static const value_string skinny_callTypes[] = { +static const value_string skinny_callTypes[] = { {1 , "InBoundCall"}, - {2 , "OutBoundCall"}, - {3 , "ForwardCall"}, + {2 , "OutBoundCall"}, + {3 , "ForwardCall"}, {0 , NULL} -}; +}; -/* - * define station-playable tones; - * for tone definitions see SR-TSV-002275, "BOC Notes on the LEC Networks -- 1994" +/* + * define station-playable tones; + * for tone definitions see SR-TSV-002275, "BOC Notes on the LEC Networks -- 1994" */ static const value_string skinny_deviceTones[] = { {0 , "Silence"}, @@ -598,7 +598,7 @@ static const value_string skinny_silenceSuppressionModes[] = { {0 , "Media_SilenceSuppression_Off"}, {1 , "Media_SilenceSuppression_On"}, {0 , NULL} -}; +}; static const value_string skinny_g723BitRates[] = { {1 , "Media_G723BRate_5_3"}, @@ -611,13 +611,13 @@ static const value_string skinny_deviceResetTypes[] = { {1 , "DEVICE_RESET"}, {2 , "DEVICE_RESTART"}, {0 , NULL} -}; +}; static const value_string skinny_echoCancelTypes[] = { {0 , "Media_EchoCancellation_Off"}, {1 , "Media_EchoCancellation_On"}, {0 , NULL} -}; +}; static const value_string skinny_deviceUnregisterStatusTypes[] = { {0 , "Ok"}, @@ -631,16 +631,16 @@ static const value_string skinny_hookFlashDetectModes[] = { {1 , "HookFlashOn"}, {2 , "HookFlashOff"}, {0 , NULL} -}; +}; -/* define station microphone modes; - * Mic On - The speakerphone's microphone is turned on ONLY if the phone is in the "Speaker On (Off Hook)" - * state (see above). - * Mic Off - The microphone is turned off or, if it's not on, the command is ignored. +/* define station microphone modes; + * Mic On - The speakerphone's microphone is turned on ONLY if the phone is in the "Speaker On (Off Hook)" + * state (see above). + * Mic Off - The microphone is turned off or, if it's not on, the command is ignored. */ static const value_string skinny_microphoneModes[] = { {1 , "MicOn"}, - {2 , "MicOff"}, + {2 , "MicOff"}, {0 , NULL} }; @@ -658,14 +658,14 @@ static const value_string skinny_mediaEnunciationTypes[] = { {1 , "None"}, {2 , "CallPark"}, {0 , NULL} -}; +}; #define StationMaxDirnumSize 24 /* max size of calling or called party dirnum */ #define StationMaxNameSize 40 /* max size of calling party's name */ #define StationMaxDeviceNameSize 16 /* max size of station's IP name */ #define StationMaxSpeedDials 10 /* max number of speed dial numbers allowed on a station */ #define StationMaxVersionSize 16 /* max chars in version string */ -#define StationMaxButtonTemplateSize 42 /* max button template size */ +#define StationMaxButtonTemplateSize 42 /* max button template size */ #define StationMaxDisplayTextSize 33 /* max text size in DisplayText message */ #define StationMaxPorts 10 /* max number of ports on one device */ #define StationDateTemplateSize 6 /* date template in the form M/D/Y, D/M/Y, ... */ @@ -866,11 +866,11 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint32 softKeyCount; guint32 softKeySetCount; guint16 validKeyMask; - + /* Set up structures we will need to add the protocol subtree and manage it */ proto_item *ti; proto_tree *skinny_tree = NULL; - + proto_item *skm = NULL; proto_item *skm_tree = NULL; @@ -881,9 +881,9 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ if (tree) { - ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, FALSE); + ti = proto_tree_add_item(tree, proto_skinny, tvb, offset, hdr_data_length+8, FALSE); skinny_tree = proto_item_add_subtree(ti, ett_skinny); - proto_tree_add_uint(skinny_tree, hf_skinny_data_length, tvb, offset, 4, hdr_data_length); + proto_tree_add_uint(skinny_tree, hf_skinny_data_length, tvb, offset, 4, hdr_data_length); proto_tree_add_uint(skinny_tree, hf_skinny_reserved, tvb, offset+4, 4, hdr_reserved); } @@ -912,10 +912,10 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x8 : /* hookFlash */ break; - + case 0xc : /* configStateReqMessage */ break; - + case 0xd : /* timeDateReqMessage */ break; @@ -924,10 +924,10 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0xf : /* stationVersionReqMessage */ break; - + case 0x12 : /* stationServerReqMessage */ break; - + case 0x25 : /* softKeySetReqMessage */ break; @@ -983,7 +983,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x4 : /* stationEnblocCallMessage -- This decode NOT verified*/ proto_tree_add_item(skinny_tree, hf_skinny_calledParty, tvb, offset+12, StationMaxDirnumSize, TRUE); break; - + case 0x5 : /* stationStimulusMessage */ proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, TRUE); @@ -992,7 +992,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x9 : /* stationForwardStatReqMessage */ proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, TRUE); break; - + case 0xa : /* speedDialStatReqMessage */ proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, TRUE); break; @@ -1008,7 +1008,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr * * basically changing StationMaxCapabilities definition * - */ + */ capCount = tvb_get_letohl(tvb, offset+12); proto_tree_add_uint(skinny_tree, hf_skinny_capCount, tvb, offset+12, 4, capCount); for (i = 0; i < capCount; i++) { @@ -1032,13 +1032,13 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(skinny_tree, hf_skinny_receptionStatus, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); break; - + case 0x22 : /* stationOpenReceiveChannelAck */ proto_tree_add_item(skinny_tree, hf_skinny_ORCStatus, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+16, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_portNumber, tvb, offset+20, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+24, 4, TRUE); - break; + break; case 0x23 : /* stationConnectionStatisticsRes */ proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, offset+12, StationMaxDirnumSize, TRUE); @@ -1054,7 +1054,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr break; case 0x24 : /* offHookWithCgpn */ - proto_tree_add_item(skinny_tree, hf_skinny_calledParty, tvb, offset+12,StationMaxDirnumSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_calledParty, tvb, offset+12,StationMaxDirnumSize, TRUE); break; case 0x26 : /* softKeyEventMessage */ @@ -1083,7 +1083,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x2d : /* unknownClientMessage2 */ break; - /* + /* * * Call manager -> client messages start here(ish) * @@ -1101,7 +1101,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x85 : /* setRingerMessage */ proto_tree_add_item(skinny_tree, hf_skinny_ringType, tvb, offset+12, 4, TRUE); break; - + case 0x86 : /* setLampMessage */ proto_tree_add_item(skinny_tree, hf_skinny_stimulus, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_stimulusInstance, tvb, offset+16, 4, TRUE); @@ -1114,7 +1114,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr break; case 0x88 : /* setSpeakerMode */ - + proto_tree_add_item(skinny_tree, hf_skinny_speakerMode, tvb, offset+12, 4, TRUE); break; @@ -1122,7 +1122,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(skinny_tree, hf_skinny_microphoneMode, tvb, offset+12, 4, TRUE); break; - case 0x8a : /* startMediaTransmistion */ + case 0x8a : /* startMediaTransmistion */ proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_remoteIpAddr, tvb, offset+20, 4, TRUE); @@ -1136,8 +1136,8 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr break; case 0x8b : /* stopMediaTransmission */ - - proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); + + proto_tree_add_item(skinny_tree, hf_skinny_conferenceID, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_passThruPartyID, tvb, offset+16, 4, TRUE); break; @@ -1256,7 +1256,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr break; case 0x99 : /* displayTextMessage */ - proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, TRUE); + proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, TRUE); break; case 0x9c : /* enunciatorCommand */ @@ -1271,7 +1271,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr case 0x9d : /* stationRegisterReject */ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, TRUE); break; - + case 0x9e : /* serverRes */ for (i = 0; i < StationMaxServers; i++) { proto_tree_add_item(skinny_tree, hf_skinny_serverIdentifier, tvb, offset+12+(i*StationMaxServers), StationMaxServers, TRUE); @@ -1358,7 +1358,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+(i*20)+40, 4, TRUE); } /* there is more data here, but it doesn't make a whole lot of sense, I imagine - * it's just some not zero'd out stuff in the packet or... + * it's just some not zero'd out stuff in the packet or... */ break; @@ -1377,7 +1377,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } } break; - + case 0x110 : /* selectSoftKeys */ proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); @@ -1402,30 +1402,30 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_boolean(skm_tree, hf_skinny_softKey14, tvb, offset + 24, 1, validKeyMask); proto_tree_add_boolean(skm_tree, hf_skinny_softKey15, tvb, offset + 24, 1, validKeyMask); break; - + case 0x111 : /* callState */ proto_tree_add_item(skinny_tree, hf_skinny_callState, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+20, 4, TRUE); break; - + case 0x112 : /* displayPromptStatus */ proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayPromptStatusSize, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+48, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+52, 4, TRUE); break; - + case 0x113: /* clearPrompt */ proto_tree_add_item(skinny_tree, hf_skinny_lineInstance , tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+16, 4, TRUE); break; - + case 0x114 : /* displayNotify */ proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, TRUE); proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayNotifySize , TRUE); break; - + case 0x116 : /* activateCallPlane */ proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12, 4, TRUE); break; @@ -1448,7 +1448,7 @@ static void dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_uint(skinny_tree, hf_skinny_unknown, tvb, offset+36, 4, unknownLong); proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+40, 4, TRUE); break; - + default: @@ -1468,38 +1468,38 @@ static void dissect_skinny(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 hdr_reserved; /* check, if this is really an SKINNY packet, they start with a length + 0 */ - + /* get relevant header information */ hdr_data_length = tvb_get_letohl(tvb, 0); hdr_reserved = tvb_get_letohl(tvb, 4); /* data_size = MIN(8+hdr_data_length, tvb_length(tvb)) - 0xC; */ - + /* hdr_data_length > 1024 is just a heuristic. Better values/checks welcome */ if (hdr_data_length < 4 || hdr_data_length > 1024 || hdr_reserved != 0) { /* Not an SKINNY packet, just happened to use the same port */ call_dissector(data_handle,tvb, pinfo, tree); return; } - + /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "SKINNY"); } - + if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, "Skinny Client Control Protocol"); } - + tcp_dissect_pdus(tvb, pinfo, tree, skinny_desegment, 4, get_skinny_pdu_len, dissect_skinny_pdu); } /* Register the protocol with Ethereal */ -void +void proto_register_skinny(void) -{ - +{ + /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_skinny_data_length, @@ -1894,135 +1894,135 @@ proto_register_skinny(void) }, { &hf_skinny_softKeyMap, - { "SoftKeyMap","skinny.softKeyMap", + { "SoftKeyMap","skinny.softKeyMap", FT_UINT16, BASE_HEX, NULL, 0x0, - "", + "", HFILL } }, - + { &hf_skinny_softKey0, - { "SoftKey0", "skinny.softKeyMap.0", + { "SoftKey0", "skinny.softKeyMap.0", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY0, - "", + "", HFILL } }, { &hf_skinny_softKey1, - { "SoftKey1", "skinny.softKeyMap.1", + { "SoftKey1", "skinny.softKeyMap.1", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY1, - "", + "", HFILL } }, { &hf_skinny_softKey2, - { "SoftKey2", "skinny.softKeyMap.2", + { "SoftKey2", "skinny.softKeyMap.2", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY2, - "", + "", HFILL } }, { &hf_skinny_softKey3, { "SoftKey3", "skinny.softKeyMap.3", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY3, - "", + "", HFILL } }, { &hf_skinny_softKey4, - { "SoftKey4", "skinny.softKeyMap.4", + { "SoftKey4", "skinny.softKeyMap.4", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY4, - "", + "", HFILL } }, { &hf_skinny_softKey5, - { "SoftKey5", "skinny.softKeyMap.5", + { "SoftKey5", "skinny.softKeyMap.5", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY5, - "", + "", HFILL } }, { &hf_skinny_softKey6, - { "SoftKey6", "skinny.softKeyMap.6", + { "SoftKey6", "skinny.softKeyMap.6", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY6, - "", + "", HFILL } }, { &hf_skinny_softKey7, - { "SoftKey7", "skinny.softKeyMap.7", + { "SoftKey7", "skinny.softKeyMap.7", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY7, - "", + "", HFILL } }, { &hf_skinny_softKey8, - { "SoftKey8", "skinny.softKeyMap.8", + { "SoftKey8", "skinny.softKeyMap.8", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY8, - "", + "", HFILL } }, { &hf_skinny_softKey9, - { "SoftKey9", "skinny.softKeyMap.9", + { "SoftKey9", "skinny.softKeyMap.9", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY9, - "", + "", HFILL } }, { &hf_skinny_softKey10, - { "SoftKey10", "skinny.softKeyMap.10", + { "SoftKey10", "skinny.softKeyMap.10", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY10, - "", + "", HFILL } }, { &hf_skinny_softKey11, - { "SoftKey11", "skinny.softKeyMap.11", + { "SoftKey11", "skinny.softKeyMap.11", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY11, - "", + "", HFILL } }, { &hf_skinny_softKey12, - { "SoftKey12", "skinny.softKeyMap.12", + { "SoftKey12", "skinny.softKeyMap.12", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY12, - "", + "", HFILL } }, { &hf_skinny_softKey13, - { "SoftKey13", "skinny.softKeyMap.13", + { "SoftKey13", "skinny.softKeyMap.13", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY13, - "", + "", HFILL } }, { &hf_skinny_softKey14, - { "SoftKey14", "skinny.softKeyMap.14", + { "SoftKey14", "skinny.softKeyMap.14", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY14, - "", + "", HFILL } }, { &hf_skinny_softKey15, - { "SoftKey15", "skinny.softKeyMap.15", + { "SoftKey15", "skinny.softKeyMap.15", FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY15, - "", + "", HFILL } }, { &hf_skinny_lampMode, - { "LampMode", "skinny.lampMode", + { "LampMode", "skinny.lampMode", FT_UINT32, BASE_DEC, VALS(stationLampModes), 0x0, - "The lamp mode", + "The lamp mode", HFILL } }, { &hf_skinny_messageTimeOutValue, - { "Message Timeout", "skinny.messageTimeOutValue", + { "Message Timeout", "skinny.messageTimeOutValue", FT_UINT32, BASE_DEC, NULL, 0x0, - "The timeout in seconds for this message", + "The timeout in seconds for this message", HFILL } }, @@ -2124,16 +2124,16 @@ proto_register_skinny(void) HFILL } }, { &hf_skinny_callState, - { "CallState", "skinny.callState", + { "CallState", "skinny.callState", FT_UINT32, BASE_DEC, VALS(skinny_stationCallStates), 0x0, - "The D channel call state of the call", + "The D channel call state of the call", HFILL } }, { &hf_skinny_deviceTone, - { "Tone", "skinny.deviceTone", + { "Tone", "skinny.deviceTone", FT_UINT32, BASE_HEX, VALS(skinny_deviceTones), 0x0, - "Which tone to play", + "Which tone to play", HFILL } }, @@ -2159,9 +2159,9 @@ proto_register_skinny(void) }, { &hf_skinny_callType, - { "Call Type", "skinny.callType", + { "Call Type", "skinny.callType", FT_UINT32, BASE_DEC, VALS(skinny_callTypes), 0x0, - "What type of call, in/out/etc", + "What type of call, in/out/etc", HFILL } }, @@ -2180,16 +2180,16 @@ proto_register_skinny(void) }, { &hf_skinny_ringType, - { "Ring Type", "skinny.ringType", + { "Ring Type", "skinny.ringType", FT_UINT32, BASE_HEX, VALS(skinny_ringTypes), 0x0, - "What type of ring to play", + "What type of ring to play", HFILL } }, { &hf_skinny_speakerMode, - { "Speaker", "skinny.speakerMode", + { "Speaker", "skinny.speakerMode", FT_UINT32, BASE_HEX, VALS(skinny_speakerModes), 0x0, - "This message sets the speaker mode on/off", + "This message sets the speaker mode on/off", HFILL } }, @@ -2222,16 +2222,16 @@ proto_register_skinny(void) }, { &hf_skinny_silenceSuppression, - { "Silence Suppression", "skinny.silenceSuppression", + { "Silence Suppression", "skinny.silenceSuppression", FT_UINT32, BASE_HEX, VALS(skinny_silenceSuppressionModes), 0x0, - "Mode for silence suppression", + "Mode for silence suppression", HFILL } }, { &hf_skinny_g723BitRate, - { "G723 BitRate", "skinny.g723BitRate", + { "G723 BitRate", "skinny.g723BitRate", FT_UINT32, BASE_DEC, VALS(skinny_g723BitRates), 0x0, - "The G723 bit rate for this stream/JUNK if not g723 stream", + "The G723 bit rate for this stream/JUNK if not g723 stream", HFILL } }, @@ -2243,30 +2243,30 @@ proto_register_skinny(void) }, { &hf_skinny_deviceResetType, - { "Reset Type", "skinny.deviceResetType", + { "Reset Type", "skinny.deviceResetType", FT_UINT32, BASE_DEC, VALS(skinny_deviceResetTypes), 0x0, - "How the devices it to be reset (reset/restart)", + "How the devices it to be reset (reset/restart)", HFILL } }, { &hf_skinny_echoCancelType, - { "Echo Cancel Type", "skinny.echoCancelType", + { "Echo Cancel Type", "skinny.echoCancelType", FT_UINT32, BASE_DEC, VALS(skinny_echoCancelTypes), 0x0, - "Is echo cancelling enabled or not", + "Is echo cancelling enabled or not", HFILL } }, { &hf_skinny_deviceUnregisterStatus, - { "Unregister Status", "skinny.deviceUnregisterStatus", + { "Unregister Status", "skinny.deviceUnregisterStatus", FT_UINT32, BASE_DEC, VALS(skinny_deviceUnregisterStatusTypes), 0x0, - "The status of the device unregister request (*CAN* be refused)", + "The status of the device unregister request (*CAN* be refused)", HFILL } }, { &hf_skinny_hookFlashDetectMode, - { "Hook Flash Mode", "skinny.hookFlashDetectMode", + { "Hook Flash Mode", "skinny.hookFlashDetectMode", FT_UINT32, BASE_DEC, VALS(skinny_hookFlashDetectModes), 0x0, - "Which method to use to detect that a hook flash has occured", + "Which method to use to detect that a hook flash has occured", HFILL } }, @@ -2278,9 +2278,9 @@ proto_register_skinny(void) }, { &hf_skinny_microphoneMode, - { "Microphone Mode", "skinny.microphoneMode", + { "Microphone Mode", "skinny.microphoneMode", FT_UINT32, BASE_DEC, VALS(skinny_microphoneModes), 0x0, - "Turns on and off the microphone on the set", + "Turns on and off the microphone on the set", HFILL } }, @@ -2348,9 +2348,9 @@ proto_register_skinny(void) }, { &hf_skinny_sessionType, - { "Session Type", "skinny.sessionType", + { "Session Type", "skinny.sessionType", FT_UINT32, BASE_DEC, VALS(skinny_sessionTypes), 0x0, - "The type of this session.", + "The type of this session.", HFILL } }, @@ -2362,9 +2362,9 @@ proto_register_skinny(void) }, { &hf_skinny_mediaEnunciationType, - { "Enunciation Type", "skinny.mediaEnunciationType", + { "Enunciation Type", "skinny.mediaEnunciationType", FT_UINT32, BASE_DEC, VALS(skinny_mediaEnunciationTypes), 0x0, - "No clue.", + "No clue.", HFILL } }, @@ -2376,9 +2376,9 @@ proto_register_skinny(void) }, { &hf_skinny_serverListenPort, - { "Server Port", "skinny.serverListenPort", + { "Server Port", "skinny.serverListenPort", FT_UINT32, BASE_DEC, NULL, 0x0, - "The port the server listens on.", + "The port the server listens on.", HFILL } }, @@ -2390,9 +2390,9 @@ proto_register_skinny(void) }, { &hf_skinny_multicastPort, - { "Multicast Port", "skinny.multicastPort", + { "Multicast Port", "skinny.multicastPort", FT_UINT32, BASE_DEC, NULL, 0x0, - "The multicast port the to listens on.", + "The multicast port the to listens on.", HFILL } }, @@ -2404,21 +2404,21 @@ proto_register_skinny(void) }, { &hf_skinny_tokenRejWaitTime, - { "Retry Wait Time", "skinny.tokenRejWaitTime", + { "Retry Wait Time", "skinny.tokenRejWaitTime", FT_UINT32, BASE_DEC, NULL, 0x0, - "The time to wait before retrying this token request.", + "The time to wait before retrying this token request.", HFILL } }, { &hf_skinny_unknown, - { "Data", "skinny.unknown", + { "Data", "skinny.unknown", FT_UINT32, BASE_HEX, NULL, 0x0, - "Place holder for unknown data.", + "Place holder for unknown data.", HFILL } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_skinny, @@ -2430,7 +2430,7 @@ proto_register_skinny(void) /* Register the protocol name and description */ proto_skinny = proto_register_protocol("Skinny Client Control Protocol", "SKINNY", "skinny"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_skinny, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -2462,7 +2462,7 @@ proto_reg_handoff_skinny(void) * * id message implemented decode tested (via capture) * --------------------------------------------------------------------------- - * 0x0 keepAlive Y N/A + * 0x0 keepAlive Y N/A * 0x1 register Y Y * 0x2 ipPort Y Y * 0x3 keypadButton Y Y @@ -2479,7 +2479,7 @@ proto_reg_handoff_skinny(void) * 0xe buttonTemplateReq Y N/A * 0xf versionReq Y N/A * 0x10 capabilitiesRes Y Y -- would like more decodes - * 0x11 mediaPortList S N -- no info + * 0x11 mediaPortList S N -- no info * 0x12 serverReq Y N/A * 0x20 alarmMessage Y Y * 0x21 multicastMediaReceptionAck Y N diff --git a/packet-slimp3.c b/packet-slimp3.c index 56f3971f6a..0d976ae006 100644 --- a/packet-slimp3.c +++ b/packet-slimp3.c @@ -6,7 +6,7 @@ * Adds support for the data packet protocol for the SliMP3 * See www.slimdevices.com for details. * - * $Id: packet-slimp3.c,v 1.7 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-slimp3.c,v 1.8 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -16,12 +16,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -76,42 +76,42 @@ static const value_string slimp3_opcode_vals[] = { }; static const value_string slimp3_ir_codes_jvc[] = { - { 0xf786, "One" }, - { 0xf746, "Two" }, - { 0xf7c6, "Three" }, - { 0xf726, "Four" }, - { 0xf7a6, "Five" }, - { 0xf766, "Six" }, - { 0xf7e6, "Seven" }, - { 0xf716, "Eight" }, - { 0xf796, "Nine" }, - { 0xf776, "Ten" }, - - { 0xf7f6, "Picture-In-Picture" }, + { 0xf786, "One" }, + { 0xf746, "Two" }, + { 0xf7c6, "Three" }, + { 0xf726, "Four" }, + { 0xf7a6, "Five" }, + { 0xf766, "Six" }, + { 0xf7e6, "Seven" }, + { 0xf716, "Eight" }, + { 0xf796, "Nine" }, + { 0xf776, "Ten" }, + + { 0xf7f6, "Picture-In-Picture" }, /* { 0xf7XX, "Enter" }, */ - { 0xf70e, "Back" }, - { 0xf732, "Play" }, - { 0xf76e, "Forward" }, - { 0xf743, "Record" }, - { 0xf7c2, "Stop" }, - { 0xf7b2, "Pause" }, + { 0xf70e, "Back" }, + { 0xf732, "Play" }, + { 0xf76e, "Forward" }, + { 0xf743, "Record" }, + { 0xf7c2, "Stop" }, + { 0xf7b2, "Pause" }, /* { 0xf7XX, "TV/Video" }, */ - { 0xf703, "Display" }, - { 0xf7b3, "Sleep" }, - { 0xf7b6, "Guide" }, - { 0xf70b, "Up" }, - { 0xf74b, "Left" }, - { 0xf7cb, "Right" }, - { 0xf78b, "Down" }, - { 0xf783, "Menu" }, - { 0xf72b, "OK" }, - { 0xf778, "Volume Up" }, - { 0xf7f8, "Volume Down" }, - { 0xf70d, "Channel Up" }, - { 0xf78d, "Channel Down" }, + { 0xf703, "Display" }, + { 0xf7b3, "Sleep" }, + { 0xf7b6, "Guide" }, + { 0xf70b, "Up" }, + { 0xf74b, "Left" }, + { 0xf7cb, "Right" }, + { 0xf78b, "Down" }, + { 0xf783, "Menu" }, + { 0xf72b, "OK" }, + { 0xf778, "Volume Up" }, + { 0xf7f8, "Volume Down" }, + { 0xf70d, "Channel Up" }, + { 0xf78d, "Channel Down" }, /* { 0xf7XX, "Mute" }, */ - { 0xf7ab, "Recall" }, - { 0xf702, "Power" }, + { 0xf7ab, "Recall" }, + { 0xf702, "Power" }, }; static const value_string slimp3_display_commands[] = { @@ -122,7 +122,7 @@ static const value_string slimp3_display_commands[] = { { 0x5, "Mode: Decrement Address, Shift Display"}, { 0x6, "Mode: Increment Address, Shift Cursor"}, { 0x7, "Mode: Increment Address, Shift Display"}, - + { 0x8, "Display Off"}, { 0xd, "Display On, With Blinking"}, { 0xe, "Display On, With Cursor"}, @@ -168,7 +168,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 opcode; char addc_str[101]; char *addc_strp; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SliMP3"); @@ -198,34 +198,34 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, FALSE); i1 = tvb_get_ntohl(tvb, offset+2); - proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Uptime: %u sec (%u ticks)", + proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Uptime: %u sec (%u ticks)", i1/625000, i1); - proto_tree_add_text(slimp3_tree, tvb, offset+6, 1, "Code identifier: 0x%0x: %s", - tvb_get_guint8(tvb, offset+6), + proto_tree_add_text(slimp3_tree, tvb, offset+6, 1, "Code identifier: 0x%0x: %s", + tvb_get_guint8(tvb, offset+6), tvb_get_guint8(tvb, offset+6)==0xff ? "JVC DVD Player" : "Unknown"); proto_tree_add_text(slimp3_tree, tvb, offset+7, 1, "Code bits: %d", tvb_get_guint8(tvb, offset+7)); i1 = tvb_get_ntohl(tvb, offset+8); /* Is this a standard JVC remote code? */ - if (tvb_get_guint8(tvb, offset+6) == 0xff && + if (tvb_get_guint8(tvb, offset+6) == 0xff && tvb_get_guint8(tvb, offset+7) == 16) { - proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, - "Infrared Code: %s: 0x%0x", + proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, + "Infrared Code: %s: 0x%0x", val_to_str(i1, slimp3_ir_codes_jvc, "Unknown"), tvb_get_ntohl(tvb, offset+8)); } else { /* Unknown code; just write it */ - proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, "Infrared Code: 0x%0x", + proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, "Infrared Code: 0x%0x", tvb_get_ntohl(tvb, offset+8)); } } if (check_col(pinfo->cinfo, COL_INFO)) { i1 = tvb_get_ntohl(tvb, offset+8); - if (tvb_get_guint8(tvb, offset+6) == 0xff && + if (tvb_get_guint8(tvb, offset+6) == 0xff && tvb_get_guint8(tvb, offset+7) == 16) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", JVC: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, ", JVC: %s", val_to_str(i1, slimp3_ir_codes_jvc, "Unknown (0x%0x)")); } else { /* Unknown code; just write it */ @@ -247,18 +247,18 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (i1 < tvb_reported_length_remaining(tvb, offset)) { switch(tvb_get_guint8(tvb, offset + i1)) { case 0: - in_str = 0; - proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, + in_str = 0; + proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, "Delay (%d ms)", tvb_get_guint8(tvb, offset + i1 + 1)); i1 += 2; break; case 3: if (ti && in_str) { - proto_item_append_text(ti, "%c", + proto_item_append_text(ti, "%c", tvb_get_guint8(tvb, offset + i1 + 1)); } else { - ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, - "String: %c", + ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, + "String: %c", tvb_get_guint8(tvb, offset + i1 + 1)); in_str = 1; } @@ -266,25 +266,25 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: - in_str = 0; - ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, - "Command: %s", - val_to_str(tvb_get_guint8(tvb, offset + i1 + 1), - slimp3_display_commands, + in_str = 0; + ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, + "Command: %s", + val_to_str(tvb_get_guint8(tvb, offset + i1 + 1), + slimp3_display_commands, "Unknown (0x%0x)")); - if ((tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30) { - proto_item_append_text(ti, ": %s", + if ((tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30) { + proto_item_append_text(ti, ": %s", val_to_str(tvb_get_guint8(tvb, offset + i1 + 2), - slimp3_display_fset8, + slimp3_display_fset8, "Unknown (0x%0x)")); i1 += 2 ; } i1 += 2; break; - + default: - proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, - "Unknown 0x%0x, 0x%0x", + proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2, + "Unknown 0x%0x, 0x%0x", tvb_get_guint8(tvb, offset + i1), tvb_get_guint8(tvb, offset + i1 + 1)); i1 += 2; @@ -304,7 +304,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 2: - *addc_strp++ = '|'; + *addc_strp++ = '|'; if (tvb_offset_exists(tvb, offset + i1 + 1) && (tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30) i1 += 2; @@ -312,7 +312,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 3: if (tvb_offset_exists(tvb, offset + i1 + 1)) { - if (addc_strp == addc_str || + if (addc_strp == addc_str || *(addc_strp-1) != ' ' || tvb_get_guint8(tvb, offset + i1 + 1) != ' ') *addc_strp++ = tvb_get_guint8(tvb, offset + i1 + 1); @@ -332,13 +332,13 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_control, tvb, offset+1, 1, FALSE); proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Command: %s", - val_to_str(tvb_get_guint8(tvb, offset+1), + val_to_str(tvb_get_guint8(tvb, offset+1), slimp3_stream_control, "Unknown (0x%0x)")); } if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", - val_to_str(tvb_get_guint8(tvb, offset+1), + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", + val_to_str(tvb_get_guint8(tvb, offset+1), slimp3_stream_control, "Unknown (0x%0x)")); } break; @@ -351,10 +351,10 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 fw_ver = 0; /* Hello response; client->server */ proto_tree_add_text(slimp3_tree, tvb, offset, 1, "Hello Response (Client --> Server)"); - proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d", + proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d", tvb_get_guint8(tvb, offset+1)); fw_ver = tvb_get_guint8(tvb, offset+2); - proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)", + proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)", fw_ver>>4, fw_ver & 0xf, fw_ver); } else { /* Hello request; server->client */ @@ -369,11 +369,11 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 1, FALSE); if (pinfo->destport == UDP_PORT_SLIMP3) { /* Hello response; client->server */ - proto_tree_add_text(slimp3_tree, tvb, offset, -1, + proto_tree_add_text(slimp3_tree, tvb, offset, -1, "I2C Response (Client --> Server)"); } else { /* Hello request; server->client */ - proto_tree_add_text(slimp3_tree, tvb, offset, -1, + proto_tree_add_text(slimp3_tree, tvb, offset, -1, "I2C Request (Server --> Client)"); } } @@ -391,8 +391,8 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data_request, tvb, offset, 1, FALSE); - proto_tree_add_text(slimp3_tree, tvb, offset+2, 2, - "Requested offset: %d bytes.", + proto_tree_add_text(slimp3_tree, tvb, offset+2, 2, + "Requested offset: %d bytes.", tvb_get_ntohs(tvb, offset+2)*2); } @@ -406,10 +406,10 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data, tvb, offset, 1, FALSE); - proto_tree_add_text(slimp3_tree, tvb, offset, -1, + proto_tree_add_text(slimp3_tree, tvb, offset, -1, "Length: %d bytes", tvb_reported_length_remaining(tvb, offset+18)); - proto_tree_add_text(slimp3_tree, tvb, offset+2, 2, - "Buffer offset: %d bytes.", + proto_tree_add_text(slimp3_tree, tvb, offset+2, 2, + "Buffer offset: %d bytes.", tvb_get_ntohs(tvb, offset+2) * 2); } @@ -428,7 +428,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d.", tvb_get_guint8(tvb, offset+1)); fw_ver = tvb_get_guint8(tvb, offset+2); - proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)", + proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)", fw_ver>>4, fw_ver & 0xf, fw_ver); } @@ -444,14 +444,14 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_discover_response, tvb, offset, 1, FALSE); proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, - "Server Address: %s.", + "Server Address: %s.", ip_to_str(tvb_get_ptr(tvb, offset+2, 4))); - proto_tree_add_text(slimp3_tree, tvb, offset+6, 2, + proto_tree_add_text(slimp3_tree, tvb, offset+6, 2, "Server Port: %d", tvb_get_ntohs(tvb, offset + 6)); } if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %d", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %d", ip_to_str(tvb_get_ptr(tvb, offset+2, 4)), tvb_get_ntohs(tvb, offset + 6)); } diff --git a/packet-sll.c b/packet-sll.c index 8d3d31e083..da07b71394 100644 --- a/packet-sll.c +++ b/packet-sll.c @@ -1,22 +1,22 @@ /* packet-sll.c * Routines for disassembly of packets from Linux "cooked mode" captures * - * $Id: packet-sll.c,v 1.18 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-sll.c,v 1.19 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-sll.h b/packet-sll.h index 1fbb52b869..8cb86cbc0f 100644 --- a/packet-sll.h +++ b/packet-sll.h @@ -1,21 +1,21 @@ /* packet-sll.h * - * $Id: packet-sll.h,v 1.3 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-sll.h,v 1.4 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2001 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-slowprotocols.c b/packet-slowprotocols.c index c58f7fd00a..5a4a4a445f 100644 --- a/packet-slowprotocols.c +++ b/packet-slowprotocols.c @@ -1,10 +1,10 @@ /* packet-slowprotocols.c * Routines for EtherType (0x8809) Slow Protocols disassembly. * - * $Id: packet-slowprotocols.c,v 1.3 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-slowprotocols.c,v 1.4 2002/08/28 21:00:31 jmayer Exp $ * * Copyright 2002 Steve Housley <steve_housley@3com.com> - * + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -170,17 +170,17 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *a_sys; const guint8 *p_sys; const guint8 *resv_bytes; - + proto_tree *lacpdu_tree; proto_item *lacpdu_item; proto_tree *actor_flags_tree; proto_item *actor_flags_item; proto_tree *partner_flags_tree; proto_item *partner_flags_item; - + const char *sep; - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { @@ -225,7 +225,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(lacpdu_tree, hf_lacpdu_actor_sys_priority, tvb, LACPDU_ACTOR_SYS_PRIORITY, 2, raw_word); /* Actor System */ - + a_sys = tvb_get_ptr(tvb, LACPDU_ACTOR_SYSTEM , 6); proto_tree_add_ether(lacpdu_tree, hf_lacpdu_actor_sys, tvb, LACPDU_ACTOR_SYSTEM, 6, a_sys); @@ -256,7 +256,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Actor State */ flags = tvb_get_guint8(tvb, LACPDU_ACTOR_STATE); - actor_flags_item = proto_tree_add_uint(lacpdu_tree, hf_lacpdu_actor_state, tvb, + actor_flags_item = proto_tree_add_uint(lacpdu_tree, hf_lacpdu_actor_state, tvb, LACPDU_ACTOR_STATE, 1, flags); actor_flags_tree = proto_item_add_subtree(actor_flags_item, ett_lacpdu_a_flags); @@ -325,7 +325,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* We put something in; put in the terminating ")" */ proto_item_append_text(actor_flags_item, ")"); } - + /* Actor Reserved */ resv_bytes = tvb_get_ptr(tvb, LACPDU_ACTOR_RESERVED, 3); @@ -381,7 +381,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Partner State */ flags = tvb_get_guint8(tvb, LACPDU_PARTNER_STATE); - partner_flags_item = proto_tree_add_uint(lacpdu_tree, hf_lacpdu_partner_state, tvb, + partner_flags_item = proto_tree_add_uint(lacpdu_tree, hf_lacpdu_partner_state, tvb, LACPDU_PARTNER_STATE, 1, flags); partner_flags_tree = proto_item_add_subtree(partner_flags_item, ett_lacpdu_p_flags); @@ -450,7 +450,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* We put something in; put in the terminating ")" */ proto_item_append_text(partner_flags_item, ")"); } - + /* Partner Reserved */ resv_bytes = tvb_get_ptr(tvb, LACPDU_PARTNER_RESERVED, 3); @@ -473,7 +473,7 @@ dissect_lacpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) raw_word = tvb_get_ntohs(tvb, LACPDU_COLL_MAX_DELAY); proto_tree_add_uint(lacpdu_tree, hf_lacpdu_coll_max_delay, tvb, LACPDU_COLL_MAX_DELAY, 2, raw_word); - + /* Collector Reserved */ resv_bytes = tvb_get_ptr(tvb, LACPDU_COLL_RESERVED, 12); @@ -504,7 +504,7 @@ static void dissect_slow_protocols(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 raw_octet; - + if (tree) { @@ -543,7 +543,7 @@ static const value_string subtype_vals[] = { { 0, NULL } }; -static const true_false_string yesno = { +static const true_false_string yesno = { "Yes", "No" }; diff --git a/packet-smb-browse.c b/packet-smb-browse.c index 728b480720..6988c18e52 100644 --- a/packet-smb-browse.c +++ b/packet-smb-browse.c @@ -2,24 +2,24 @@ * Routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.c,v 1.23 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-smb-browse.c,v 1.24 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -276,7 +276,7 @@ static const value_string desire_flags[] = { }; static const true_false_string tfs_desire_backup = { - "Backup Browse Server", + "Backup Browse Server", "NOT Backup Browse Server" }; static const true_false_string tfs_desire_standby = { @@ -361,11 +361,11 @@ dissect_election_criterion_os(tvbuff_t *tvb, proto_tree *parent_tree, int offset tree = proto_item_add_subtree(item, ett_browse_election_os); } - proto_tree_add_boolean(tree, hf_election_os_wfw, + proto_tree_add_boolean(tree, hf_election_os_wfw, tvb, offset, 1, os); - proto_tree_add_boolean(tree, hf_election_os_ntw, + proto_tree_add_boolean(tree, hf_election_os_ntw, tvb, offset, 1, os); - proto_tree_add_boolean(tree, hf_election_os_nts, + proto_tree_add_boolean(tree, hf_election_os_nts, tvb, offset, 1, os); } @@ -384,17 +384,17 @@ dissect_election_criterion_desire(tvbuff_t *tvb, proto_tree *parent_tree, int of tree = proto_item_add_subtree(item, ett_browse_election_desire); } - proto_tree_add_boolean(tree, hf_election_desire_flags_backup, + proto_tree_add_boolean(tree, hf_election_desire_flags_backup, tvb, offset, 1, desire); - proto_tree_add_boolean(tree, hf_election_desire_flags_standby, + proto_tree_add_boolean(tree, hf_election_desire_flags_standby, tvb, offset, 1, desire); - proto_tree_add_boolean(tree, hf_election_desire_flags_master, + proto_tree_add_boolean(tree, hf_election_desire_flags_master, tvb, offset, 1, desire); - proto_tree_add_boolean(tree, hf_election_desire_flags_domain_master, + proto_tree_add_boolean(tree, hf_election_desire_flags_domain_master, tvb, offset, 1, desire); - proto_tree_add_boolean(tree, hf_election_desire_flags_wins, + proto_tree_add_boolean(tree, hf_election_desire_flags_wins, tvb, offset, 1, desire); - proto_tree_add_boolean(tree, hf_election_desire_flags_nt, + proto_tree_add_boolean(tree, hf_election_desire_flags_nt, tvb, offset, 1, desire); } @@ -463,53 +463,53 @@ dissect_smb_server_type_flags(tvbuff_t *tvb, packet_info *pinfo, } } - proto_tree_add_boolean(tree, hf_server_type_workstation, + proto_tree_add_boolean(tree, hf_server_type_workstation, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_server, + proto_tree_add_boolean(tree, hf_server_type_server, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_sql, + proto_tree_add_boolean(tree, hf_server_type_sql, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_domain, + proto_tree_add_boolean(tree, hf_server_type_domain, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_backup, + proto_tree_add_boolean(tree, hf_server_type_backup, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_time, + proto_tree_add_boolean(tree, hf_server_type_time, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_apple, + proto_tree_add_boolean(tree, hf_server_type_apple, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_novell, + proto_tree_add_boolean(tree, hf_server_type_novell, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_member, + proto_tree_add_boolean(tree, hf_server_type_member, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_print, + proto_tree_add_boolean(tree, hf_server_type_print, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_dialin, + proto_tree_add_boolean(tree, hf_server_type_dialin, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_xenix, + proto_tree_add_boolean(tree, hf_server_type_xenix, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_ntw, + proto_tree_add_boolean(tree, hf_server_type_ntw, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_wfw, + proto_tree_add_boolean(tree, hf_server_type_wfw, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_nts, + proto_tree_add_boolean(tree, hf_server_type_nts, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_potentialb, + proto_tree_add_boolean(tree, hf_server_type_potentialb, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_backupb, + proto_tree_add_boolean(tree, hf_server_type_backupb, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_masterb, + proto_tree_add_boolean(tree, hf_server_type_masterb, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_domainmasterb, + proto_tree_add_boolean(tree, hf_server_type_domainmasterb, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_osf, + proto_tree_add_boolean(tree, hf_server_type_osf, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_vms, + proto_tree_add_boolean(tree, hf_server_type_vms, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_w95, + proto_tree_add_boolean(tree, hf_server_type_w95, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_local, + proto_tree_add_boolean(tree, hf_server_type_local, tvb, offset, 4, flags); - proto_tree_add_boolean(tree, hf_server_type_domainenum, + proto_tree_add_boolean(tree, hf_server_type_domainenum, tvb, offset, 4, flags); } @@ -586,7 +586,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr host_name, (cmd==BROWSE_DOMAIN_ANNOUNCEMENT)? "Domain/Workgroup: %s": - "Host Name: %s", + "Host Name: %s", host_name); offset += 16; @@ -646,7 +646,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* name of computer to which to send reply */ namelen = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_response_computer_name, + proto_tree_add_item(tree, hf_response_computer_name, tvb, offset, namelen, TRUE); offset += namelen; break; @@ -673,7 +673,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* server name */ namelen = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_server_name, + proto_tree_add_item(tree, hf_server_name, tvb, offset, namelen, TRUE); offset += namelen; break; @@ -702,7 +702,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* backup server names */ for (i = 0; i < server_count; i++) { namelen = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_backup_server, + proto_tree_add_item(tree, hf_backup_server, tvb, offset, namelen, TRUE); offset += namelen; } @@ -711,7 +711,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_MASTER_ANNOUNCEMENT: /* master browser server name */ namelen = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_mb_server_name, + proto_tree_add_item(tree, hf_mb_server_name, tvb, offset, namelen, TRUE); offset += namelen; break; @@ -719,7 +719,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr case BROWSE_BECOME_BACKUP: /* name of browser to promote */ namelen = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_browser_to_promote, + proto_tree_add_item(tree, hf_browser_to_promote, tvb, offset, namelen, TRUE); offset += namelen; break; @@ -1085,5 +1085,5 @@ proto_register_smb_browse(void) "BROWSER", "browser"); proto_register_field_array(proto_smb_browse, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); } diff --git a/packet-smb-browse.h b/packet-smb-browse.h index 6c686050c8..dc3a29e4d2 100644 --- a/packet-smb-browse.h +++ b/packet-smb-browse.h @@ -2,22 +2,22 @@ * Declaration of routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.h,v 1.4 2001/08/05 01:15:26 guy Exp $ + * $Id: packet-smb-browse.h,v 1.5 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-smb-common.c b/packet-smb-common.c index d76cfbfdc7..52ea9f9c82 100644 --- a/packet-smb-common.c +++ b/packet-smb-common.c @@ -2,24 +2,24 @@ * Common routines for smb packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-common.c,v 1.13 2002/08/10 21:15:37 guy Exp $ + * $Id: packet-smb-common.c,v 1.14 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -66,9 +66,9 @@ int display_ms_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index) str = g_malloc(len+1); tvb_memcpy(tvb, (guint8 *)str, offset, len); str[len] = '\0'; - + proto_tree_add_string(tree, hf_index, tvb, offset, len+1, str); - + /* * XXX - "proto_tree_add_string()" mallocates a copy; it'd * be nice not to have it copy the string, but just to @@ -119,11 +119,11 @@ int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_i charoffset += 2; } *p = '\0'; - + proto_tree_add_string(tree, hf_index, tvb, offset, len, str); g_free(str); - + return offset+len; } @@ -153,9 +153,9 @@ unicode_to_str(tvbuff_t *tvb, int offset, int *us_lenp, gboolean exactlen, if (cur == &str[0][0]) { cur = &str[1][0]; - } else if (cur == &str[1][0]) { + } else if (cur == &str[1][0]) { cur = &str[2][0]; - } else { + } else { cur = &str[0][0]; } p = cur; @@ -249,9 +249,9 @@ get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp, */ if (cur == &str[0][0]) { cur = &str[1][0]; - } else if (cur == &str[1][0]) { + } else if (cur == &str[1][0]) { cur = &str[2][0]; - } else { + } else { cur = &str[0][0]; } copylen = *len; diff --git a/packet-smb-common.h b/packet-smb-common.h index c948f5442e..9f5d02f276 100644 --- a/packet-smb-common.h +++ b/packet-smb-common.h @@ -2,24 +2,24 @@ * Routines for SMB packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-common.h,v 1.14 2002/08/10 21:15:37 guy Exp $ + * $Id: packet-smb-common.h,v 1.15 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-smb-logon.c b/packet-smb-logon.c index aac0d990b3..767a7d591d 100644 --- a/packet-smb-logon.c +++ b/packet-smb-logon.c @@ -2,24 +2,24 @@ * Routines for SMB net logon packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-logon.c,v 1.27 2002/06/24 01:53:10 guy Exp $ + * $Id: packet-smb-logon.c,v 1.28 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -174,7 +174,7 @@ display_LM_token(tvbuff_t *tvb, int offset, proto_tree *tree) Token = tvb_get_letohs(tvb, offset); if (Token & 0x01) { - proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, + proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, Token, "LM20 Token: 0x%04x (LanMan 2.0 or higher)", Token); } else { @@ -183,7 +183,7 @@ display_LM_token(tvbuff_t *tvb, int offset, proto_tree *tree) * and all values with it not set LM 1.0? * What do the other bits mean, if anything? */ - proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, + proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, Token, "LM10 Token: 0x%04x (WFW Networking)", Token); } @@ -201,14 +201,14 @@ display_LMNT_token(tvbuff_t *tvb, int offset, proto_tree *tree) Token = tvb_get_letohs(tvb, offset); if (Token == 0xffff) { - proto_tree_add_uint_format(tree, hf_lmnt_token, tvb, offset, 2, + proto_tree_add_uint_format(tree, hf_lmnt_token, tvb, offset, 2, Token, "LMNT Token: 0x%04x (Windows NT Networking)", Token); } else { /* * XXX - what is it if it's not 0xffff? */ - proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, + proto_tree_add_uint_format(tree, hf_lm_token, tvb, offset, 2, Token, "LMNT Token: 0x%04x (Unknown)", Token); } @@ -222,7 +222,7 @@ static int dissect_smb_logon_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset) { /*** 0x00 (LM1.0/LM2.0 LOGON Request) ***/ - + /* computer name */ offset = display_ms_string(tvb, tree, offset, hf_computer_name); @@ -311,7 +311,7 @@ static int dissect_smb_pdc_query(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset) { /*** 0x07 Query for Primary PDC ***/ - + /* computer name */ offset = display_ms_string(tvb, tree, offset, hf_computer_name); @@ -353,13 +353,13 @@ static int dissect_smb_pdc_startup(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset) { /*** 0x08 Announce startup of PDC ***/ - + /* pdc name */ offset = display_ms_string(tvb, tree, offset, hf_pdc_name); /* A short Announce will not have the rest */ - if (tvb_reported_length_remaining(tvb, offset) != 0) { + if (tvb_reported_length_remaining(tvb, offset) != 0) { if (offset % 2) offset++; /* word align ... */ @@ -544,7 +544,7 @@ dissect_smb_sam_logon_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre /* Domain SID */ offset = dissect_nt_sid(tvb, offset, tree, "Domain"); } - + /* NT version */ proto_tree_add_item(tree, hf_nt_version, tvb, offset, 4, TRUE); offset += 4; @@ -883,7 +883,7 @@ proto_register_smb_logon( void) { "NT Version", "netlogon.nt_version", FT_UINT32, BASE_DEC, NULL, 0, "NETLOGON NT Version", HFILL }}, - /* An LMNT Token, if 0xffff, is "WindowsNT Networking"; + /* An LMNT Token, if 0xffff, is "WindowsNT Networking"; what is it otherwise? */ { &hf_lmnt_token, { "LMNT Token", "netlogon.lmnt_token", FT_UINT16, BASE_HEX, @@ -1004,5 +1004,5 @@ proto_register_smb_logon( void) "Microsoft Windows Logon Protocol", "NETLOGON", "netlogon"); proto_register_field_array(proto_smb_logon, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); } diff --git a/packet-smb-logon.h b/packet-smb-logon.h index a153242e37..525cb6af98 100644 --- a/packet-smb-logon.h +++ b/packet-smb-logon.h @@ -2,7 +2,7 @@ * Declaration of outines for SMB net logon packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-logon.h,v 1.2 2001/07/08 11:32:02 guy Exp $ + * $Id: packet-smb-logon.h,v 1.3 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c index 3c360f8efb..a99def1937 100644 --- a/packet-smb-mailslot.c +++ b/packet-smb-mailslot.c @@ -2,24 +2,24 @@ * Routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-mailslot.c,v 1.32 2002/07/13 19:33:20 guy Exp $ + * $Id: packet-smb-mailslot.c,v 1.33 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -69,7 +69,7 @@ static const value_string class_vals[] = { mailslot is NULL si->trans_subcmd gives us which mailslot this response refers to. */ - + gboolean dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, tvbuff_t *tvb, const char *mailslot, packet_info *pinfo, diff --git a/packet-smb-mailslot.h b/packet-smb-mailslot.h index 520110f84e..879113bcef 100644 --- a/packet-smb-mailslot.h +++ b/packet-smb-mailslot.h @@ -2,22 +2,22 @@ * Declaration of routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-mailslot.h,v 1.6 2001/11/19 10:23:38 guy Exp $ + * $Id: packet-smb-mailslot.h,v 1.7 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index 301dec19c4..b918a8ec68 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,24 +8,24 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.81 2002/08/02 23:36:01 jmayer Exp $ + * $Id: packet-smb-pipe.c,v 1.82 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -696,7 +696,7 @@ add_logon_args(tvbuff_t *tvb, int offset, int count, packet_info *pinfo _U_, return offset; } -/* +/* * The following data structure describes the Remote API requests we * understand. * @@ -1406,7 +1406,7 @@ static const struct lanman_desc lmd[] = { lm_data_resp_netsharegetinfo, lm_null }, - { API_NetServerGetInfo, + { API_NetServerGetInfo, lm_params_req_netservergetinfo, NULL, NULL, @@ -3164,7 +3164,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree pinfo->can_desegment=0; pinfo->desegment_offset = 0; pinfo->desegment_len = 0; - if(smb_dcerpc_reassembly){ + if(smb_dcerpc_reassembly){ pinfo->can_desegment=2; } @@ -3175,7 +3175,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree fragment_data *fd_head; tvbuff_t *new_tvb; - fd_head=fragment_get(pinfo, pinfo->fd->num , + fd_head=fragment_get(pinfo, pinfo->fd->num , dcerpc_fragment_table); if(fd_head && fd_head->flags&FD_DEFRAGMENTED){ new_tvb = tvb_new_real_data(fd_head->data, @@ -3202,8 +3202,8 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree fragment_add(d_tvb, 0, pinfo, pinfo->fd->num, dcerpc_fragment_table, 0, tvb_length(d_tvb), TRUE); - fragment_set_tot_len(pinfo, pinfo->fd->num, - dcerpc_fragment_table, + fragment_set_tot_len(pinfo, pinfo->fd->num, + dcerpc_fragment_table, pinfo->desegment_len+tvb_length(d_tvb)); /* since the other fragments are in normal ReadAndX and WriteAndX calls we must make sure we can map FID values to this defragmentation @@ -3212,7 +3212,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree if(g_hash_table_lookup(smb_priv->ct->dcerpc_fid_to_frame, (void *)fid)){ g_hash_table_remove(smb_priv->ct->dcerpc_fid_to_frame, (void *)fid); } - g_hash_table_insert(smb_priv->ct->dcerpc_fid_to_frame, (void *)fid, + g_hash_table_insert(smb_priv->ct->dcerpc_fid_to_frame, (void *)fid, (void *)pinfo->fd->num); } /* clear out the variables */ @@ -3425,7 +3425,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, /* assume it is DCERPC */ trans_subcmd=PIPE_DCERPC; } - + if (!pinfo->fd->flags.visited) tri->trans_subcmd = trans_subcmd; } else diff --git a/packet-smb-pipe.h b/packet-smb-pipe.h index 6f86f91c7e..f422fd27f4 100644 --- a/packet-smb-pipe.h +++ b/packet-smb-pipe.h @@ -2,22 +2,22 @@ * Declarations of routines for SMB named pipe packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-pipe.h,v 1.10 2002/03/16 04:39:28 sahlberg Exp $ + * $Id: packet-smb-pipe.h,v 1.11 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-smb.c b/packet-smb.c index e4efc4e474..2b6c5ed830 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,24 +3,24 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.283 2002/08/25 22:57:26 guy Exp $ + * $Id: packet-smb.c,v 1.284 2002/08/28 21:00:31 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -818,7 +818,7 @@ smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb, * at one time? * * It is probably not much point in even trying to do something here - * if we have never seen the initial request. Without the initial + * if we have never seen the initial request. Without the initial * request we probably miss all parameters and the begining of data * so we cant even call a subdissector since we can not determine * which type of transaction call this is. @@ -838,7 +838,7 @@ smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb, or else we might end up with dissecting one HUGE transaction PDU a LOT of times. (first fragment is the only one containing the setup bytes) - I have seen ONE Transaction PDU that is ~60kb, spanning many Transaction + I have seen ONE Transaction PDU that is ~60kb, spanning many Transaction SMBs. Takes a LOT of time dissecting and is not fun. */ if( (pos==0) && fd_head && fd_head->flags&FD_DEFRAGMENTED){ @@ -847,7 +847,7 @@ smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb, return NULL; } } - + @@ -1027,7 +1027,7 @@ TimeZone(time_t t) /* * Return the same value as TimeZone, but it should be more efficient. * - * We keep a table of DST offsets to prevent calling localtime() on each + * We keep a table of DST offsets to prevent calling localtime() on each * call of this function. This saves a LOT of time on many unixes. * * Updated by Paul Eggert <eggert@twinsun.com> @@ -1082,19 +1082,19 @@ TimeZoneFaster(time_t t) } else { dst_table = tdt; table_size++; - - dst_table[i].zone = zone; + + dst_table[i].zone = zone; dst_table[i].start = dst_table[i].end = t; - + /* no entry will cover more than 6 months */ low = t - MAX_DST_WIDTH/2; if (t < low) low = TIME_T_MIN; - + high = t + MAX_DST_WIDTH/2; if (high < t) high = TIME_T_MAX; - + /* * Widen the new entry using two bisection searches. */ @@ -1153,7 +1153,7 @@ dissect_smb_UTIME(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date) { guint32 timeval; nstime_t ts; - + timeval = tvb_get_letohl(tvb, offset); if (timeval == 0xffffffff) { proto_tree_add_text(tree, tvb, offset, 4, @@ -1171,7 +1171,7 @@ dissect_smb_UTIME(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date) proto_tree_add_time(tree, hf_date, tvb, offset, 4, &ts); offset += 4; - + return offset; } @@ -1201,7 +1201,7 @@ static gboolean nt_time_to_nstime(guint32 filetime_high, guint32 filetime_low, nstime_t *tv) { double d; - /* The next two lines are a fix needed for the + /* The next two lines are a fix needed for the broken SCO compiler. JRA. */ time_t l_time_min = TIME_T_MIN; time_t l_time_max = TIME_T_MAX; @@ -1215,7 +1215,7 @@ nt_time_to_nstime(guint32 filetime_high, guint32 filetime_low, nstime_t *tv) d = ((double)filetime_high)*4.0*(double)(1<<30); d += filetime_low; d *= 1.0e-7; - + /* Now adjust by 369 years, to make the seconds since 1970. */ d -= TIME_FIXUP_CONSTANT; @@ -1238,8 +1238,8 @@ dissect_smb_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date) nstime_t ts; /* XXX there seems also to be another special time value which is fairly common : - 0x40000000 00000000 - the meaning of this one is yet unknown + 0x40000000 00000000 + the meaning of this one is yet unknown */ if (tree) { filetime_low = tvb_get_letohl(tvb, offset); @@ -1256,7 +1256,7 @@ dissect_smb_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date) proto_tree_add_text(tree, tvb, offset, 8, "%s: Infinity (absolute time)", proto_registrar_get_name(hf_date)); - } else { + } else { if (nt_time_to_nstime(filetime_high, filetime_low, &ts)) { proto_tree_add_time(tree, hf_date, tvb, offset, 8, &ts); @@ -1734,7 +1734,7 @@ dissect_search_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) proto_tree_add_boolean(tree, hf_smb_search_attribute_hidden, tvb, offset, 2, mask); proto_tree_add_boolean(tree, hf_smb_search_attribute_system, - tvb, offset, 2, mask); + tvb, offset, 2, mask); proto_tree_add_boolean(tree, hf_smb_search_attribute_volume, tvb, offset, 2, mask); proto_tree_add_boolean(tree, hf_smb_search_attribute_directory, @@ -2343,7 +2343,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in tvb, offset, bc, bc); call_dissector( - gssapi_handle, gssapi_tvb, pinfo, + gssapi_handle, gssapi_tvb, pinfo, gssapi_tree); COUNT_BYTES(bc); @@ -2368,7 +2368,7 @@ dissect_old_dir_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint16 bc; WORD_COUNT; - + BYTE_COUNT; /* buffer format */ @@ -2399,9 +2399,9 @@ dissect_empty(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offse { guint8 wc; guint16 bc; - + WORD_COUNT; - + BYTE_COUNT; END_OF_SMB @@ -2470,7 +2470,7 @@ dissect_tree_connect_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint16 bc; WORD_COUNT; - + BYTE_COUNT; /* buffer format */ @@ -2530,7 +2530,7 @@ dissect_tree_connect_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree guint16 bc; WORD_COUNT; - + /* Maximum Buffer Size */ proto_tree_add_item(tree, hf_smb_max_buf_size, tvb, offset, 2, TRUE); offset += 2; @@ -2545,7 +2545,7 @@ dissect_tree_connect_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree return offset; } - + static const true_false_string tfs_of_create = { "Create file if it does not exist", @@ -2609,7 +2609,7 @@ dissect_move_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) "Flags: 0x%04x", mask); tree = proto_item_add_subtree(item, ett_smb_move_copy_flags); } - + proto_tree_add_boolean(tree, hf_smb_move_flags_verify, tvb, offset, 2, mask); proto_tree_add_boolean(tree, hf_smb_move_flags_dir, @@ -2648,7 +2648,7 @@ dissect_copy_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) "Flags: 0x%04x", mask); tree = proto_item_add_subtree(item, ett_smb_move_copy_flags); } - + proto_tree_add_boolean(tree, hf_smb_copy_flags_ea_action, tvb, offset, 2, mask); proto_tree_add_boolean(tree, hf_smb_copy_flags_tree_copy, @@ -2909,7 +2909,7 @@ dissect_open_file_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* last write time */ offset = dissect_smb_UTIME(tvb, tree, offset, hf_smb_last_write_time); - + /* File Size */ proto_tree_add_item(tree, hf_smb_file_size, tvb, offset, 4, TRUE); offset += 4; @@ -3119,7 +3119,7 @@ dissect_nt_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* search attributes */ offset = dissect_search_attributes(tvb, tree, offset); - + proto_tree_add_uint(tree, hf_smb_nt_rename_level, tvb, offset, 2, tvb_get_letohs(tvb, offset)); offset += 2; @@ -3205,7 +3205,7 @@ dissect_query_information_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree return offset; } - + static int dissect_query_information_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -3489,8 +3489,8 @@ dissect_write_file_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset += 4; if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - ", %u byte%s at offset %u", cnt, + col_append_fstr(pinfo->cinfo, COL_INFO, + ", %u byte%s at offset %u", cnt, (cnt == 1) ? "" : "s", ofs); /* remaining */ @@ -3525,7 +3525,7 @@ dissect_write_file_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr return offset; } - + static int dissect_write_file_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -3540,7 +3540,7 @@ dissect_write_file_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset += 2; if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, ", %u byte%s", cnt, (cnt == 1) ? "" : "s"); BYTE_COUNT; @@ -3711,7 +3711,7 @@ dissect_seek_file_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr return offset; } - + static int dissect_set_information2_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -3813,7 +3813,7 @@ dissect_write_and_close_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* last write time */ offset = dissect_smb_UTIME(tvb, tree, offset, hf_smb_last_write_time); - + if(wc==12){ /* 12 reserved bytes */ proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 12, TRUE); @@ -3826,7 +3826,7 @@ dissect_write_and_close_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre CHECK_BYTE_COUNT(1); proto_tree_add_item(tree, hf_smb_padding, tvb, offset, 1, TRUE); COUNT_BYTES(1); - + offset = dissect_file_data(tvb, tree, offset, cnt, cnt); bc = 0; /* XXX */ @@ -3834,7 +3834,7 @@ dissect_write_and_close_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre return offset; } - + static int dissect_write_and_close_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -4140,7 +4140,7 @@ dissect_write_raw_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre return offset; } - + static int dissect_write_raw_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -4197,7 +4197,7 @@ dissect_write_mpx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre /* request mask */ proto_tree_add_item(tree, hf_smb_request_mask, tvb, offset, 4, TRUE); offset += 4; - + /* data len */ datalen = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_data_len, tvb, offset, 2, datalen); @@ -4218,7 +4218,7 @@ dissect_write_mpx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre return offset; } - + static int dissect_write_mpx_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -4230,7 +4230,7 @@ dissect_write_mpx_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* response mask */ proto_tree_add_item(tree, hf_smb_response_mask, tvb, offset, 4, TRUE); offset += 4; - + BYTE_COUNT; END_OF_SMB @@ -4683,7 +4683,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * litem = proto_tree_add_text(tr, tvb, offset, 20, "Unlock"); ltree = proto_item_add_subtree(litem, ett_smb_unlock); - + /* PID */ CHECK_BYTE_COUNT(2); proto_tree_add_item(ltree, hf_smb_pid, tvb, offset, 2, TRUE); @@ -4708,7 +4708,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * litem = proto_tree_add_text(tr, tvb, offset, 10, "Unlock"); ltree = proto_item_add_subtree(litem, ett_smb_unlock); - + /* PID */ CHECK_BYTE_COUNT(2); proto_tree_add_item(ltree, hf_smb_pid, tvb, offset, 2, TRUE); @@ -4744,7 +4744,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * litem = proto_tree_add_text(tr, tvb, offset, 20, "Lock"); ltree = proto_item_add_subtree(litem, ett_smb_lock); - + /* PID */ CHECK_BYTE_COUNT(2); proto_tree_add_item(ltree, hf_smb_pid, tvb, offset, 2, TRUE); @@ -4769,7 +4769,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * litem = proto_tree_add_text(tr, tvb, offset, 10, "Unlock"); ltree = proto_item_add_subtree(litem, ett_smb_unlock); - + /* PID */ CHECK_BYTE_COUNT(2); proto_tree_add_item(ltree, hf_smb_pid, tvb, offset, 2, TRUE); @@ -4984,7 +4984,7 @@ dissect_open_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* creation time */ offset = dissect_smb_UTIME(tvb, tree, offset, hf_smb_create_time); - + /* open function */ offset = dissect_open_function(tvb, tree, offset); @@ -5112,7 +5112,7 @@ dissect_open_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* last write time */ offset = dissect_smb_UTIME(tvb, tree, offset, hf_smb_last_write_time); - + /* File Size */ proto_tree_add_item(tree, hf_smb_file_size, tvb, offset, 4, TRUE); offset += 4; @@ -5198,8 +5198,8 @@ dissect_read_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset += 2; if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - ", %u byte%s at offset %u", maxcnt, + col_append_fstr(pinfo->cinfo, COL_INFO, + ", %u byte%s at offset %u", maxcnt, (maxcnt == 1) ? "" : "s", ofs); /* min count */ @@ -5248,7 +5248,7 @@ dissect_read_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format(tree, hf_smb_cmd, tvb, offset, 1, cmd, "AndXCommand: No further commands (0xff)"); } offset += 1; - + /* reserved byte */ proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); offset += 1; @@ -5283,8 +5283,8 @@ dissect_read_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - ", %u byte%s", datalen, + col_append_fstr(pinfo->cinfo, COL_INFO, + ", %u byte%s", datalen, (datalen == 1) ? "" : "s"); /* data offset */ @@ -5327,13 +5327,13 @@ dissect_read_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } fd_head=fragment_add(tvb, dataoffset, pinfo, frame, dcerpc_fragment_table, - fd_head->offset+fd_head->len, + fd_head->offset+fd_head->len, datalen, TRUE); - /* we completed reassembly, abort searching for more + /* we completed reassembly, abort searching for more fragments*/ if(fd_head){ g_hash_table_remove(si->ct->dcerpc_fid_to_frame, - si->sip->extra_info); + si->sip->extra_info); } } } @@ -5468,13 +5468,13 @@ dissect_write_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } fd_head=fragment_add(tvb, dataoffset, pinfo, frame, dcerpc_fragment_table, - fd_head->offset+fd_head->len, + fd_head->offset+fd_head->len, datalen, TRUE); - /* we completed reassembly, abort searching for more + /* we completed reassembly, abort searching for more fragments*/ if(fd_head){ g_hash_table_remove(si->ct->dcerpc_fid_to_frame, - si->sip->extra_info); + si->sip->extra_info); } } } @@ -5519,7 +5519,7 @@ dissect_write_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format(tree, hf_smb_cmd, tvb, offset, 1, cmd, "AndXCommand: No further commands (0xff)"); } offset += 1; - + /* reserved byte */ proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); offset += 1; @@ -5585,7 +5585,7 @@ dissect_setup_action(tvbuff_t *tvb, proto_tree *parent_tree, int offset) return offset; } - + static int dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree) @@ -5705,9 +5705,9 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if(sbloblen){ tvbuff_t *gssapi_tvb; proto_tree *gssapi_tree; - + CHECK_BYTE_COUNT(sbloblen); - + gssapi_tree = proto_item_add_subtree( blob_item, ett_smb_gssapi); @@ -5716,7 +5716,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree call_dissector( gssapi_handle, gssapi_tvb, pinfo, gssapi_tree); - + COUNT_BYTES(sbloblen); } @@ -5763,7 +5763,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if(pwlen){ /* password, ASCII */ CHECK_BYTE_COUNT(pwlen); - proto_tree_add_item(tree, hf_smb_password, + proto_tree_add_item(tree, hf_smb_password, tvb, offset, pwlen, TRUE); COUNT_BYTES(pwlen); } @@ -5774,7 +5774,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if(apwlen){ /* password, ANSI */ CHECK_BYTE_COUNT(apwlen); - proto_tree_add_item(tree, hf_smb_ansi_password, + proto_tree_add_item(tree, hf_smb_ansi_password, tvb, offset, apwlen, TRUE); COUNT_BYTES(apwlen); } @@ -5782,7 +5782,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if(upwlen){ /* password, Unicode */ CHECK_BYTE_COUNT(upwlen); - proto_tree_add_item(tree, hf_smb_unicode_password, + proto_tree_add_item(tree, hf_smb_unicode_password, tvb, offset, upwlen, TRUE); COUNT_BYTES(upwlen); } @@ -5816,10 +5816,10 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_append_fstr(pinfo->cinfo, COL_INFO, ", User: "); if (!dn[0] && !an[0]) - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "anonymous"); else - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "%s\\%s", dn,an); } @@ -5911,16 +5911,16 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree *gssapi_tree; CHECK_BYTE_COUNT(sbloblen); - + gssapi_tree = proto_item_add_subtree( blob_item, ett_smb_gssapi); gssapi_tvb = tvb_new_subset( tvb, offset, sbloblen, sbloblen); - + call_dissector( gssapi_handle, gssapi_tvb, pinfo, gssapi_tree); - + COUNT_BYTES(sbloblen); } } @@ -5962,7 +5962,7 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre return offset; } - + static int dissect_empty_andx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree) { @@ -6000,7 +6000,7 @@ dissect_empty_andx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs return offset; } - + static const true_false_string tfs_connect_support_search = { "Exclusive search bits supported", "Exclusive search bits not supported" @@ -6105,7 +6105,7 @@ dissect_tree_connect_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* password */ CHECK_BYTE_COUNT(pwlen); - proto_tree_add_item(tree, hf_smb_password, + proto_tree_add_item(tree, hf_smb_password, tvb, offset, pwlen, TRUE); COUNT_BYTES(pwlen); @@ -6669,7 +6669,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, proto_tree *parent_tree, int offset) } /* - * Some of these bits come from + * Some of these bits come from * * http://www.samba.org/samba/ftp/specs/smb-nt01.doc * @@ -6858,7 +6858,7 @@ dissect_nt_create_options(tvbuff_t *tvb, proto_tree *parent_tree, int offset) return offset; } - + static int dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { @@ -6873,7 +6873,7 @@ dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int "Completion Filter: 0x%08x", mask); tree = proto_item_add_subtree(item, ett_smb_nt_notify_completion_filter); } - + proto_tree_add_boolean(tree, hf_smb_nt_notify_stream_write, tvb, offset, 4, mask); proto_tree_add_boolean(tree, hf_smb_nt_notify_stream_size, @@ -6902,7 +6902,7 @@ dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int offset += 4; return offset; } - + static int dissect_nt_ioctl_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { @@ -7014,7 +7014,7 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name) offset += 1; switch(revision){ - case 1: + case 1: case 2: /* Not sure what the different revision numbers mean */ /* number of authorities*/ num_auth = tvb_get_guint8(tvb, offset); @@ -7036,7 +7036,7 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name) sa_offset = offset; gstr = g_string_new(""); - + CLEANUP_PUSH(free_g_string, gstr); /* sub authorities, leave RID to last */ @@ -7064,7 +7064,7 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name) offset+=4; } else { - proto_item_append_text(item, ": S-1-%u-%s", auth, gstr->str); + proto_item_append_text(item, ": S-1-%u-%s", auth, gstr->str); } CLEANUP_CALL_AND_POP; @@ -7174,7 +7174,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, proto_tree *parent_tree) proto_tree *tree = NULL; int old_offset = offset; guint16 size; - + if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, -1, "NT ACE: "); @@ -7591,11 +7591,11 @@ dissect_nt_trans_param_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr /* nt access mask */ offset = dissect_nt_access_mask(tvb, tree, offset); bc -= 4; - + /* allocation size */ proto_tree_add_item(tree, hf_smb_alloc_size64, tvb, offset, 8, TRUE); COUNT_BYTES(8); - + /* Extended File Attributes */ offset = dissect_file_ext_attr(tvb, tree, offset); bc -= 4; @@ -7603,7 +7603,7 @@ dissect_nt_trans_param_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr /* share access */ offset = dissect_nt_share_access(tvb, tree, offset); bc -= 4; - + /* create disposition */ proto_tree_add_item(tree, hf_smb_nt_create_disposition, tvb, offset, 4, TRUE); COUNT_BYTES(4); @@ -7630,7 +7630,7 @@ dissect_nt_trans_param_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr /* impersonation level */ proto_tree_add_item(tree, hf_smb_nt_impersonation_level, tvb, offset, 4, TRUE); COUNT_BYTES(4); - + /* security flags */ offset = dissect_nt_security_flags(tvb, tree, offset); bc -= 1; @@ -7710,7 +7710,7 @@ dissect_nt_trans_setup_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr val_to_str(ntd->subcmd, nt_cmd_vals, "Unknown NT transaction (%u)")); tree = proto_item_add_subtree(item, ett_smb_nt_trans_setup); } - + switch(ntd->subcmd){ case NT_TRANS_CREATE: break; @@ -7770,7 +7770,7 @@ dissect_nt_trans_setup_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pr /* not decoded yet */ break; } - + return old_offset+len; } @@ -7813,7 +7813,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* total param count */ proto_tree_add_item(tree, hf_smb_total_param_count, tvb, offset, 4, TRUE); offset += 4; - + /* total data count */ proto_tree_add_item(tree, hf_smb_total_data_count, tvb, offset, 4, TRUE); offset += 4; @@ -7833,7 +7833,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree pc = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_count32, tvb, offset, 4, pc); offset += 4; - + /* param offset */ po = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_offset32, tvb, offset, 4, po); @@ -7894,7 +7894,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree ntd.subcmd = subcmd; if (!si->unidir) { if(!pinfo->fd->flags.visited){ - /* + /* * Allocate a new smb_nt_transact_info_t * structure. */ @@ -7925,7 +7925,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } BYTE_COUNT; - + /* parameters */ if(po>(guint32)offset){ /* We have some initial padding bytes. @@ -7966,8 +7966,8 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static int -dissect_nt_trans_data_response(tvbuff_t *tvb, packet_info *pinfo, - int offset, proto_tree *parent_tree, int len, +dissect_nt_trans_data_response(tvbuff_t *tvb, packet_info *pinfo, + int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd _U_) { proto_item *item = NULL; @@ -8037,10 +8037,10 @@ dissect_nt_trans_data_response(tvbuff_t *tvb, packet_info *pinfo, return offset; } - + static int -dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, - int offset, proto_tree *parent_tree, +dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, + int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd _U_, guint16 bc) { proto_item *item = NULL; @@ -8089,7 +8089,7 @@ dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, /* reserved byte */ proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); offset += 1; - + /* fid */ fid = tvb_get_letohs(tvb, offset); add_fid(tvb, pinfo, tree, offset, 2, fid); @@ -8106,19 +8106,19 @@ dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, /* create time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); - + /* access time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); - + /* last write time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); - + /* last change time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); - + /* Extended File Attributes */ offset = dissect_file_ext_attr(tvb, tree, offset); @@ -8156,7 +8156,7 @@ dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, len -= 4; /* broken implementations */ if(len<0)break; - + /* action */ proto_tree_add_item(tree, hf_smb_nt_notify_action, tvb, offset, 4, TRUE); COUNT_BYTES(4); @@ -8230,10 +8230,10 @@ dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, return offset; } - + static int -dissect_nt_trans_setup_response(tvbuff_t *tvb, packet_info *pinfo, - int offset, proto_tree *parent_tree, +dissect_nt_trans_setup_response(tvbuff_t *tvb, packet_info *pinfo, + int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd _U_) { proto_item *item = NULL; @@ -8338,7 +8338,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tp = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_total_param_count, tvb, offset, 4, tp); offset += 4; - + /* total data count */ td = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_total_data_count, tvb, offset, 4, td); @@ -8348,7 +8348,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre pc = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_count32, tvb, offset, 4, pc); offset += 4; - + /* param offset */ po = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_offset32, tvb, offset, 4, po); @@ -8379,7 +8379,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_uint(tree, hf_smb_setup_count, tvb, offset, 1, sc); offset += 1; - /* setup data */ + /* setup data */ if(sc){ dissect_nt_trans_setup_response(tvb, pinfo, offset, tree, sc*2, &ntd); offset += sc*2; @@ -8394,26 +8394,26 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre save_fragmented = pinfo->fragmented; /* do we need reassembly? */ if( (td&&(td!=dc)) || (tp&&(tp!=pc)) ){ - /* oh yeah, either data or parameter section needs + /* oh yeah, either data or parameter section needs reassembly... */ pinfo->fragmented = TRUE; if(smb_trans_reassembly){ /* ...and we were told to do reassembly */ if(pc && ((unsigned int)tvb_length_remaining(tvb, po)>=pc) ){ - r_fd = smb_trans_defragment(tree, pinfo, tvb, + r_fd = smb_trans_defragment(tree, pinfo, tvb, po, pc, pd, td+tp); - + } if((r_fd==NULL) && dc && ((unsigned int)tvb_length_remaining(tvb, od)>=dc) ){ - r_fd = smb_trans_defragment(tree, pinfo, tvb, + r_fd = smb_trans_defragment(tree, pinfo, tvb, od, dc, dd+tp, td+tp); } } } /* if we got a reassembled fd structure from the reassembly routine we - must create pd_tvb from it + must create pd_tvb from it */ if(r_fd){ pd_tvb = tvb_new_real_data(r_fd->data, r_fd->datalen, @@ -8431,7 +8431,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre &ntd, tvb_length(pd_tvb)); dissect_nt_trans_data_response(pd_tvb, pinfo, tp, tree, td, &ntd); } else { - /* we do not have reassembled data, just use what we have in the + /* we do not have reassembled data, just use what we have in the packet as well as we can */ /* parameters */ if(po>(guint32)offset){ @@ -8448,7 +8448,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre dissect_nt_trans_param_response(tvb, pinfo, offset, tree, pc, &ntd, bc); COUNT_BYTES(pc); } - + /* data */ if(od>(guint32)offset){ /* We have some initial padding bytes. @@ -8481,7 +8481,7 @@ static const value_string print_mode_vals[] = { {1, "Graphics Mode"}, {0, NULL} }; - + static int dissect_open_print_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -8567,7 +8567,7 @@ static const value_string print_status_vals[] = { {6, "Printer error"}, {0, NULL} }; - + static int dissect_get_print_queue_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, proto_tree *smb_tree _U_) { @@ -9001,7 +9001,7 @@ dissect_nt_create_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr return offset; } - + static int dissect_nt_create_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree) @@ -9047,17 +9047,17 @@ dissect_nt_create_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* create time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); - + /* access time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); - + /* last write time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); /* last change time */ offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); - + /* Extended File Attributes */ offset = dissect_file_ext_attr(tvb, tree, offset); @@ -9098,7 +9098,7 @@ dissect_nt_cancel_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint16 bc; WORD_COUNT; - + BYTE_COUNT; END_OF_SMB @@ -9454,7 +9454,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, bc, "%s Parameters", - val_to_str(subcmd, trans2_cmd_vals, + val_to_str(subcmd, trans2_cmd_vals, "Unknown (0x%02x)")); tree = proto_item_add_subtree(item, ett_smb_transaction_params); } @@ -9618,7 +9618,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); - + /* 4 reserved bytes */ CHECK_BYTE_COUNT_TRANS(4); proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 4, TRUE); @@ -9645,7 +9645,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); - + /* 4 reserved bytes */ CHECK_BYTE_COUNT_TRANS(4); proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 4, TRUE); @@ -9680,7 +9680,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); - + break; } case 0x08: { /*TRANS2_SET_FILE_INFORMATION*/ @@ -9699,7 +9699,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, t2i->info_level = si->info_level; proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level); COUNT_BYTES_TRANS(2); - + #if 0 /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -9828,7 +9828,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, CHECK_BYTE_COUNT_TRANS(2); proto_tree_add_item(tree, hf_smb_max_referral_level, tvb, offset, 2, TRUE); COUNT_BYTES_TRANS(2); - + /* file name */ fn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &fn_len, FALSE, FALSE, &bc); CHECK_STRING_TRANS(fn); @@ -9893,7 +9893,7 @@ dissect_transaction_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) return mask; } - + static int dissect_get_dfs_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) @@ -10054,7 +10054,7 @@ dissect_get_dfs_referral_data(tvbuff_t *tvb, packet_info *pinfo, rt = proto_item_add_subtree(ri, ett_smb_dfs_referral); } - + /* referral version */ CHECK_BYTE_COUNT_TRANS_SUBR(2); version = tvb_get_letohs(tvb, offset); @@ -10139,7 +10139,7 @@ dissect_get_dfs_referral_data(tvbuff_t *tvb, packet_info *pinfo, *bcp = save_bc; } } - + /* alt path */ if (altpathoffset != 0) { stroffset = old_offset + altpathoffset; @@ -10158,7 +10158,7 @@ dissect_get_dfs_referral_data(tvbuff_t *tvb, packet_info *pinfo, *bcp = save_bc; } } - + /* node */ if (nodeoffset != 0) { stroffset = old_offset + nodeoffset; @@ -10321,23 +10321,23 @@ dissect_4_2_14_4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); *bcp -= 8; - + /* access time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); *bcp -= 8; - + /* last write time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); *bcp -= 8; - + /* last change time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); *bcp -= 8; - + /* File Attributes */ CHECK_BYTE_COUNT_SUBR(2); offset = dissect_file_attributes(tvb, tree, offset); @@ -10435,7 +10435,7 @@ static int dissect_4_2_14_8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 *bcp, gboolean *trunc) { - + offset = dissect_4_2_14_4(tvb, pinfo, tree, offset, bcp, trunc); if (*trunc) { return offset; @@ -10478,7 +10478,7 @@ dissect_4_2_14_8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, CHECK_BYTE_COUNT_SUBR(4); proto_tree_add_item(tree, hf_smb_t2_alignment, tvb, offset, 4, TRUE); COUNT_BYTES_SUBR(4); - + offset = dissect_4_2_14_6(tvb, pinfo, tree, offset, bcp, trunc); return offset; @@ -10516,13 +10516,13 @@ dissect_4_2_14_10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, neo = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_next_entry_offset, tvb, offset, 4, neo); COUNT_BYTES_SUBR(4); - + /* stream name len */ CHECK_BYTE_COUNT_SUBR(4); fn_len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_t2_stream_name_length, tvb, offset, 4, fn_len); COUNT_BYTES_SUBR(4); - + /* stream size */ CHECK_BYTE_COUNT_SUBR(8); proto_tree_add_item(tree, hf_smb_t2_stream_size, tvb, offset, 8, TRUE); @@ -10539,7 +10539,7 @@ dissect_4_2_14_10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_string(tree, hf_smb_t2_stream_name, tvb, offset, fn_len, fn); COUNT_BYTES_SUBR(fn_len); - + proto_item_append_text(item, ": %s", fn); proto_item_set_len(item, offset-old_offset); @@ -10580,22 +10580,22 @@ dissect_4_2_14_11(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, CHECK_BYTE_COUNT_SUBR(2); proto_tree_add_item(tree, hf_smb_t2_compressed_format, tvb, offset, 2, TRUE); COUNT_BYTES_SUBR(2); - + /* compression unit shift */ CHECK_BYTE_COUNT_SUBR(1); proto_tree_add_item(tree, hf_smb_t2_compressed_unit_shift,tvb, offset, 1, TRUE); COUNT_BYTES_SUBR(1); - + /* compression chunk shift */ CHECK_BYTE_COUNT_SUBR(1); proto_tree_add_item(tree, hf_smb_t2_compressed_chunk_shift, tvb, offset, 1, TRUE); COUNT_BYTES_SUBR(1); - + /* compression cluster shift */ CHECK_BYTE_COUNT_SUBR(1); proto_tree_add_item(tree, hf_smb_t2_compressed_cluster_shift, tvb, offset, 1, TRUE); COUNT_BYTES_SUBR(1); - + /* 3 reserved bytes */ CHECK_BYTE_COUNT_SUBR(3); proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 3, TRUE); @@ -10618,7 +10618,7 @@ dissect_qpi_loi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if(!*bcp){ return offset; } - + si = (smb_info_t *)pinfo->private_data; switch(si->info_level){ case 1: /*Info Standard*/ @@ -10686,7 +10686,7 @@ dissect_qpi_loi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* XXX add this from the SNIA doc */ break; } - + return offset; } @@ -10786,7 +10786,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, dc, "%s Data", - val_to_str(subcmd, trans2_cmd_vals, + val_to_str(subcmd, trans2_cmd_vals, "Unknown (0x%02x)")); tree = proto_item_add_subtree(item, ett_smb_transaction_data); } @@ -10989,7 +10989,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* total param count, only a 16bit integer here*/ proto_tree_add_uint(tree, hf_smb_total_param_count, tvb, offset, 2, tvb_get_letohs(tvb, offset)); offset += 2; - + /* total data count , only 16bit integer here*/ proto_tree_add_uint(tree, hf_smb_total_data_count, tvb, offset, 2, tvb_get_letohs(tvb, offset)); offset += 2; @@ -11008,7 +11008,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pd = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_disp16, tvb, offset, 2, pd); offset += 2; - + /* data count */ dc = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_data_count16, tvb, offset, 2, dc); @@ -11018,7 +11018,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, od = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_data_offset16, tvb, offset, 2, od); offset += 2; - + /* data disp */ dd = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_data_disp16, tvb, offset, 2, dd); @@ -11087,7 +11087,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pc = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_count16, tvb, offset, 2, pc); offset += 2; - + /* param offset */ po = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_smb_param_offset16, tvb, offset, 2, po); @@ -11117,8 +11117,8 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* reserved byte */ proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); offset += 1; - - /* this is where the setup bytes, if any start */ + + /* this is where the setup bytes, if any start */ so = offset; sl = sc*2; @@ -11137,12 +11137,12 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, offset, 2, subcmd); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " %s", - val_to_str(subcmd, trans2_cmd_vals, + val_to_str(subcmd, trans2_cmd_vals, "Unknown (0x%02x)")); } if (!si->unidir) { if(!pinfo->fd->flags.visited){ - /* + /* * Allocate a new * smb_transact2_info_t * structure. @@ -11171,7 +11171,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } BYTE_COUNT; - + if(wc!=8){ /* primary request */ /* name is NULL if transaction2 */ @@ -11254,7 +11254,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /*TRANSACTION request parameters */ if(si->cmd==SMB_COM_TRANSACTION){ - /*XXX replace this block with a function and use that one + /*XXX replace this block with a function and use that one for both requests/responses*/ if(dd==0){ tvbuff_t *p_tvb, *d_tvb, *s_tvb; @@ -11290,7 +11290,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!si->unidir) { if(!pinfo->fd->flags.visited){ - /* + /* * Allocate a new smb_transact_info_t * structure. */ @@ -11368,7 +11368,7 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; } - + static int dissect_4_3_4_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, @@ -11460,7 +11460,7 @@ dissect_4_3_4_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, col_append_fstr(pinfo->cinfo, COL_INFO, " %s", fn); } - + proto_item_append_text(item, " File: %s", fn); proto_item_set_len(item, offset-old_offset); @@ -11500,7 +11500,7 @@ dissect_4_3_4_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(tree, hf_smb_resume, tvb, offset, 4, TRUE); COUNT_BYTES_SUBR(4); } - + /* create time */ CHECK_BYTE_COUNT_SUBR(4); offset = dissect_smb_datetime(tvb, tree, offset, @@ -11602,7 +11602,7 @@ dissect_4_3_4_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, neo = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_next_entry_offset, tvb, offset, 4, neo); COUNT_BYTES_SUBR(4); - + /* file index */ CHECK_BYTE_COUNT_SUBR(4); proto_tree_add_item(tree, hf_smb_file_index, tvb, offset, 4, TRUE); @@ -11612,23 +11612,23 @@ dissect_4_3_4_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); *bcp -= 8; - + /* access time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); *bcp -= 8; - + /* last write time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); *bcp -= 8; - + /* last change time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); *bcp -= 8; - + /* end of file */ CHECK_BYTE_COUNT_SUBR(8); proto_tree_add_item(tree, hf_smb_end_of_file, tvb, offset, 8, TRUE); @@ -11715,7 +11715,7 @@ dissect_4_3_4_5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, neo = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_next_entry_offset, tvb, offset, 4, neo); COUNT_BYTES_SUBR(4); - + /* file index */ CHECK_BYTE_COUNT_SUBR(4); proto_tree_add_item(tree, hf_smb_file_index, tvb, offset, 4, TRUE); @@ -11725,23 +11725,23 @@ dissect_4_3_4_5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); *bcp -= 8; - + /* access time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); *bcp -= 8; - + /* last write time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); *bcp -= 8; - + /* last change time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); *bcp -= 8; - + /* end of file */ CHECK_BYTE_COUNT_SUBR(8); proto_tree_add_item(tree, hf_smb_end_of_file, tvb, offset, 8, TRUE); @@ -11834,7 +11834,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, neo = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_next_entry_offset, tvb, offset, 4, neo); COUNT_BYTES_SUBR(4); - + /* file index */ CHECK_BYTE_COUNT_SUBR(4); proto_tree_add_item(tree, hf_smb_file_index, tvb, offset, 4, TRUE); @@ -11844,23 +11844,23 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); *bcp -= 8; - + /* access time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_access_time); *bcp -= 8; - + /* last write time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_last_write_time); *bcp -= 8; - + /* last change time */ CHECK_BYTE_COUNT_SUBR(8); offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_change_time); *bcp -= 8; - + /* end of file */ CHECK_BYTE_COUNT_SUBR(8); proto_tree_add_item(tree, hf_smb_end_of_file, tvb, offset, 8, TRUE); @@ -11897,7 +11897,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, CHECK_BYTE_COUNT_SUBR(1); proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); COUNT_BYTES_SUBR(1); - + /* short file name */ sfn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &sfn_len, FALSE, TRUE, bcp); CHECK_STRING_SUBR(sfn); @@ -11970,7 +11970,7 @@ dissect_4_3_4_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, neo = tvb_get_letohl(tvb, offset); proto_tree_add_uint(tree, hf_smb_next_entry_offset, tvb, offset, 4, neo); COUNT_BYTES_SUBR(4); - + /* file index */ CHECK_BYTE_COUNT_SUBR(4); proto_tree_add_item(tree, hf_smb_file_index, tvb, offset, 4, TRUE); @@ -12015,10 +12015,10 @@ dissect_4_3_4_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, *trunc = FALSE; return offset; } - + static int -dissect_4_3_4_8(tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *parent_tree _U_, int offset, guint16 *bcp, +dissect_4_3_4_8(tvbuff_t *tvb _U_, packet_info *pinfo _U_, + proto_tree *parent_tree _U_, int offset, guint16 *bcp, gboolean *trunc) { /*XXX im lazy. i havnt implemented this */ @@ -12038,7 +12038,7 @@ dissect_ff2_response_data(tvbuff_t * tvb, packet_info * pinfo, if(!*bcp){ return offset; } - + si = (smb_info_t *)pinfo->private_data; switch(si->info_level){ case 1: /*Info Standard*/ @@ -12049,7 +12049,7 @@ dissect_ff2_response_data(tvbuff_t * tvb, packet_info * pinfo, offset = dissect_4_3_4_2(tvb, pinfo, tree, offset, bcp, trunc); break; - case 3: /*Info Query EAs From List same as + case 3: /*Info Query EAs From List same as InfoQueryEASize*/ offset = dissect_4_3_4_2(tvb, pinfo, tree, offset, bcp, trunc); @@ -12115,7 +12115,7 @@ dissect_fs_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) offset += 4; return offset; } - + static int dissect_device_characteristics(tvbuff_t *tvb, proto_tree *parent_tree, int offset) @@ -12192,7 +12192,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if(!*bcp){ return offset; } - + si = (smb_info_t *)pinfo->private_data; switch(si->info_level){ case 1: /* SMB_INFO_ALLOCATION */ @@ -12265,7 +12265,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, offset = dissect_smb_64bit_time(tvb, tree, offset, hf_smb_create_time); *bcp -= 8; - + /* volume serial number */ CHECK_BYTE_COUNT_TRANS_SUBR(4); proto_tree_add_item(tree, hf_smb_volume_serial_num, tvb, offset, 4, TRUE); @@ -12320,12 +12320,12 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, CHECK_BYTE_COUNT_TRANS_SUBR(4); proto_tree_add_item(tree, hf_smb_device_type, tvb, offset, 4, TRUE); COUNT_BYTES_TRANS_SUBR(4); - + /* device characteristics */ CHECK_BYTE_COUNT_TRANS_SUBR(4); offset = dissect_device_characteristics(tvb, tree, offset); *bcp -= 4; - + break; case 0x0105: /* SMB_QUERY_FS_ATTRIBUTE_INFO */ case 1005: /* SMB_FS_ATTRIBUTE_INFORMATION */ @@ -12333,7 +12333,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, CHECK_BYTE_COUNT_TRANS_SUBR(4); offset = dissect_fs_attributes(tvb, tree, offset); *bcp -= 4; - + /* max name len */ CHECK_BYTE_COUNT_TRANS_SUBR(4); proto_tree_add_item(tree, hf_smb_max_name_len, tvb, offset, 4, TRUE); @@ -12369,7 +12369,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, *bcp -= 8; /* Allocation blocks */ CHECK_BYTE_COUNT_TRANS_SUBR(4); - proto_tree_add_item(tree, hf_smb_mac_alloc_block_count, tvb, + proto_tree_add_item(tree, hf_smb_mac_alloc_block_count, tvb, offset, 4, TRUE); COUNT_BYTES_TRANS_SUBR(4); @@ -12385,15 +12385,15 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, COUNT_BYTES_TRANS_SUBR(4); /* Finder Info ... */ CHECK_BYTE_COUNT_TRANS_SUBR(32); - proto_tree_add_bytes_format(tree, hf_smb_mac_fndrinfo, tvb, - offset, 32, + proto_tree_add_bytes_format(tree, hf_smb_mac_fndrinfo, tvb, + offset, 32, tvb_get_ptr(tvb, offset,32), "Finder Info: %s", tvb_format_text(tvb, offset, 32)); COUNT_BYTES_TRANS_SUBR(32); /* Number Files */ CHECK_BYTE_COUNT_TRANS_SUBR(4); - proto_tree_add_item(tree, hf_smb_mac_root_file_count, tvb, + proto_tree_add_item(tree, hf_smb_mac_root_file_count, tvb, offset, 4, TRUE); COUNT_BYTES_TRANS_SUBR(4); /* Number of Root Directories */ @@ -12414,7 +12414,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Mac Support Flags */ CHECK_BYTE_COUNT_TRANS_SUBR(4); support = tvb_get_ntohl(tvb, offset); - item = proto_tree_add_text(tree, tvb, offset, 4, + item = proto_tree_add_text(tree, tvb, offset, 4, "Mac Support Flags: 0x%08x", support); ti = proto_item_add_subtree(item, ett_smb_mac_support_flags); proto_tree_add_boolean(ti, hf_smb_mac_sup_access_ctrl, @@ -12428,7 +12428,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, proto_tree_add_boolean(ti, hf_smb_mac_sup_streams, tvb, offset, 4, support); COUNT_BYTES_TRANS_SUBR(4); - break; + break; case 1006: /* QUERY_FS_QUOTA_INFO */ offset = dissect_nt_quota(tvb, tree, offset, bcp); break; @@ -12459,10 +12459,10 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, COUNT_BYTES_TRANS_SUBR(4); break; } - + return offset; } - + static int dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -12488,7 +12488,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, if (t2i != NULL && t2i->subcmd != -1) { item = proto_tree_add_text(parent_tree, tvb, offset, dc, "%s Data", - val_to_str(t2i->subcmd, trans2_cmd_vals, + val_to_str(t2i->subcmd, trans2_cmd_vals, "Unknown (0x%02x)")); tree = proto_item_add_subtree(item, ett_smb_transaction_data); } else { @@ -12655,7 +12655,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot if (t2i != NULL && t2i->subcmd != -1) { item = proto_tree_add_text(parent_tree, tvb, offset, pc, "%s Parameters", - val_to_str(t2i->subcmd, trans2_cmd_vals, + val_to_str(t2i->subcmd, trans2_cmd_vals, "Unknown (0x%02x)")); tree = proto_item_add_subtree(item, ett_smb_transaction_params); } else { @@ -12694,7 +12694,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot /* create time */ offset = dissect_smb_datetime(tvb, tree, offset, - hf_smb_create_time, + hf_smb_create_time, hf_smb_create_dos_date, hf_smb_create_dos_time, TRUE); /* data size */ @@ -12942,7 +12942,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(t2i->subcmd, - trans2_cmd_vals, + trans2_cmd_vals, "<unknown (0x%02x)>")); } } @@ -13031,26 +13031,26 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * save_fragmented = pinfo->fragmented; /* do we need reassembly? */ if( (td!=dc) || (tp!=pc) ){ - /* oh yeah, either data or parameter section needs + /* oh yeah, either data or parameter section needs reassembly */ pinfo->fragmented = TRUE; if(smb_trans_reassembly){ /* ...and we were told to do reassembly */ if(pc && (tvb_length_remaining(tvb, po)>=pc) ){ - r_fd = smb_trans_defragment(tree, pinfo, tvb, + r_fd = smb_trans_defragment(tree, pinfo, tvb, po, pc, pd, td+tp); - + } if((r_fd==NULL) && dc && (tvb_length_remaining(tvb, od)>=dc) ){ - r_fd = smb_trans_defragment(tree, pinfo, tvb, + r_fd = smb_trans_defragment(tree, pinfo, tvb, od, dc, dd+tp, td+tp); } } } /* if we got a reassembled fd structure from the reassembly routine we must - create pd_tvb from it + create pd_tvb from it */ if(r_fd){ pd_tvb = tvb_new_real_data(r_fd->data, r_fd->datalen, @@ -13071,7 +13071,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * } } else { /* It was not reassembled. Do as best as we can. - * in this case we always try to dissect the stuff if + * in this case we always try to dissect the stuff if * data and param displacement is 0. i.e. for the first * (and maybe only) packet. */ @@ -13163,7 +13163,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * switch(tri->subcmd){ case TRANSACTION_PIPE: - /* This function is safe to call for + /* This function is safe to call for s_tvb==sp_tvb==NULL, i.e. if we don't know them at this point. It's also safe to call if "p_tvb" @@ -13175,7 +13175,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * d_tvb, NULL, pinfo, top_tree); } break; - + case TRANSACTION_MAILSLOT: /* This one should be safe to call even if s_tvb and sp_tvb is NULL @@ -13240,7 +13240,7 @@ dissect_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off guint16 bc; WORD_COUNT; - + if (wc != 0) { proto_tree_add_text(tree, tvb, offset, wc*2, "Word parameters"); offset += wc*2; @@ -13543,7 +13543,7 @@ dissect_smb_command(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *s { int old_offset = offset; smb_info_t *si; - + si = pinfo->private_data; if(cmd!=0xff){ proto_item *cmd_item; @@ -13552,21 +13552,21 @@ dissect_smb_command(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *s if (check_col(pinfo->cinfo, COL_INFO)) { if(first_pdu){ - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", decode_smb_name(cmd), (si->request)? "Request" : "Response"); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_fstr(pinfo->cinfo, COL_INFO, "; %s", decode_smb_name(cmd)); } - + } cmd_item = proto_tree_add_text(smb_tree, tvb, offset, -1, "%s %s (0x%02x)", - decode_smb_name(cmd), + decode_smb_name(cmd), (si->request)?"Request":"Response", cmd); @@ -13583,7 +13583,7 @@ dissect_smb_command(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *s /* NOTE: this value_string array will also be used to access data directly by - * index instead of val_to_str() since + * index instead of val_to_str() since * 1, the array will always span every value from 0x00 to 0xff and * 2, smb_cmd_vals[i].strptr is much cheaper than val_to_str(i, smb_cmd_vals,) * This means that this value_string array MUST always @@ -13854,7 +13854,7 @@ static char *decode_smb_name(unsigned char cmd) { return(smb_cmd_vals[cmd].strptr); } - + /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -13960,7 +13960,7 @@ const value_string DOS_errors[] = { {SMBE_badenv, "Invalid environment"}, {SMBE_badaccess, "Invalid open mode"}, {SMBE_baddata, "Invalid data (only from ioctl call)"}, - {SMBE_res, "Reserved error code?"}, + {SMBE_res, "Reserved error code?"}, {SMBE_baddrive, "Invalid drive"}, {SMBE_remcd, "Attempt to delete current directory"}, {SMBE_diffdevice, "Rename/move across different filesystems"}, @@ -15143,7 +15143,7 @@ dissect_smb_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) } - + static const true_false_string tfs_smb_flags2_long_names_allowed = { "Long file names are allowed in the response", "Long file names are not allowed in the response" @@ -15254,7 +15254,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) || (tvb_get_guint8(tvb, 3) != 'B') ){ return FALSE; } - + if (check_col(pinfo->cinfo, COL_PROTOCOL)){ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB"); } @@ -15282,11 +15282,11 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) si.info_count = -1; if (parent_tree) { - item = proto_tree_add_item(parent_tree, proto_smb, tvb, offset, + item = proto_tree_add_item(parent_tree, proto_smb, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_smb); - hitem = proto_tree_add_text(tree, tvb, offset, 32, + hitem = proto_tree_add_text(tree, tvb, offset, 32, "SMB Header"); htree = proto_item_add_subtree(hitem, ett_smb_hdr); @@ -15295,13 +15295,13 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_tree_add_text(htree, tvb, offset, 4, "Server Component: SMB"); offset += 4; /* Skip the marker */ - /* find which conversation we are part of and get the tables for that + /* find which conversation we are part of and get the tables for that conversation*/ conversation = find_conversation(&pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if(!conversation){ /* OK this is a new conversation so lets create it */ - conversation = conversation_new(&pinfo->src, &pinfo->dst, + conversation = conversation_new(&pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } /* see if we already have the smb data for this conversation */ @@ -15310,15 +15310,15 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* No, not yet. create it and attach it to the conversation */ si.ct = g_mem_chunk_alloc(conv_tables_chunk); conv_tables = g_slist_prepend(conv_tables, si.ct); - si.ct->matched= g_hash_table_new(smb_saved_info_hash_matched, + si.ct->matched= g_hash_table_new(smb_saved_info_hash_matched, smb_saved_info_equal_matched); - si.ct->unmatched= g_hash_table_new(smb_saved_info_hash_unmatched, + si.ct->unmatched= g_hash_table_new(smb_saved_info_hash_unmatched, smb_saved_info_equal_unmatched); si.ct->dcerpc_fid_to_frame=g_hash_table_new( - smb_saved_info_hash_unmatched, + smb_saved_info_hash_unmatched, smb_saved_info_equal_unmatched); si.ct->tid_service=g_hash_table_new( - smb_saved_info_hash_unmatched, + smb_saved_info_hash_unmatched, smb_saved_info_equal_unmatched); conversation_add_proto_data(conversation, proto_smb, si.ct); } @@ -15329,7 +15329,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) && (si.pid==0) && (si.tid==0) ){ /* this is a broadcast SMB packet, there will not be a reply. - We dont need to do anything + We dont need to do anything */ si.unidir = TRUE; } else if( (si.cmd==SMB_COM_NT_CANCEL) /* NT Cancel */ @@ -15348,7 +15348,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) request/response matching to get messed up. The only thing we do in this case is trying to find which original - request we match with and insert an entry for this "special" + request we match with and insert an entry for this "special" request for later reference. We continue to reference the original requests smb_saved_info_t but we dont touch it or change anything in it. @@ -15357,7 +15357,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) si.unidir = TRUE; /*we dont expect an answer to this one*/ if(!pinfo->fd->flags.visited){ - /* try to find which original call we match and if we + /* try to find which original call we match and if we find it add us to the matched table. Dont touch anything else since we dont want this one to mess up the request/response matching. We still consider @@ -15397,13 +15397,13 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(sip && sip->frame_req){ switch(si.cmd){ case SMB_COM_NT_CANCEL: - proto_tree_add_uint(htree, hf_smb_cancel_to, + proto_tree_add_uint(htree, hf_smb_cancel_to, tvb, 0, 0, sip->frame_req); break; case SMB_COM_TRANSACTION_SECONDARY: case SMB_COM_TRANSACTION2_SECONDARY: case SMB_COM_NT_TRANSACT_SECONDARY: - proto_tree_add_uint(htree, hf_smb_continuation_to, + proto_tree_add_uint(htree, hf_smb_continuation_to, tvb, 0, 0, sip->frame_req); break; } @@ -15425,8 +15425,8 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) si.unidir = FALSE; if(!pinfo->fd->flags.visited){ - /* first see if we find an unmatched smb "equal" to - the current one + /* first see if we find an unmatched smb "equal" to + the current one */ sip=g_hash_table_lookup(si.ct->unmatched, (void *)pid_mid); if(sip!=NULL){ @@ -15444,15 +15444,15 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) else if(si.cmd==SMB_COM_NT_CANCEL){ cmd_match=TRUE; } - else if((si.cmd==SMB_COM_TRANSACTION_SECONDARY) + else if((si.cmd==SMB_COM_TRANSACTION_SECONDARY) && (sip->cmd==SMB_COM_TRANSACTION)){ cmd_match=TRUE; } - else if((si.cmd==SMB_COM_TRANSACTION2_SECONDARY) + else if((si.cmd==SMB_COM_TRANSACTION2_SECONDARY) && (sip->cmd==SMB_COM_TRANSACTION2)){ cmd_match=TRUE; } - else if((si.cmd==SMB_COM_NT_TRANSACT_SECONDARY) + else if((si.cmd==SMB_COM_NT_TRANSACT_SECONDARY) && (sip->cmd==SMB_COM_NT_TRANSACT)){ cmd_match=TRUE; } @@ -15463,7 +15463,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) This must mean that either we have a retransmission or that the response to the previous one was lost and the client has reused the MID for this conversation. In either case it's not much more - we can do than forget the old request and concentrate on the + we can do than forget the old request and concentrate on the present one instead. We also do this cleanup if we see that the cmd in the original @@ -15477,7 +15477,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } else { /* we have found a response to some request we have seen earlier. What we do now depends on whether this is the first response - to that request we see (id frame_res==0) or not. + to that request we see (id frame_res==0) or not. */ if(sip->frame_res==0){ /* ok it is the first response we have seen to this packet */ @@ -15488,7 +15488,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) g_hash_table_insert(si.ct->matched, new_key, sip); } else { /* we have already seen another response to this one, but - register it anyway so we see which request it matches + register it anyway so we see which request it matches */ new_key = g_mem_chunk_alloc(smb_saved_info_key_chunk); new_key->frame = pinfo->fd->num; @@ -15501,7 +15501,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) sip = g_mem_chunk_alloc(smb_saved_info_chunk); sip->frame_req = pinfo->fd->num; sip->frame_res = 0; - sip->req_time.secs=pinfo->fd->abs_secs; + sip->req_time.secs=pinfo->fd->abs_secs; sip->req_time.nsecs=pinfo->fd->abs_usecs*1000; sip->flags = 0; if(g_hash_table_lookup(si.ct->tid_service, (void *)si.tid) @@ -16277,15 +16277,15 @@ proto_register_smb(void) { "Root Directory Count", "smb.root.dir.count", FT_UINT32, BASE_DEC, NULL, 0, "Root Directory Count", HFILL}}, - { &hf_smb_mac_file_count, + { &hf_smb_mac_file_count, { "Root File Count", "smb.file.count", FT_UINT32, BASE_DEC, NULL, 0, "File Count", HFILL}}, - { &hf_smb_mac_dir_count, + { &hf_smb_mac_dir_count, { "Root Directory Count", "smb.dir.count", FT_UINT32, BASE_DEC, NULL, 0, "Directory Count", HFILL}}, - { &hf_smb_mac_support_flags, + { &hf_smb_mac_support_flags, { "Mac Support Flags", "smb.mac.support.flags", FT_UINT32, BASE_DEC, NULL, 0, "Mac Support Flags", HFILL}}, diff --git a/packet-smtp.c b/packet-smtp.c index 5a1da4476a..c52e112a4c 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.31 2002/08/02 23:36:02 jmayer Exp $ + * $Id: packet-smtp.c,v 1.32 2002/08/28 21:00:34 jmayer Exp $ * * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * @@ -65,7 +65,7 @@ static gboolean smtp_desegment = TRUE; * last part of a message */ -#define SMTP_PDU_CMD 0 +#define SMTP_PDU_CMD 0 #define SMTP_PDU_MESSAGE 1 #define SMTP_PDU_EOM 2 @@ -94,7 +94,7 @@ smtp_init_protocol(void) if (smtp_packet_infos) g_mem_chunk_destroy(smtp_packet_infos); - smtp_request_vals = g_mem_chunk_new("smtp_request_vals", + smtp_request_vals = g_mem_chunk_new("smtp_request_vals", sizeof(struct smtp_request_val), smtp_packet_init_count * sizeof(struct smtp_request_val), G_ALLOC_AND_FREE); smtp_packet_infos = g_mem_chunk_new("smtp_packet_infos", @@ -136,12 +136,12 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * We only need that for the client->server stream; responses * are easy to manage. * - * If we have per frame data, use that, else, we must be on the first + * If we have per frame data, use that, else, we must be on the first * pass, so we figure it out on the first pass. */ /* Find out what conversation this packet is part of ... but only - * if we have no information on this packet, so find the per-frame + * if we have no information on this packet, so find the per-frame * info first. */ @@ -204,7 +204,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - /* + /* * Check whether or not this packet is an end of message packet * We should look for CRLF.CRLF and they may be split. * We have to keep in mind that we may see what we want on @@ -215,7 +215,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * The order of these is important ... We want to avoid - * cases where there is a CRLF at the end of a packet and a + * cases where there is a CRLF at the end of a packet and a * .CRLF at the begining of the same packet. */ @@ -239,7 +239,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* - * OK, Check if we have seen a DATA request. We do it here for + * OK, Check if we have seen a DATA request. We do it here for * simplicity, but we have to be careful below. */ @@ -317,8 +317,8 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - /* - * From here, we simply add items to the tree and info to the info + /* + * From here, we simply add items to the tree and info to the info * fields ... */ @@ -329,7 +329,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * If it is a request, we have to look things up, otherwise, just - * display the right things + * display the right things */ if (request) { @@ -371,7 +371,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) smtp_tree = proto_item_add_subtree(ti, ett_smtp); if (request) { - /* + /* * Check out whether or not we can see a command in there ... * What we are looking for is not data_seen and the word DATA * and not eom_seen. @@ -516,7 +516,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - + } } } diff --git a/packet-sna.c b/packet-sna.c index 429eb99569..12487a1d79 100644 --- a/packet-sna.c +++ b/packet-sna.c @@ -2,22 +2,22 @@ * Routines for SNA * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-sna.c,v 1.41 2002/08/02 23:36:02 jmayer Exp $ + * $Id: packet-sna.c,v 1.42 2002/08/28 21:00:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -890,7 +890,7 @@ dissect_fidf(tvbuff_t *tvb, proto_tree *tree) proto_tree *bf_tree; proto_item *bf_item; guint8 th_0; - + const int bytes_in_header = 26; /* If we're not filling a proto_tree, return now */ diff --git a/packet-sna.h b/packet-sna.h index bb62aed9ea..2cce482518 100644 --- a/packet-sna.h +++ b/packet-sna.h @@ -1,18 +1,18 @@ /* packet-sna.h * Definitions for SNA dissection. * - * $Id: packet-sna.h,v 1.4 2000/08/11 13:34:00 deniel Exp $ + * $Id: packet-sna.h,v 1.5 2002/08/28 21:00:34 jmayer Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-snaeth.c b/packet-snaeth.c index e82e567c81..e18d228550 100644 --- a/packet-snaeth.c +++ b/packet-snaeth.c @@ -1,22 +1,22 @@ /* packet-snaeth.c * Routines for SNA-over-Ethernet (Ethernet type 80d5) * - * $Id: packet-snaeth.c,v 1.3 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-snaeth.c,v 1.4 2002/08/28 21:00:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-snego.c b/packet-snego.c index 6be8f4c4a3..bd11ff7fb2 100644 --- a/packet-snego.c +++ b/packet-snego.c @@ -3,22 +3,22 @@ * as described in rfc2478. * Copyright 2002, Tim Potter <tpot@samba.org> * - * $Id: packet-snego.c,v 1.1 2002/08/21 20:54:16 tpot Exp $ + * $Id: packet-snego.c,v 1.2 2002/08/28 21:00:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -65,20 +65,20 @@ proto_register_snego(void) { static hf_register_info hf[] = { { &hf_snego, - { "SNEGO", "Snego", FT_NONE, BASE_NONE, NULL, 0x0, + { "SNEGO", "Snego", FT_NONE, BASE_NONE, NULL, 0x0, "SNEGO", HFILL }}, }; - + static gint *ett[] = { &ett_snego, }; - + proto_snego = proto_register_protocol( "Snego", "Snego", "snego"); proto_register_field_array(proto_snego, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + register_dissector("snego", dissect_snego, proto_snego); } diff --git a/packet-snmp.c b/packet-snmp.c index 602646504d..36de33e0e4 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -8,14 +8,14 @@ * * See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u. * - * $Id: packet-snmp.c,v 1.95 2002/08/21 21:25:23 tpot Exp $ + * $Id: packet-snmp.c,v 1.96 2002/08/28 21:00:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Some stuff from: - * + * * GXSNMP -- An snmp mangament application * Copyright (C) 1998 Gregory McLean & Jochen Friedrich * Beholder RMON ethernet network monitor,Copyright (C) 1993 DNPAP group @@ -24,12 +24,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -921,7 +921,7 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, "Request Id: %#x", request_id); } offset += length; - + /* error status, or getbulk non-repeaters */ ret = asn1_uint32_decode (&asn1, &error_status, &length); if (ret != ASN1_ERR_NOERROR) { @@ -1028,7 +1028,7 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } g_free(agent_address); offset += length; - + /* generic trap type */ ret = asn1_uint32_decode (&asn1, &trap_type, &length); if (ret != ASN1_ERR_NOERROR) { @@ -1040,9 +1040,9 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_text(tree, tvb, offset, length, "Trap type: %s", val_to_str(trap_type, trap_types, "Unknown (%u)")); - } + } offset += length; - + /* specific trap type */ ret = asn1_uint32_decode (&asn1, &specific_type, &length); if (ret != ASN1_ERR_NOERROR) { @@ -1054,9 +1054,9 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_text(tree, tvb, offset, length, "Specific trap type: %u (%#x)", specific_type, specific_type); - } + } offset += length; - + /* timestamp */ start = asn1.offset; ret = asn1_header_decode (&asn1, &cls, &con, &tag, @@ -1083,7 +1083,7 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { proto_tree_add_text(tree, tvb, offset, length, "Timestamp: %u", timestamp); - } + } offset += length; break; } @@ -1132,7 +1132,7 @@ dissect_common_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } offset += sequence_length; variable_bindings_length -= sequence_length; - + /* Parse the variable's value */ ret = snmp_variable_decode(tree, variable_oid, variable_oid_length, &asn1, offset, &length); @@ -1365,10 +1365,10 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, switch (version) { case SNMP_VERSION_1: case SNMP_VERSION_2c: - ret = asn1_octet_string_decode (&asn1, &community, + ret = asn1_octet_string_decode (&asn1, &community, &community_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "community", ret); return; } @@ -1381,7 +1381,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += length; break; case SNMP_VERSION_2u: - ret = asn1_octet_string_decode (&asn1, &community, + ret = asn1_octet_string_decode (&asn1, &community, &community_length, &length); if (tree) { dissect_snmp2u_parameters(snmp_tree, tvb, offset, length, @@ -1408,7 +1408,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += length; ret = asn1_uint32_decode (&asn1, &msgid, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "message id", ret); return; } @@ -1419,7 +1419,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += length; ret = asn1_uint32_decode (&asn1, &msgmax, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "message max size", ret); return; } @@ -1428,10 +1428,10 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, length, "Message Max Size: %d", msgmax); } offset += length; - ret = asn1_octet_string_decode (&asn1, &msgflags, + ret = asn1_octet_string_decode (&asn1, &msgflags, &msgflags_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "message flags", ret); return; } @@ -1458,7 +1458,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += length; ret = asn1_uint32_decode (&asn1, &msgsec, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "message security model", ret); return; } @@ -1475,7 +1475,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, ret = asn1_header_decode (&asn1, &cls, &con, &tag, &def, &secparm_length); length = asn1.offset - start; - if (cls != ASN1_UNI && con != ASN1_PRI && + if (cls != ASN1_UNI && con != ASN1_PRI && tag != ASN1_OTS) { dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "Message Security Parameters", @@ -1489,7 +1489,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, secur_tree = proto_item_add_subtree(item, ett_secur); proto_tree_add_text(secur_tree, tvb, offset, - length, + length, "Message Security Parameters Length: %d", secparm_length); } @@ -1502,7 +1502,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, return; } offset += length; - ret = asn1_octet_string_decode (&asn1, &aengineid, + ret = asn1_octet_string_decode (&asn1, &aengineid, &aengineid_length, &length); if (ret != ASN1_ERR_NOERROR) { dissect_snmp_parse_error(tvb, offset, pinfo, @@ -1524,7 +1524,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (secur_tree) { proto_tree_add_text(secur_tree, tvb, - offset, length, "Engine Boots: %d", + offset, length, "Engine Boots: %d", engineboots); } offset += length; @@ -1536,11 +1536,11 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (secur_tree) { proto_tree_add_text(secur_tree, tvb, - offset, length, "Engine Time: %d", + offset, length, "Engine Time: %d", enginetime); } offset += length; - ret = asn1_octet_string_decode (&asn1, &username, + ret = asn1_octet_string_decode (&asn1, &username, &username_length, &length); if (ret != ASN1_ERR_NOERROR) { dissect_snmp_parse_error(tvb, offset, pinfo, @@ -1549,13 +1549,13 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (secur_tree) { proto_tree_add_text(secur_tree, tvb, offset, - length, "User Name: %.*s", + length, "User Name: %.*s", username_length, SAFE_STRING(username)); } g_free(username); offset += length; - ret = asn1_octet_string_decode (&asn1, &authpar, + ret = asn1_octet_string_decode (&asn1, &authpar, &authpar_length, &length); if (ret != ASN1_ERR_NOERROR) { dissect_snmp_parse_error(tvb, offset, pinfo, @@ -1569,7 +1569,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } g_free(authpar); offset += length; - ret = asn1_octet_string_decode (&asn1, &privpar, + ret = asn1_octet_string_decode (&asn1, &privpar, &privpar_length, &length); if (ret != ASN1_ERR_NOERROR) { dissect_snmp_parse_error(tvb, offset, pinfo, @@ -1585,7 +1585,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += length; break; default: - ret = asn1_octet_string_decode (&asn1, + ret = asn1_octet_string_decode (&asn1, &secparm, &secparm_length, &length); if (ret != ASN1_ERR_NOERROR) { dissect_snmp_parse_error(tvb, offset, pinfo, @@ -1626,10 +1626,10 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, return; } offset += length; - ret = asn1_octet_string_decode (&asn1, &cengineid, + ret = asn1_octet_string_decode (&asn1, &cengineid, &cengineid_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "context engine id", ret); return; } @@ -1640,10 +1640,10 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } g_free(cengineid); offset += length; - ret = asn1_octet_string_decode (&asn1, &cname, + ret = asn1_octet_string_decode (&asn1, &cname, &cname_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, snmp_tree, "context name", ret); return; } @@ -1774,10 +1774,10 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, g_free(regid); offset += length; - ret = asn1_octet_string_decode (&asn1, &application, + ret = asn1_octet_string_decode (&asn1, &application, &application_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, smux_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, smux_tree, "application", ret); return; } @@ -1789,10 +1789,10 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, g_free(application); offset += length; - ret = asn1_octet_string_decode (&asn1, &password, + ret = asn1_octet_string_decode (&asn1, &password, &password_length, &length); if (ret != ASN1_ERR_NOERROR) { - dissect_snmp_parse_error(tvb, offset, pinfo, smux_tree, + dissect_snmp_parse_error(tvb, offset, pinfo, smux_tree, "password", ret); return; } @@ -1825,7 +1825,7 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { proto_tree_add_text(smux_tree, tvb, offset, pdu_length, "Cause: %s", - val_to_str(cause, smux_close, + val_to_str(cause, smux_close, "Unknown cause %#x")); } offset += pdu_length; @@ -1877,8 +1877,8 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (tree) { proto_tree_add_text(smux_tree, tvb, offset, length, - "Operation: %s", - val_to_str(operation, smux_rreq, + "Operation: %s", + val_to_str(operation, smux_rreq, "Unknown operation %#x")); } offset += length; @@ -1904,7 +1904,7 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { proto_tree_add_text(smux_tree, tvb, offset, pdu_length, "%s", - val_to_str(priority, smux_prio, + val_to_str(priority, smux_prio, "Priority: %#x")); } offset += pdu_length; @@ -1930,7 +1930,7 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { proto_tree_add_text(smux_tree, tvb, offset, pdu_length, "%s", - val_to_str(commit, smux_sout, + val_to_str(commit, smux_sout, "Unknown SOUT Value: %#x")); } offset += pdu_length; @@ -1945,7 +1945,7 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, } static void -dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation_t *conversation; @@ -1981,7 +1981,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static void -dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_smux_pdu(tvb, 0, pinfo, tree, proto_smux, ett_smux); } diff --git a/packet-snmp.h b/packet-snmp.h index 0fb6e4265c..06c6b8689f 100644 --- a/packet-snmp.h +++ b/packet-snmp.h @@ -2,22 +2,22 @@ * Exported routines for SNMP (simple network management protocol) * D.Jorand (c) 1998 * - * $Id: packet-snmp.h,v 1.7 2002/03/11 01:42:58 guy Exp $ + * $Id: packet-snmp.h,v 1.8 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Didier Jorand - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-socks.c b/packet-socks.c index a623c06b1a..57adf87710 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,22 +2,22 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.42 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-socks.c,v 1.43 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -40,8 +40,8 @@ * Add GSS-API authentication per rfc-1961 * Add CHAP authentication * Decode FLAG bits per - * http://www.socks.nec.com/draft/draft-ietf-aft-socks-pro-v-04.txt - * In call_next_dissector, could load the destination address into the + * http://www.socks.nec.com/draft/draft-ietf-aft-socks-pro-v-04.txt + * In call_next_dissector, could load the destination address into the * pi structure before calling next dissector. * remove display_string or at least make it use protocol identifiers * socks_hash_entry_t needs to handle V5 address type and domain names @@ -87,7 +87,7 @@ /********** V5 Authentication methods *************/ -#define NO_AUTHENTICATION 0 +#define NO_AUTHENTICATION 0 #define GSS_API_AUTHENTICATION 1 #define USER_NAME_AUTHENTICATION 2 #define CHAP_AUTHENTICATION 3 @@ -127,7 +127,7 @@ enum SockState { V4NameWait, V5Command, V5Reply, - V5BindReply, + V5BindReply, UserNameAuth, GssApiAuth, AuthReply, @@ -144,7 +144,7 @@ typedef struct { guint32 port; guint32 udp_port; guint32 udp_remote_port; - + int connect_offset; row_pointer_type v4_name_row; row_pointer_type v4_user_name_row; @@ -155,7 +155,7 @@ typedef struct { row_pointer_type auth_method_row; row_pointer_type user_name_auth_row; guint32 start_done_row; - + guint32 dst_addr; /* this needs to handle IPv6 */ }socks_hash_entry_t; @@ -207,7 +207,7 @@ static char *reply_table_v5[] = { "Address type not supported", "Unknown" }; -#endif +#endif static const value_string reply_table_v5[] = { {0, "Succeeded"}, @@ -224,7 +224,7 @@ static const value_string reply_table_v5[] = { static const value_string cmd_strings[] = { {0, "Unknow"}, {1, "Connect"}, - {2, "Bind"}, + {2, "Bind"}, {3, "UdpAssociate"}, {0x80, "Ping"}, {0x81, "Traceroute"}, @@ -256,7 +256,7 @@ static int display_string(tvbuff_t *tvb, int offset, tvb_memcpy(tvb, (guint8 *)temp, offset+1, length); temp[ length ] = 0; - + ti = proto_tree_add_text(tree, tvb, offset, length + 1, "%s: %s" , label, temp); @@ -270,8 +270,8 @@ static int display_string(tvbuff_t *tvb, int offset, proto_tree_add_text( name_tree, tvb, offset, length, "String: %s", temp); return length + 1; -} - +} + static char *get_auth_method_name( guint Number){ @@ -313,7 +313,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { int a_type = tvb_get_guint8(tvb, offset); proto_tree_add_text( tree, tvb, offset, 1, - "Address Type: %d (%s)", a_type, + "Address Type: %d (%s)", a_type, address_type_table[ MIN( (guint) a_type, array_length( address_type_table)-1) ]); @@ -323,7 +323,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, FALSE); offset += 4; - } + } else if ( a_type == 3){ /* domain name address */ offset += display_string(tvb, offset, tree, @@ -339,30 +339,30 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { } -static int get_address_v5(tvbuff_t *tvb, int offset, +static int get_address_v5(tvbuff_t *tvb, int offset, socks_hash_entry_t *hash_info) { /* decode the v5 address and return offset of next byte */ /*XXX this needs to handle IPV6 and domain name addresses */ - + int a_type = tvb_get_guint8(tvb, offset++); if ( a_type == 1){ /* IPv4 address */ - + if ( hash_info) tvb_memcpy(tvb, (guint8 *)&hash_info->dst_addr, offset, 4); offset += 4; } - + else if ( a_type == 4) /* IPv6 address */ offset += 16; - + else if ( a_type == 3) /* domain name address */ offset += tvb_get_guint8(tvb, offset) + 1; return offset; -} +} /********************* V5 UDP Associate handlers ***********************/ @@ -380,7 +380,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation_t *conversation; proto_tree *socks_tree; proto_item *ti; - + conversation = find_conversation( &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -393,7 +393,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet"); - + if ( tree) { ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, offset, -1, "Socks" ); @@ -402,49 +402,49 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text( socks_tree, tvb, offset, 2, "Reserved"); offset += 2; - + proto_tree_add_text( socks_tree, tvb, offset, 1, "Fragment Number: %d", tvb_get_guint8(tvb, offset)); ++offset; - + offset = display_address( tvb, offset, socks_tree); hash_info->udp_remote_port = tvb_get_ntohs(tvb, offset); - + proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb, offset, 2, hash_info->udp_remote_port); - + offset += 2; } else { /* no tree, skip past the socks header */ offset += 3; offset = get_address_v5( tvb, offset, 0) + 2; - } + } /* set pi src/dst port and call the udp sub-dissector lookup */ - if ( pinfo->srcport == hash_info->port) + if ( pinfo->srcport == hash_info->port) ptr = &pinfo->destport; else ptr = &pinfo->srcport; *ptr = hash_info->udp_remote_port; - + decode_udp_ports( tvb, offset, pinfo, tree, pinfo->srcport, pinfo->destport); - + *ptr = hash_info->udp_port; } - -static void + +static void new_udp_conversation( socks_hash_entry_t *hash_info, packet_info *pinfo){ conversation_t *conversation = conversation_new( &pinfo->src, &pinfo->dst, PT_UDP, hash_info->udp_port, hash_info->port, 0); g_assert( conversation); - + conversation_add_proto_data(conversation, proto_socks, hash_info); conversation_set_dissector(conversation, socks_udp_handle); } @@ -477,7 +477,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, command = tvb_get_guint8(tvb, offset); proto_tree_add_text( tree, tvb, offset, 1, - "Command: %u (%s)", command, + "Command: %u (%s)", command, get_command_name( command)); ++offset; @@ -492,20 +492,20 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; -/*XXX check this, needs to do length checking */ +/*XXX check this, needs to do length checking */ /* Should perhaps do TCP reassembly as well */ if ( tvb_offset_exists(tvb, offset)) { /* display user name */ - proto_tree_add_string( tree, hf_user_name, tvb, offset, + proto_tree_add_string( tree, hf_user_name, tvb, offset, tvb_strsize(tvb, offset), tvb_get_ptr(tvb, offset, -1)); } } /*Display command response from server*/ - + else if ( compare_packet( hash_info->cmd_reply_row)){ - + proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, FALSE); ++offset; @@ -523,9 +523,9 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, FALSE); } - + else if ( compare_packet( hash_info->v4_user_name_row)){ - + /*XXX check this, needs to do length checking */ /* Should perhaps do TCP reassembly as well */ if ( tvb_offset_exists(tvb, offset)) { @@ -534,13 +534,13 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, "User Name: %s", tvb_get_ptr(tvb, offset, -1)); } } -} +} -static void +static void display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, socks_hash_entry_t *hash_info) { - + /* Display the protocol tree for the version. This routine uses the */ /* stored conversation information to decide what to do with the row. */ /* Per packet information would have been better to do this, but we */ @@ -566,7 +566,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, /* build auth tree */ ti = proto_tree_add_text( tree, tvb, offset, 1, "Client Authentication Methods"); - + AuthTree = proto_item_add_subtree(ti, ett_socks_auth); proto_tree_add_text( AuthTree, tvb, offset, 1, @@ -579,7 +579,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb_get_guint8( tvb, offset + i)); proto_tree_add_text( AuthTree, tvb, offset + i, 1, "Method[%d]: %u (%s)", i, - tvb_get_guint8( tvb, offset + i), AuthMethodStr); + tvb_get_guint8( tvb, offset + i), AuthMethodStr); } return; } /* Get accepted auth method */ @@ -603,10 +603,10 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, /* process password */ offset += display_string( tvb, offset, tree, "Password"); - } - /* command to the server */ + } + /* command to the server */ /* command response from server */ - else if ((compare_packet( hash_info->command_row)) || + else if ((compare_packet( hash_info->command_row)) || (compare_packet( hash_info->cmd_reply_row)) || (compare_packet( hash_info->bind_reply_row))){ @@ -615,7 +615,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, ++offset; command = tvb_get_guint8(tvb, offset); - + if (compare_packet( hash_info->command_row)) proto_tree_add_uint( tree, hf_socks_cmd, tvb, offset, 1, command); @@ -628,7 +628,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, ++offset; proto_tree_add_text( tree, tvb, offset, 1, - "Reserved: 0x%0x (should = 0x00)", tvb_get_guint8(tvb, offset)); + "Reserved: 0x%0x (should = 0x00)", tvb_get_guint8(tvb, offset)); ++offset; offset = display_address(tvb, offset, tree); @@ -643,11 +643,11 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, } - + /**************** Decoder State Machines ******************/ -static guint +static guint state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, int offset, packet_info *pinfo) { @@ -665,12 +665,12 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, hash_info->command = tvb_get_guint8(tvb, offset + 1); /* get remote port */ - if ( hash_info->command == CONNECT_COMMAND) + if ( hash_info->command == CONNECT_COMMAND) hash_info->port = tvb_get_ntohs(tvb, offset + 2); /* get remote address */ tvb_memcpy(tvb, (guint8 *)&hash_info->dst_addr, offset + 4, 4); - + /* save the packet pointer */ hash_info->connect_row = get_packet_ptr; @@ -678,7 +678,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, hash_info->connect_offset = offset + 8; offset += 8; - + if ( !tvb_offset_exists(tvb, offset)) { /* if no user name */ /* change state */ hash_info->state = V4UserNameWait; @@ -695,7 +695,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, */ hash_info->connect_offset += tvb_strsize(tvb, offset); } - + if ( !hash_info->dst_addr){ /* if no dest address */ /* if more data */ if ( tvb_offset_exists(tvb, hash_info->connect_offset)) { @@ -703,10 +703,10 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, hash_info->state = Connecting; } else - hash_info->state = V4NameWait; + hash_info->state = V4NameWait; } /* waiting for V4 user name */ - }else if ( hash_info->state == V4UserNameWait){ + }else if ( hash_info->state == V4UserNameWait){ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " Connect Request (User name)"); @@ -738,7 +738,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, -static void +static void state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, int offset, packet_info *pinfo) { @@ -756,7 +756,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request"); hash_info->state = Connecting; /* change state */ - hash_info->connect_row = get_packet_ptr; + hash_info->connect_row = get_packet_ptr; temp = tvb_get_guint8(tvb, offset + 1); /* skip past auth methods */ @@ -773,18 +773,18 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, if ( AuthMethod == NO_AUTHENTICATION) hash_info->state = V5Command; - + else if ( AuthMethod == USER_NAME_AUTHENTICATION) hash_info->state = UserNameAuth; - + else if ( AuthMethod == GSS_API_AUTHENTICATION) /*XXX should be this hash_info->state = GssApiAuth; */ - hash_info->state = Done; - + hash_info->state = Done; + else hash_info->state = Done; /*Auth failed or error*/ } - + else if ( hash_info->state == V5Command) { /* Handle V5 Command */ guint temp; @@ -804,7 +804,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, temp = tvb_get_guint8(tvb, offset); - if (( hash_info->command == CONNECT_COMMAND) || + if (( hash_info->command == CONNECT_COMMAND) || ( hash_info->command == UDP_ASSOCIATE_COMMAND)) /* get remote port */ hash_info->port = tvb_get_ntohs(tvb, offset); @@ -823,23 +823,23 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, (hash_info->command == PING_COMMAND) || (hash_info->command == TRACERT_COMMAND)) hash_info->state = Done; - + else if ( hash_info->command == BIND_COMMAND) hash_info->state = V5BindReply; - + else if ( hash_info->command == UDP_ASSOCIATE_COMMAND){ offset += 3; /* skip to address type */ offset = get_address_v5(tvb, offset, hash_info); /* save server udp port and create udp conversation */ hash_info->udp_port = tvb_get_ntohs(tvb, offset); - + if (!pinfo->fd->flags.visited) new_udp_conversation( hash_info, pinfo); /*XXX may need else statement to handle unknows and generate error message */ - - } + + } } else if ( hash_info->state == V5BindReply) { /* V5 Bind Second Reply */ @@ -868,7 +868,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, -static void +static void display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, socks_hash_entry_t *hash_info) { /* Display the ping/trace_route conversation */ @@ -882,7 +882,7 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr if ( pinfo->destport == TCP_PORT_SOCKS){ if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request"); - + if ( tree) proto_tree_add_text(tree, tvb, offset, 1, (hash_info->command == PING_COMMAND) ? @@ -901,9 +901,9 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr data = tvb_get_ptr(tvb, offset, -1); dataend = data + tvb_length_remaining(tvb, offset); - + while (data < dataend) { - + lineend = find_line_end(data, dataend, &eol); linelen = lineend - data; @@ -929,14 +929,14 @@ static void call_next_dissector(tvbuff_t *tvb, int offset, packet_info *pinfo, /* the payload, and restore the pinfo port after that is done. */ guint32 *ptr; - + if (( hash_info->command == PING_COMMAND) || ( hash_info->command == TRACERT_COMMAND)) - + display_ping_and_tracert(tvb, offset, pinfo, tree, hash_info); else { /* call the tcp port decoder to handle the payload */ - + /*XXX may want to load dest address here */ if ( pinfo->destport == TCP_PORT_SOCKS) @@ -948,7 +948,7 @@ static void call_next_dissector(tvbuff_t *tvb, int offset, packet_info *pinfo, decode_tcp_ports( tvb, offset, pinfo, tree, pinfo->srcport, pinfo->destport); *ptr = TCP_PORT_SOCKS; } -} +} @@ -960,7 +960,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; socks_hash_entry_t *hash_info; conversation_t *conversation; - + conversation = find_conversation( &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -996,16 +996,16 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (( hash_info->version == 4) || ( hash_info->version == 5)){ col_add_fstr(pinfo->cinfo, COL_INFO, "Version: %d", hash_info->version); - } + } else /* unknown version display error */ col_set_str(pinfo->cinfo, COL_INFO, "Unknown"); - + if ( hash_info->command == PING_COMMAND) col_append_str(pinfo->cinfo, COL_INFO, ", Ping Req"); if ( hash_info->command == TRACERT_COMMAND) col_append_str(pinfo->cinfo, COL_INFO, ", Traceroute Req"); - + /*XXX if ( hash_info->port != -1) */ if ( hash_info->port != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Remote Port: %d", @@ -1027,10 +1027,10 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hash_info->start_done_row = pinfo->fd->num; } } - + /* if proto tree, decode and display */ - if (tree) { + if (tree) { ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1, FALSE ); @@ -1039,7 +1039,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ( hash_info->version == 4) display_socks_v4(tvb, offset, pinfo, socks_tree, hash_info); - + else if ( hash_info->version == 5) display_socks_v5(tvb, offset, pinfo, socks_tree, hash_info); @@ -1055,7 +1055,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset, 0, hash_info->dst_addr); /* no fake address for ping & traceroute */ - + if (( hash_info->command != PING_COMMAND) && ( hash_info->command != TRACERT_COMMAND)){ proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb, @@ -1101,11 +1101,11 @@ proto_register_socks( void){ &ett_socks, &ett_socks_auth, &ett_socks_name - + }; static hf_register_info hf[] = { - + { &hf_socks_ver, { "Version", "socks.version", FT_UINT8, BASE_DEC, NULL, @@ -1158,10 +1158,10 @@ proto_register_socks( void){ proto_socks = proto_register_protocol ( - "Socks Protocol", "Socks", "socks"); + "Socks Protocol", "Socks", "socks"); proto_register_field_array(proto_socks, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + proto_register_subtree_array(ett, array_length(ett)); register_init_routine( &socks_reinit); /* register re-init routine */ @@ -1174,7 +1174,7 @@ proto_register_socks( void){ void proto_reg_handoff_socks(void) { - /* dissector install routine */ - + /* dissector install routine */ + dissector_add("tcp.port", TCP_PORT_SOCKS, socks_handle); } diff --git a/packet-spnego.c b/packet-spnego.c index f239fc687c..1aa05959eb 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -4,22 +4,22 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-spnego.c,v 1.6 2002/08/28 05:02:41 sharpe Exp $ + * $Id: packet-spnego.c,v 1.7 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -59,7 +59,7 @@ static int proto_spnego = -1; static int hf_spnego = -1; static int hf_spnego_negtokeninit = -1; -static int hf_spnego_negtokentarg = -1; +static int hf_spnego_negtokentarg = -1; static int hf_spnego_mechtype = -1; static gint ett_spnego = -1; @@ -91,7 +91,7 @@ dissect_parse_error(tvbuff_t *tvb, int offset, packet_info *pinfo, } } -static int +static int dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, ASN1_SCK *hnd) { @@ -107,7 +107,7 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, int length = tvb_length_remaining(tvb, offset); /* - * MechTypeList ::= SEQUENCE OF MechType + * MechTypeList ::= SEQUENCE OF MechType */ ret = asn1_header_decode(hnd, &cls, &con, &tag, &def, &len1); @@ -126,14 +126,14 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, goto done; } - item = proto_tree_add_item( tree, hf_spnego_mechtype, tvb, offset, + item = proto_tree_add_item( tree, hf_spnego_mechtype, tvb, offset, length, FALSE); subtree = proto_item_add_subtree(item, ett_spnego_mechtype); offset = hnd->offset; /* - * Now, the object IDs ... We should translate them: FIXME + * Now, the object IDs ... We should translate them: FIXME */ while (len1) { @@ -148,7 +148,7 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, oid_string = format_oid(oid, len); - proto_tree_add_text(subtree, tvb, offset, nbytes, "OID: %s", + proto_tree_add_text(subtree, tvb, offset, nbytes, "OID: %s", oid_string); offset += nbytes; @@ -162,7 +162,7 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } -static int +static int dissect_spnego_reqFlags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, ASN1_SCK *hnd) { @@ -171,7 +171,7 @@ dissect_spnego_reqFlags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } -static int +static int dissect_spnego_mechToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, ASN1_SCK *hnd) { @@ -180,7 +180,7 @@ dissect_spnego_mechToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } -static int +static int dissect_spnego_mechListMIC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, ASN1_SCK *hnd) { @@ -213,8 +213,8 @@ dissect_spnego_mechListMIC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* XXX: FIXME, we should dissect this as well */ - proto_tree_add_text(tree, tvb, offset + 4, len1 - 4, - "mechListMIC: %s\n", + proto_tree_add_text(tree, tvb, offset + 4, len1 - 4, + "mechListMIC: %s\n", tvb_format_text(tvb, offset + 4, len1 - 4)); /* Naughty ... but we have to adjust for what we never took */ @@ -229,7 +229,7 @@ dissect_spnego_mechListMIC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, ASN1_SCK *hnd) { proto_item *item; @@ -245,17 +245,17 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, int ret, offset = 0; int length = tvb_length_remaining(tvb, offset); - item = proto_tree_add_item( tree, hf_spnego_negtokeninit, tvb, offset, + item = proto_tree_add_item( tree, hf_spnego_negtokeninit, tvb, offset, length, FALSE); subtree = proto_item_add_subtree(item, ett_spnego_negtokeninit); /* * Here is what we need to get ... - * NegTokenInit ::= SEQUENCE { - * mechTypes [0] MechTypeList OPTIONAL, - * reqFlags [1] ContextFlags OPTIONAL, - * mechToken [2] OCTET STRING OPTIONAL, - * mechListMIC [3] OCTET STRING OPTIONAL } + * NegTokenInit ::= SEQUENCE { + * mechTypes [0] MechTypeList OPTIONAL, + * reqFlags [1] ContextFlags OPTIONAL, + * mechToken [2] OCTET STRING OPTIONAL, + * mechListMIC [3] OCTET STRING OPTIONAL } */ @@ -308,7 +308,7 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case SPNEGO_mechTypes: - offset = dissect_spnego_mechTypes(tvb, offset, pinfo, + offset = dissect_spnego_mechTypes(tvb, offset, pinfo, subtree, hnd); break; @@ -345,10 +345,10 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (((value = g_hash_table_lookup(gssapi_oids, oid_string)) == NULL) || !proto_is_protocol_enabled(value->proto)) { - No dissector for this oid + No dissector for this oid proto_tree_add_text( - subtree, tvb, offset, + subtree, tvb, offset, tvb_length_remaining(tvb, offset), "Token object"); goto done; @@ -371,10 +371,10 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, done: return offset; /* Not sure this is right */ -} +} static void -dissect_spnego_negTokenTarg(tvbuff_t *tvb, packet_info *pinfo _U_, +dissect_spnego_negTokenTarg(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { @@ -400,27 +400,27 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) subtree = proto_item_add_subtree(item, ett_spnego); /* - * The TVB contains a [0] header and a sequence that consists of an + * The TVB contains a [0] header and a sequence that consists of an * object ID and a blob containing the data ... * Actually, it contains, according to RFC2478: - * NegotiationToken ::= CHOICE { - * negTokenInit [0] NegTokenInit, - * negTokenTarg [1] NegTokenTarg } - * NegTokenInit ::= SEQUENCE { - * mechTypes [0] MechTypeList OPTIONAL, - * reqFlags [1] ContextFlags OPTIONAL, - * mechToken [2] OCTET STRING OPTIONAL, - * mechListMIC [3] OCTET STRING OPTIONAL } - * NegTokenTarg ::= SEQUENCE { - * negResult [0] ENUMERATED { - * accept_completed (0), - * accept_incomplete (1), - * reject (2) } OPTIONAL, - * supportedMech [1] MechType OPTIONAL, - * responseToken [2] OCTET STRING OPTIONAL, + * NegotiationToken ::= CHOICE { + * negTokenInit [0] NegTokenInit, + * negTokenTarg [1] NegTokenTarg } + * NegTokenInit ::= SEQUENCE { + * mechTypes [0] MechTypeList OPTIONAL, + * reqFlags [1] ContextFlags OPTIONAL, + * mechToken [2] OCTET STRING OPTIONAL, + * mechListMIC [3] OCTET STRING OPTIONAL } + * NegTokenTarg ::= SEQUENCE { + * negResult [0] ENUMERATED { + * accept_completed (0), + * accept_incomplete (1), + * reject (2) } OPTIONAL, + * supportedMech [1] MechType OPTIONAL, + * responseToken [2] OCTET STRING OPTIONAL, * mechListMIC [3] OCTET STRING OPTIONAL } - * - * Windows typically includes mechTypes and mechListMic ('NONE' + * + * Windows typically includes mechTypes and mechListMic ('NONE' * in the case of NTLMSSP only). * It seems to duplicate the responseToken into the mechListMic field * as well. Naughty, naughty. @@ -430,7 +430,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) asn1_open(&hnd, tvb, offset); /* - * Get the first header ... + * Get the first header ... */ ret = asn1_header_decode(&hnd, &cls, &con, &tag, &def, &len1); @@ -451,7 +451,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset = hnd.offset; - /* + /* * The Tag is one of negTokenInit or negTokenTarg */ @@ -459,7 +459,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) case SPNEGO_negTokenInit: - offset = dissect_spnego_negTokenInit(tvb, offset, pinfo, + offset = dissect_spnego_negTokenInit(tvb, offset, pinfo, subtree, &hnd); break; @@ -484,32 +484,32 @@ proto_register_spnego(void) { static hf_register_info hf[] = { { &hf_spnego, - { "SPNEGO", "spnego", FT_NONE, BASE_NONE, NULL, 0x0, + { "SPNEGO", "spnego", FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO", HFILL }}, - { &hf_spnego_negtokeninit, + { &hf_spnego_negtokeninit, { "negTokenInit", "spnego.negtokeninit", FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO negTokenInit", HFILL}}, { &hf_spnego_negtokentarg, { "negTokenTarg", "spnego.negtokentarg", FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO negTokenTarg", HFILL}}, { &hf_spnego_mechtype, - { "mechType", "spnego.negtokeninit.mechtype", FT_NONE, + { "mechType", "spnego.negtokeninit.mechtype", FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO negTokenInit mechTypes", HFILL}}, }; - + static gint *ett[] = { &ett_spnego, &ett_spnego_negtokeninit, &ett_spnego_negtokentarg, &ett_spnego_mechtype, }; - + proto_spnego = proto_register_protocol( "Spnego", "Spnego", "spnego"); proto_register_field_array(proto_spnego, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + register_dissector("spnego", dissect_spnego, proto_spnego); } diff --git a/packet-spray.c b/packet-spray.c index 12ec46208b..432237501a 100644 --- a/packet-spray.c +++ b/packet-spray.c @@ -1,7 +1,7 @@ /* packet-spray.c * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-spray.c,v 1.9 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-spray.c,v 1.10 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -48,7 +48,7 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_spray_counter, offset); lock_item = proto_tree_add_item(tree, hf_spray_clock, tvb, @@ -56,10 +56,10 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree lock_tree = proto_item_add_subtree(lock_item, ett_spray_clock); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_spray_sec, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_spray_usec, offset); return offset; @@ -68,7 +68,7 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_spray_sprayarr, offset); return offset; diff --git a/packet-spray.h b/packet-spray.h index 2cae17a7c6..5a7bfb1f93 100644 --- a/packet-spray.h +++ b/packet-spray.h @@ -1,22 +1,22 @@ /* packet-spray.h * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-spray.h,v 1.3 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-spray.h,v 1.4 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-srvloc.c b/packet-srvloc.c index 293d0bbe77..691e1c193e 100644 --- a/packet-srvloc.c +++ b/packet-srvloc.c @@ -3,10 +3,10 @@ * Copyright 1999, James Coe <jammer@cin.net> * * NOTE: This is Alpha software not all features have been verified yet. - * In particular I have not had an opportunity to see how it + * In particular I have not had an opportunity to see how it * responds to SRVLOC over TCP. * - * $Id: packet-srvloc.c,v 1.32 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-srvloc.c,v 1.33 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -18,12 +18,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -84,16 +84,16 @@ struct srvloc_hdr { /* List to resolve function numbers to names */ static const value_string srvloc_functions[] = { - { SRVREQ, "Service Request" }, - { SRVRPLY, "Service Reply" }, - { SRVREG, "Service Registration" }, - { SRVDEREG, "Service Deregister" }, - { SRVACK, "Service Acknowledge" }, - { ATTRRQST, "Attribute Request" }, - { ATTRRPLY, "Attribute Reply" }, - { DAADVERT, "DA Advertisement" }, - { SRVTYPERQST, "Service Type Request" }, - { SRVTYPERPLY, "Service Type Reply" }, + { SRVREQ, "Service Request" }, + { SRVRPLY, "Service Reply" }, + { SRVREG, "Service Registration" }, + { SRVDEREG, "Service Deregister" }, + { SRVACK, "Service Acknowledge" }, + { ATTRRQST, "Attribute Request" }, + { ATTRRPLY, "Attribute Reply" }, + { DAADVERT, "DA Advertisement" }, + { SRVTYPERQST, "Service Type Request" }, + { SRVTYPERPLY, "Service Type Reply" }, { 0, NULL } }; @@ -178,7 +178,7 @@ dissect_authblk(tvbuff_t *tvb, int offset, proto_tree *tree) time_t seconds; double floatsec; guint16 length; - + seconds = tvb_get_ntohl(tvb, offset) - 2208988800ul; stamp = gmtime(&seconds); if (stamp != NULL) { @@ -220,7 +220,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC"); - + if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -230,11 +230,11 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(function, srvloc_functions, "Unknown Function (%u)")); - + if (tree) { ti = proto_tree_add_item(tree, proto_srvloc, tvb, offset, -1, FALSE); srvloc_tree = proto_item_add_subtree(ti, ett_srvloc); - + proto_tree_add_uint(srvloc_tree, hf_srvloc_version, tvb, offset, 1, version); proto_tree_add_uint(srvloc_tree, hf_srvloc_function, tvb, offset + 1, 1, @@ -262,7 +262,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset + 10, 2, "Transaction ID: %u", tvb_get_ntohs(tvb, offset + 10)); offset += 12; - + switch (function) { case SRVREQ: proto_tree_add_text(srvloc_tree, tvb, offset, 0, "Service Request"); @@ -281,7 +281,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_text(tvb, offset, length)); offset += length; break; - + case SRVRPLY: proto_tree_add_text(srvloc_tree, tvb, offset, 0, "Service Reply"); proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); @@ -301,7 +301,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Service URL: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_U) == FLAG_U ) + if ( (flags & FLAG_U) == FLAG_U ) offset = dissect_authblk(tvb, offset, srvloc_tree); count--; }; @@ -319,7 +319,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Service URL: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_U) == FLAG_U ) + if ( (flags & FLAG_U) == FLAG_U ) offset = dissect_authblk(tvb, offset, srvloc_tree); length = tvb_get_ntohs(tvb, offset); proto_tree_add_text(srvloc_tree, tvb, offset, 2, "Attribute List length: %u", @@ -328,7 +328,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Attribute List: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_A) == FLAG_A ) + if ( (flags & FLAG_A) == FLAG_A ) offset = dissect_authblk(tvb, offset, srvloc_tree); break; @@ -341,7 +341,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Service URL: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_U) == FLAG_U ) + if ( (flags & FLAG_U) == FLAG_U ) offset = dissect_authblk(tvb, offset, srvloc_tree); length = tvb_get_ntohs(tvb, offset); proto_tree_add_text(srvloc_tree, tvb, offset, 2, "Attribute List length: %u", @@ -350,10 +350,10 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Attribute List: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_A) == FLAG_A ) + if ( (flags & FLAG_A) == FLAG_A ) offset = dissect_authblk(tvb, offset, srvloc_tree); break; - + case SRVACK: proto_tree_add_text(srvloc_tree, tvb, offset, 0, "Service Acknowledge"); proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); @@ -391,7 +391,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_text(tvb, offset, length)); offset += length; break; - + case ATTRRPLY: proto_tree_add_text(srvloc_tree, tvb, offset, 0, "Attribute Reply"); proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); @@ -403,10 +403,10 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(srvloc_tree, tvb, offset, length, "Attribute List: %s", tvb_format_text(tvb, offset, length)); offset += length; - if ( (flags & FLAG_A) == FLAG_A ) + if ( (flags & FLAG_A) == FLAG_A ) offset = dissect_authblk(tvb, offset, srvloc_tree); break; - + case DAADVERT: proto_tree_add_text(srvloc_tree, tvb, offset, 0, "DA Advertisement"); proto_tree_add_item(srvloc_tree, hf_srvloc_error, tvb, offset, 2, FALSE); @@ -489,26 +489,26 @@ proto_register_srvloc(void) FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, - + {&hf_srvloc_function, - {"Function", "srvloc.function", - FT_UINT8, BASE_DEC, VALS(srvloc_functions), 0x0, + {"Function", "srvloc.function", + FT_UINT8, BASE_DEC, VALS(srvloc_functions), 0x0, "", HFILL } }, {&hf_srvloc_flags, - {"Flags", "srvloc.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, + {"Flags", "srvloc.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, - + {&hf_srvloc_error, {"Error Code", "srvloc.err", FT_UINT16, BASE_DEC, VALS(srvloc_errs), 0x0, "", HFILL } }, }; - + static gint *ett[] = { &ett_srvloc, &ett_srvloc_flags, diff --git a/packet-sscop.c b/packet-sscop.c index e54a2251bd..8529fd2be2 100644 --- a/packet-sscop.c +++ b/packet-sscop.c @@ -2,23 +2,23 @@ * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-sscop.c,v 1.19 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-sscop.c,v 1.20 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ssl.c b/packet-ssl.c index 23a28ea653..8716a7e3d1 100644 --- a/packet-ssl.c +++ b/packet-ssl.c @@ -2,7 +2,7 @@ * Routines for ssl dissection * Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org> * - * $Id: packet-ssl.c,v 1.23 2002/07/17 00:42:42 guy Exp $ + * $Id: packet-ssl.c,v 1.24 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -828,9 +828,9 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, return offset; } } - + } else { - + /* if we don't have a valid content_type, there's no sense * continuing any further */ @@ -1714,7 +1714,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ssl_set_conv_version(pinfo, *conv_version); } } - + /* if we get here, but don't have a version set for the * conversation, then set a version for just this frame * (e.g., on a client hello) @@ -1839,7 +1839,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { - /* dissect the message */ + /* dissect the message */ switch (msg_type) { case PCT_MSG_CLIENT_HELLO: case PCT_MSG_SERVER_HELLO: @@ -2119,7 +2119,7 @@ dissect_ssl2_hnd_server_hello(tvbuff_t *tvb, if (cipher_spec_length > 0) { /* provide a collapsing node for the cipher specs */ - ti = proto_tree_add_none_format(tree, + ti = proto_tree_add_none_format(tree, hf_ssl_handshake_cipher_suites, tvb, offset, cipher_spec_length, "Cipher Specs (%u spec%s)", @@ -2803,7 +2803,7 @@ proto_register_ssl(void) "When enabled, SSL records that span multiple TCP segments are desegmented", &ssl_desegment); } - + register_dissector("ssl", dissect_ssl, proto_ssl); } diff --git a/packet-stat-notify.c b/packet-stat-notify.c index f8375409f2..ccdac82fce 100644 --- a/packet-stat-notify.c +++ b/packet-stat-notify.c @@ -2,7 +2,7 @@ * Routines for async NSM stat callback dissection * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-stat-notify.c,v 1.10 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-stat-notify.c,v 1.11 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -58,7 +58,7 @@ dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ static const vsff statnotify_proc[] = { { 0, "NULL", NULL, NULL }, - { STATNOTIFYPROC_MON, "MON-CALLBACK", + { STATNOTIFYPROC_MON, "MON-CALLBACK", dissect_statnotify_mon, NULL }, { 0, NULL, NULL, NULL } }; @@ -79,7 +79,7 @@ proto_register_statnotify(void) "Priv", "statnotify.priv", FT_BYTES, BASE_HEX, NULL, 0, "Client supplied opaque data", HFILL }}, }; - + static gint *ett[] = { &ett_statnotify, }; diff --git a/packet-stat-notify.h b/packet-stat-notify.h index b11178189f..ac71d7d720 100644 --- a/packet-stat-notify.h +++ b/packet-stat-notify.h @@ -2,22 +2,22 @@ * Async callback to notify NSM servers of changes in client status * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-stat-notify.h,v 1.3 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-stat-notify.h,v 1.4 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-stat.c b/packet-stat.c index ae6c6ce890..0cbc615634 100644 --- a/packet-stat.c +++ b/packet-stat.c @@ -1,7 +1,7 @@ /* packet-stat.c * Routines for stat dissection * - * $Id: packet-stat.c,v 1.16 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-stat.c,v 1.17 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -67,8 +67,8 @@ static const value_string stat_res[] = { 0, NULL } }; -/* Calculate length (including padding) of my_id structure. - * First read the length of the string and round it upwards to nearest +/* Calculate length (including padding) of my_id structure. + * First read the length of the string and round it upwards to nearest * multiple of 4, then add 16 (4*uint32) */ static int @@ -85,8 +85,8 @@ my_id_len(tvbuff_t *tvb, int offset) return len; } -/* Calculate length (including padding) of my_id structure. - * First read the length of the string and round it upwards to nearest +/* Calculate length (including padding) of my_id structure. + * First read the length of the string and round it upwards to nearest * multiple of 4, then add 4 (string len) and size of my_id struct. */ static int @@ -141,7 +141,7 @@ dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t } return offset; -} +} static int dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree) @@ -197,7 +197,7 @@ dissect_stat_priv(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_stat_mon(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - + offset = dissect_stat_mon_id(tvb,offset,pinfo,tree); offset = dissect_stat_priv(tvb,offset,tree); @@ -210,7 +210,7 @@ dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset); return offset; -} +} static int dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) @@ -227,7 +227,7 @@ dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } offset = dissect_rpc_string(tvb,sub_tree,hf_stat_mon_id_name,offset,NULL); - + offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset); if(sub_item) @@ -249,17 +249,17 @@ dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t static const vsff stat_proc[] = { { 0, "NULL", NULL, NULL }, - { STATPROC_STAT, "STAT", + { STATPROC_STAT, "STAT", dissect_stat_stat, dissect_stat_stat_res }, - { STATPROC_MON, "MON", + { STATPROC_MON, "MON", dissect_stat_mon, dissect_stat_stat_res }, - { STATPROC_UNMON, "UNMON", + { STATPROC_UNMON, "UNMON", dissect_stat_mon_id, dissect_stat_state }, - { STATPROC_UNMON_ALL, "UNMON_ALL", + { STATPROC_UNMON_ALL, "UNMON_ALL", dissect_stat_umon_all, dissect_stat_state }, - { STATPROC_SIMU_CRASH, "SIMU_CRASH", + { STATPROC_SIMU_CRASH, "SIMU_CRASH", NULL, NULL }, - { STATPROC_NOTIFY, "NOTIFY", + { STATPROC_NOTIFY, "NOTIFY", dissect_stat_notify, NULL }, { 0, NULL, NULL, NULL } }; @@ -275,7 +275,7 @@ proto_register_stat(void) NULL, 0, "Name", HFILL }}, { &hf_stat_stat_res, { "Status Result", "stat.stat_res", FT_NONE,0, - NULL, 0, "Status Result", HFILL }}, + NULL, 0, "Status Result", HFILL }}, { &hf_stat_stat_res_res, { "Result", "stat.stat_res.res", FT_UINT32, BASE_DEC, VALS(stat_res), 0, "Result", HFILL }}, @@ -290,7 +290,7 @@ proto_register_stat(void) NULL, 0, "Monitor ID Name", HFILL }}, { &hf_stat_my_id, { "My ID", "stat.my_id", FT_NONE,0, - NULL, 0, "My_ID structure", HFILL }}, + NULL, 0, "My_ID structure", HFILL }}, { &hf_stat_my_id_hostname, { "Hostname", "stat.my_id.hostname", FT_STRING, BASE_DEC, NULL, 0, "My_ID Host to callback", HFILL }}, @@ -313,7 +313,7 @@ proto_register_stat(void) "Status Change", "stat.stat_chge", FT_NONE, 0, NULL, 0, "Status Change structure", HFILL }}, }; - + static gint *ett[] = { &ett_stat, &ett_stat_stat_res, diff --git a/packet-stat.h b/packet-stat.h index 7e9953d44f..b3586dbc35 100644 --- a/packet-stat.h +++ b/packet-stat.h @@ -1,22 +1,22 @@ /* packet-stat.h * - * $Id: packet-stat.h,v 1.2 2000/08/11 13:33:59 deniel Exp $ + * $Id: packet-stat.h,v 1.3 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-sua.c b/packet-sua.c index 0d7c8c7361..561b81ac3c 100644 --- a/packet-sua.c +++ b/packet-sua.c @@ -6,24 +6,24 @@ * * Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-sua.c,v 1.9 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-sua.c,v 1.10 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -124,7 +124,7 @@ static const value_string sua_parameter_tag_values[] = { { DIAGNOSTIC_INFO_PARAMETER_TAG, "Diagnostic Info" }, { HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" }, { TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, - { ERROR_CODE_PARAMETER_TAG, "Error code" }, + { ERROR_CODE_PARAMETER_TAG, "Error code" }, { STATUS_PARAMETER_TAG, "Status" }, { CONGESTION_LEVEL_PARAMETER_TAG, "Congestion Level" }, { ASP_IDENTIFIER_PARAMETER_TAG, "ASP Identifier" }, @@ -442,7 +442,7 @@ static dissector_table_t sua_light_dissector_table; static void dissect_sua_tlv_list(tvbuff_t *tlv_tvb, proto_tree *sua_tree, gint initial_offset); -static guint +static guint nr_of_padding_bytes (guint length) { guint remainder; @@ -473,16 +473,16 @@ dissect_sua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto if (sua_tree) { /* add the components of the common header to the protocol tree */ - proto_tree_add_uint(sua_tree, hf_sua_version, + proto_tree_add_uint(sua_tree, hf_sua_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, version); proto_tree_add_bytes(sua_tree, hf_sua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, tvb_get_ptr(common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH)); - proto_tree_add_uint(sua_tree, hf_sua_message_class, + proto_tree_add_uint(sua_tree, hf_sua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class); - proto_tree_add_uint_format(sua_tree, hf_sua_message_type, + proto_tree_add_uint_format(sua_tree, hf_sua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, "Message Type: %s (%u)", val_to_str(message_class * 256 + message_type, sua_message_class_type_values, "reserved"), message_type); @@ -498,16 +498,16 @@ static void dissect_sua_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, data_length, padding_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); data_length = length - PARAMETER_HEADER_LENGTH; padding_length = nr_of_padding_bytes(length); - + proto_tree_add_text(parameter_tree, parameter_tvb, DATA_PARAMETER_DATA_OFFSET, data_length, "Data (%u byte%s)", data_length, plurality(data_length, "", "s")); if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_data_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_data_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + data_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + data_length, padding_length)); @@ -525,16 +525,16 @@ dissect_sua_info_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); - + info_string_length = length - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_PARAMETER_INFO_STRING_OFFSET, info_string_length, FALSE); if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_info_string_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_info_string_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + info_string_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + info_string_length, padding_length)); - + info_string = (char *)tvb_get_ptr(parameter_tvb, INFO_PARAMETER_INFO_STRING_OFFSET, info_string_length); proto_item_set_text(parameter_item, "Info String (%.*s)", (int) info_string_length, info_string); } @@ -557,7 +557,7 @@ dissect_sua_routing_context_parameter(tvbuff_t *parameter_tvb, proto_tree *param proto_tree_add_uint(parameter_tree, hf_sua_routing_context, parameter_tvb, context_offset, ROUTING_CONTEXT_LENGTH, context); context_offset += ROUTING_CONTEXT_LENGTH; }; - + proto_item_set_text(parameter_item, "Routing context (%u context%s)", number_of_contexts, plurality(number_of_contexts, "", "s")); } @@ -566,17 +566,17 @@ static void dissect_sua_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, info_length, padding_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); info_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_bytes(parameter_tree, hf_sua_diagnostic_information_info, + proto_tree_add_bytes(parameter_tree, hf_sua_diagnostic_information_info, parameter_tvb, PARAMETER_VALUE_OFFSET, info_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, info_length)); - + if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_diagnostic_information_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_diagnostic_information_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + info_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + info_length, padding_length)); @@ -587,17 +587,17 @@ static void dissect_sua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, data_length, padding_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); data_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_bytes(parameter_tree, hf_sua_heartbeat_data, + proto_tree_add_bytes(parameter_tree, hf_sua_heartbeat_data, parameter_tvb, PARAMETER_VALUE_OFFSET, data_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, data_length)); - + if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_heartbeat_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_heartbeat_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + data_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + data_length, padding_length)); @@ -606,7 +606,7 @@ dissect_sua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parame #define TRAFFIC_MODE_TYPE_OFFSET PARAMETER_VALUE_OFFSET #define TRAFFIC_MODE_TYPE_LENGTH 4 - + #define OVER_RIDE_TYPE 1 #define LOAD_SHARE_TYPE 2 #define BROADCAST_TYPE 3 @@ -624,10 +624,10 @@ dissect_sua_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *par traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_traffic_mode_type, + proto_tree_add_uint(parameter_tree, hf_sua_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, traffic_mode_type); - + proto_item_set_text(parameter_item, "Traffic mode type (%s)", val_to_str(traffic_mode_type, sua_traffic_mode_type_values, "unknown")); } @@ -684,7 +684,7 @@ dissect_sua_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ guint32 error_code; error_code = tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_error_code, + proto_tree_add_uint(parameter_tree, hf_sua_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, error_code); proto_item_set_text(parameter_item, "Error code (%s)", val_to_str(error_code, sua_error_code_values, "unknown")); @@ -730,10 +730,10 @@ dissect_sua_status_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter status_type = tvb_get_ntohs(parameter_tvb, STATUS_TYPE_OFFSET); status_info = tvb_get_ntohs(parameter_tvb, STATUS_INFO_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_status_type, + proto_tree_add_uint(parameter_tree, hf_sua_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, status_type); - proto_tree_add_uint_format(parameter_tree, hf_sua_status_info, + proto_tree_add_uint_format(parameter_tree, hf_sua_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, sua_status_type_info_values, "unknown"), status_info); @@ -752,10 +752,10 @@ dissect_sua_congestion_level_parameter(tvbuff_t *parameter_tvb, proto_tree *para congestion_level = tvb_get_ntohl(parameter_tvb, CONGESTION_LEVEL_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_congestion_level, + proto_tree_add_uint(parameter_tree, hf_sua_congestion_level, parameter_tvb, CONGESTION_LEVEL_OFFSET, CONGESTION_LEVEL_LENGTH, congestion_level); - + proto_item_set_text(parameter_item, "Congestion Level: %u", congestion_level); } @@ -770,10 +770,10 @@ dissect_sua_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parame asp_identifier = tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_asp_identifier, + proto_tree_add_uint(parameter_tree, hf_sua_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, asp_identifier); - + proto_item_set_text(parameter_item, "ASP Identifer: %u", asp_identifier); } @@ -804,10 +804,10 @@ dissect_sua_affected_destinations_parameter(tvbuff_t *parameter_tvb, proto_tree destination_item = proto_tree_add_text(parameter_tree, parameter_tvb, destination_offset, AFFECTED_DESTINATION_LENGTH, "Affected destination"); destination_tree = proto_item_add_subtree(destination_item, ett_sua_affected_destination); - proto_tree_add_uint(destination_tree, hf_sua_mask, + proto_tree_add_uint(destination_tree, hf_sua_mask, parameter_tvb, destination_offset + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, mask); - proto_tree_add_uint(destination_tree, hf_sua_dpc, + proto_tree_add_uint(destination_tree, hf_sua_dpc, parameter_tvb, destination_offset + AFFECTED_DPC_OFFSET, AFFECTED_DPC_LENGTH, dpc); destination_offset += AFFECTED_DESTINATION_LENGTH; @@ -824,17 +824,17 @@ static void dissect_sua_ss7_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 hop_counter; - + hop_counter = tvb_get_guint8(parameter_tvb, SS7_HOP_COUNTER_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_ss7_hop_counter_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_ss7_hop_counter_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); - - proto_tree_add_uint(parameter_tree, hf_sua_ss7_hop_counter_counter, + + proto_tree_add_uint(parameter_tree, hf_sua_ss7_hop_counter_counter, parameter_tvb, SS7_HOP_COUNTER_OFFSET, SS7_HOP_COUNTER_LENGTH, hop_counter); - + proto_item_set_text(parameter_item, "SS7 Hop Counter (%u)", hop_counter); } @@ -870,17 +870,17 @@ dissect_sua_source_address_parameter(tvbuff_t *parameter_tvb, proto_tree *parame guint16 routing_indicator, address_indicator; proto_item *address_indicator_item; proto_tree *address_indicator_tree; - + routing_indicator = tvb_get_ntohs(parameter_tvb, ROUTING_INDICATOR_OFFSET); address_indicator = tvb_get_ntohs(parameter_tvb, ADDRESS_INDICATOR_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_source_address_routing_indicator, + proto_tree_add_uint(parameter_tree, hf_sua_source_address_routing_indicator, parameter_tvb, ROUTING_INDICATOR_OFFSET, ROUTING_INDICATOR_LENGTH, routing_indicator); - + address_indicator_item = proto_tree_add_text(parameter_tree, parameter_tvb, ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, "Address Indicator"); address_indicator_tree = proto_item_add_subtree(address_indicator_item, ett_sua_source_address_indicator); - proto_tree_add_uint(address_indicator_tree, hf_sua_source_address_reserved_bits, + proto_tree_add_uint(address_indicator_tree, hf_sua_source_address_reserved_bits, parameter_tvb, ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, address_indicator); proto_tree_add_boolean(address_indicator_tree, hf_sua_source_address_gt_bit, parameter_tvb, @@ -891,7 +891,7 @@ dissect_sua_source_address_parameter(tvbuff_t *parameter_tvb, proto_tree *parame ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, address_indicator); proto_item_set_text(parameter_item, "Source Address"); - + /* dissect address parameters */ dissect_sua_tlv_list(parameter_tvb, parameter_tree, ADDRESS_PARAMETERS_OFFSET); } @@ -902,17 +902,17 @@ dissect_sua_destination_address_parameter(tvbuff_t *parameter_tvb, proto_tree *p guint16 routing_indicator, address_indicator; proto_item *address_indicator_item; proto_tree *address_indicator_tree; - + routing_indicator = tvb_get_ntohs(parameter_tvb, ROUTING_INDICATOR_OFFSET); address_indicator = tvb_get_ntohs(parameter_tvb, ADDRESS_INDICATOR_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_destination_address_routing_indicator, + proto_tree_add_uint(parameter_tree, hf_sua_destination_address_routing_indicator, parameter_tvb, ROUTING_INDICATOR_OFFSET, ROUTING_INDICATOR_LENGTH, routing_indicator); - + address_indicator_item = proto_tree_add_text(parameter_tree, parameter_tvb, ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, "Address Indicator"); address_indicator_tree = proto_item_add_subtree(address_indicator_item, ett_sua_destination_address_indicator); - proto_tree_add_uint(address_indicator_tree, hf_sua_destination_address_reserved_bits, + proto_tree_add_uint(address_indicator_tree, hf_sua_destination_address_reserved_bits, parameter_tvb, ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, address_indicator); proto_tree_add_boolean(address_indicator_tree, hf_sua_destination_address_gt_bit, parameter_tvb, @@ -923,7 +923,7 @@ dissect_sua_destination_address_parameter(tvbuff_t *parameter_tvb, proto_tree *p ADDRESS_INDICATOR_OFFSET, ADDRESS_INDICATOR_LENGTH, address_indicator); proto_item_set_text(parameter_item, "Destination Address"); - + /* dissect address parameters */ dissect_sua_tlv_list(parameter_tvb, parameter_tree, ADDRESS_PARAMETERS_OFFSET); } @@ -938,10 +938,10 @@ dissect_sua_source_reference_number_parameter(tvbuff_t *parameter_tvb, proto_tre reference = tvb_get_ntohl(parameter_tvb, SOURCE_REFERENCE_NUMBER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_source_reference_number, + proto_tree_add_uint(parameter_tree, hf_sua_source_reference_number, parameter_tvb, SOURCE_REFERENCE_NUMBER_OFFSET, SOURCE_REFERENCE_NUMBER_LENGTH, reference); - + proto_item_set_text(parameter_item, "Source Reference Number: %u", reference); } @@ -955,10 +955,10 @@ dissect_sua_destination_reference_number_parameter(tvbuff_t *parameter_tvb, prot reference = tvb_get_ntohl(parameter_tvb, DESTINATION_REFERENCE_NUMBER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_destination_reference_number, + proto_tree_add_uint(parameter_tree, hf_sua_destination_reference_number, parameter_tvb, DESTINATION_REFERENCE_NUMBER_OFFSET, DESTINATION_REFERENCE_NUMBER_LENGTH, reference); - + proto_item_set_text(parameter_item, "Destination Reference Number: %u", reference); } @@ -986,20 +986,20 @@ static void dissect_sua_sccp_cause_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 type, value; - + type = tvb_get_guint8(parameter_tvb, CAUSE_TYPE_OFFSET); value = tvb_get_guint8(parameter_tvb, CAUSE_VALUE_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_cause_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_cause_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_sua_cause_type, + proto_tree_add_uint(parameter_tree, hf_sua_cause_type, parameter_tvb, CAUSE_TYPE_OFFSET, CAUSE_TYPE_LENGTH, type); - proto_tree_add_uint(parameter_tree, hf_sua_cause_value, + proto_tree_add_uint(parameter_tree, hf_sua_cause_value, parameter_tvb, CAUSE_VALUE_OFFSET, CAUSE_VALUE_LENGTH, value); - + proto_item_set_text(parameter_item, "SCCP Cause (%s)", val_to_str(type, sua_cause_type_values, "unknown")); } @@ -1025,34 +1025,34 @@ dissect_sua_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *param proto_tree *sent_sequence_number_tree; proto_item *receive_sequence_number_item; proto_tree *receive_sequence_number_tree; - + receive_sequence_number = tvb_get_guint8(parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET); sent_sequence_number = tvb_get_guint8(parameter_tvb, SEQUENCE_NUMBER_SENT_SEQ_OFFSET); - proto_tree_add_bytes(parameter_tree, hf_sua_sequence_number_reserved, + proto_tree_add_bytes(parameter_tree, hf_sua_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH)); - + receive_sequence_number_item = proto_tree_add_text(parameter_tree, parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET, SEQUENCE_NUMBER_REC_SEQ_LENGTH, "Receive Sequence Number"); receive_sequence_number_tree = proto_item_add_subtree(receive_sequence_number_item, ett_sua_sequence_number_rec_number); - proto_tree_add_uint(receive_sequence_number_tree, hf_sua_sequence_number_rec_number, + proto_tree_add_uint(receive_sequence_number_tree, hf_sua_sequence_number_rec_number, parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET, SEQUENCE_NUMBER_REC_SEQ_LENGTH, receive_sequence_number); proto_tree_add_boolean(receive_sequence_number_tree, hf_sua_sequence_number_more_data_bit, - parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET, SEQUENCE_NUMBER_REC_SEQ_LENGTH, + parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET, SEQUENCE_NUMBER_REC_SEQ_LENGTH, receive_sequence_number); - + sent_sequence_number_item = proto_tree_add_text(parameter_tree, parameter_tvb, SEQUENCE_NUMBER_SENT_SEQ_OFFSET, SEQUENCE_NUMBER_SENT_SEQ_LENGTH, "Sent Sequence Number"); sent_sequence_number_tree = proto_item_add_subtree(sent_sequence_number_item, ett_sua_sequence_number_sent_number); - proto_tree_add_uint(sent_sequence_number_tree, hf_sua_sequence_number_sent_number, + proto_tree_add_uint(sent_sequence_number_tree, hf_sua_sequence_number_sent_number, parameter_tvb, SEQUENCE_NUMBER_SENT_SEQ_OFFSET, SEQUENCE_NUMBER_SENT_SEQ_LENGTH, sent_sequence_number); proto_tree_add_boolean(sent_sequence_number_tree, hf_sua_sequence_number_spare_bit, - parameter_tvb, SEQUENCE_NUMBER_SENT_SEQ_OFFSET, SEQUENCE_NUMBER_SENT_SEQ_LENGTH, + parameter_tvb, SEQUENCE_NUMBER_SENT_SEQ_OFFSET, SEQUENCE_NUMBER_SENT_SEQ_LENGTH, sent_sequence_number); proto_item_set_text(parameter_item, "Sequence Number"); @@ -1067,21 +1067,21 @@ dissect_sua_receive_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tre guint8 receive_sequence_number; proto_item *receive_sequence_number_item; proto_tree *receive_sequence_number_tree; - + receive_sequence_number = tvb_get_guint8(parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_receive_sequence_number_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_receive_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); receive_sequence_number_item = proto_tree_add_text(parameter_tree, parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, "Receive Sequence Number"); receive_sequence_number_tree = proto_item_add_subtree(receive_sequence_number_item, ett_sua_receive_sequence_number_number); - proto_tree_add_uint(receive_sequence_number_tree, hf_sua_receive_sequence_number_number, + proto_tree_add_uint(receive_sequence_number_tree, hf_sua_receive_sequence_number_number, parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, receive_sequence_number); proto_tree_add_boolean(receive_sequence_number_tree, hf_sua_receive_sequence_number_spare_bit, - parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, + parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, receive_sequence_number); proto_item_set_text(parameter_item, "Receive Sequence Number"); @@ -1121,16 +1121,16 @@ dissect_sua_asp_capabilities_parameter(tvbuff_t *parameter_tvb, proto_tree *para guint8 protocol_classes, interworking; proto_item *protocol_classes_item; proto_tree *protocol_classes_tree; - + protocol_classes = tvb_get_guint8(parameter_tvb, PROTOCOL_CLASSES_OFFSET); interworking = tvb_get_guint8(parameter_tvb, INTERWORKING_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_asp_capabilities_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_asp_capabilities_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH)); protocol_classes_item = proto_tree_add_text(parameter_tree, parameter_tvb, PROTOCOL_CLASSES_OFFSET, PROTOCOL_CLASSES_LENGTH, "Protocol classes"); protocol_classes_tree = proto_item_add_subtree(protocol_classes_item, ett_sua_protcol_classes); - proto_tree_add_uint(protocol_classes_tree, hf_sua_asp_capabilities_reserved_bits, + proto_tree_add_uint(protocol_classes_tree, hf_sua_asp_capabilities_reserved_bits, parameter_tvb, PROTOCOL_CLASSES_OFFSET, PROTOCOL_CLASSES_LENGTH, protocol_classes); proto_tree_add_boolean(protocol_classes_tree, hf_sua_asp_capabilities_a_bit, parameter_tvb, @@ -1142,10 +1142,10 @@ dissect_sua_asp_capabilities_parameter(tvbuff_t *parameter_tvb, proto_tree *para proto_tree_add_boolean(protocol_classes_tree, hf_sua_asp_capabilities_d_bit, parameter_tvb, PROTOCOL_CLASSES_OFFSET, PROTOCOL_CLASSES_LENGTH, protocol_classes); - proto_tree_add_uint(parameter_tree, hf_sua_asp_capabilities_interworking, + proto_tree_add_uint(parameter_tree, hf_sua_asp_capabilities_interworking, parameter_tvb, INTERWORKING_OFFSET, INTERWORKING_LENGTH, interworking); - + proto_item_set_text(parameter_item, "ASP Capabilities"); } @@ -1159,10 +1159,10 @@ dissect_sua_credit_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree credit = tvb_get_ntohl(parameter_tvb, CREDIT_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_credit, + proto_tree_add_uint(parameter_tree, hf_sua_credit, parameter_tvb, CREDIT_OFFSET, CREDIT_LENGTH, credit); - + proto_item_set_text(parameter_item, "Credit: %u", credit); } @@ -1189,13 +1189,13 @@ dissect_sua_user_cause_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ cause = tvb_get_ntohs(parameter_tvb, CAUSE_OFFSET); user = tvb_get_ntohs(parameter_tvb, USER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_cause, + proto_tree_add_uint(parameter_tree, hf_sua_cause, parameter_tvb, CAUSE_OFFSET, CAUSE_LENGTH, cause); - proto_tree_add_uint(parameter_tree, hf_sua_user, + proto_tree_add_uint(parameter_tree, hf_sua_user, parameter_tvb, USER_OFFSET, USER_LENGTH, user); - + proto_item_set_text(parameter_item, "User / Cause"); } @@ -1209,10 +1209,10 @@ dissect_sua_network_appearance_parameter(tvbuff_t *parameter_tvb, proto_tree *pa appearance = tvb_get_ntohl(parameter_tvb, NETWORK_APPEARANCE_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_network_appearance, + proto_tree_add_uint(parameter_tree, hf_sua_network_appearance, parameter_tvb, NETWORK_APPEARANCE_OFFSET, NETWORK_APPEARANCE_LENGTH, appearance); - + proto_item_set_text(parameter_item, "Network Appearance: %u", appearance); } @@ -1224,15 +1224,15 @@ static void dissect_sua_routing_key_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 identifier; - + identifier = tvb_get_ntohl(parameter_tvb, IDENTIFIER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_routing_key_identifier, + proto_tree_add_uint(parameter_tree, hf_sua_routing_key_identifier, parameter_tvb, IDENTIFIER_OFFSET, IDENTIFIER_LENGTH, identifier); - + proto_item_set_text(parameter_item, "Routing Key"); - + dissect_sua_tlv_list(parameter_tvb, parameter_tree, KEY_PARAMETERS_OFFSET); } @@ -1278,16 +1278,16 @@ dissect_sua_registration_result_parameter(tvbuff_t *parameter_tvb, proto_tree *p registration_status = tvb_get_ntohl(parameter_tvb, REGISTRATION_STATUS_OFFSET); routing_context = tvb_get_ntohl(parameter_tvb, REGISTRATION_ROUTING_CONTEXT_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_registration_result_routing_key_identifier, + proto_tree_add_uint(parameter_tree, hf_sua_registration_result_routing_key_identifier, parameter_tvb, LOCAL_ROUTING_KEY_OFFSET, LOCAL_ROUTING_KEY_ID_LENGTH, local_routing_key_identifier); - proto_tree_add_uint(parameter_tree, hf_sua_registration_result_status, + proto_tree_add_uint(parameter_tree, hf_sua_registration_result_status, parameter_tvb, REGISTRATION_STATUS_OFFSET, REGISTRATION_STATUS_LENGTH, registration_status); - proto_tree_add_uint(parameter_tree, hf_sua_registration_result_routing_context, + proto_tree_add_uint(parameter_tree, hf_sua_registration_result_routing_context, parameter_tvb, REGISTRATION_ROUTING_CONTEXT_OFFSET, REGISTRATION_ROUTING_CONTEXT_LENGTH, routing_context); - + proto_item_set_text(parameter_item, "Registration Result: %s", val_to_str(registration_status, sua_registration_status_values, "Unknown")); } @@ -1321,13 +1321,13 @@ dissect_sua_deregistration_result_parameter(tvbuff_t *parameter_tvb, proto_tree routing_context = tvb_get_ntohl(parameter_tvb, DEREGISTRATION_ROUTING_CONTEXT_OFFSET); deregistration_status = tvb_get_ntohl(parameter_tvb, DEREGISTRATION_STATUS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_deregistration_result_routing_context, + proto_tree_add_uint(parameter_tree, hf_sua_deregistration_result_routing_context, parameter_tvb, DEREGISTRATION_ROUTING_CONTEXT_OFFSET, DEREGISTRATION_ROUTING_CONTEXT_LENGTH, routing_context); - proto_tree_add_uint(parameter_tree, hf_sua_deregistration_result_status, + proto_tree_add_uint(parameter_tree, hf_sua_deregistration_result_status, parameter_tvb, REGISTRATION_STATUS_OFFSET, REGISTRATION_STATUS_LENGTH, deregistration_status); - + proto_item_set_text(parameter_item, "Deregistration Result: %s", val_to_str(deregistration_status, sua_deregistration_status_values, "Unknown")); } @@ -1337,7 +1337,7 @@ static void dissect_sua_address_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { proto_item_set_text(parameter_item, "Address Range"); - + dissect_sua_tlv_list(parameter_tvb, parameter_tree, ADDRESS_RANGE_ADDRESS_PARAMETERS_OFFSET); } @@ -1351,10 +1351,10 @@ dissect_sua_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parame correlation_id = tvb_get_ntohl(parameter_tvb, CORRELATION_ID_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_correlation_id, + proto_tree_add_uint(parameter_tree, hf_sua_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, correlation_id); - + proto_item_set_text(parameter_item, "Correlation ID: %u", correlation_id); } @@ -1365,16 +1365,16 @@ static void dissect_sua_importance_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 importance; - + importance = tvb_get_guint8(parameter_tvb, IMPORTANCE_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_importance_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_importance_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_sua_importance, + proto_tree_add_uint(parameter_tree, hf_sua_importance, parameter_tvb, IMPORTANCE_OFFSET, IMPORTANCE_LENGTH, importance); - + proto_item_set_text(parameter_item, "Importance (%u)", importance); } @@ -1385,16 +1385,16 @@ static void dissect_sua_message_priority_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 priority; - + priority = tvb_get_guint8(parameter_tvb, MESSAGE_PRIORITY_OFFSET); - proto_tree_add_bytes(parameter_tree, hf_sua_message_priority_reserved, + proto_tree_add_bytes(parameter_tree, hf_sua_message_priority_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); - - proto_tree_add_uint(parameter_tree, hf_sua_message_priority, + + proto_tree_add_uint(parameter_tree, hf_sua_message_priority, parameter_tvb, MESSAGE_PRIORITY_OFFSET, MESSAGE_PRIORITY_LENGTH, priority); - + proto_item_set_text(parameter_item, "Message Priority (%u)", priority); } @@ -1416,23 +1416,23 @@ dissect_sua_protocol_class_parameter(tvbuff_t *parameter_tvb, proto_tree *parame guint8 protocol_class; proto_item *protocol_class_item; proto_tree *protocol_class_tree; - + protocol_class = tvb_get_guint8(parameter_tvb, PROTOCOL_CLASS_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_protocol_class_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_protocol_class_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); protocol_class_item = proto_tree_add_text(parameter_tree, parameter_tvb, PROTOCOL_CLASS_OFFSET, PROTOCOL_CLASS_LENGTH, "Protocol Class"); protocol_class_tree = proto_item_add_subtree(protocol_class_item, ett_sua_return_on_error_bit_and_protocol_class); - + proto_tree_add_boolean(protocol_class_tree, hf_sua_return_on_error_bit, parameter_tvb, PROTOCOL_CLASS_OFFSET, PROTOCOL_CLASS_LENGTH, protocol_class); - proto_tree_add_uint(protocol_class_tree, hf_sua_protocol_class, + proto_tree_add_uint(protocol_class_tree, hf_sua_protocol_class, parameter_tvb, PROTOCOL_CLASS_OFFSET, PROTOCOL_CLASS_LENGTH, - protocol_class); - + protocol_class); + proto_item_set_text(parameter_item, "Protocol Class"); } @@ -1446,10 +1446,10 @@ dissect_sua_sequence_control_parameter(tvbuff_t *parameter_tvb, proto_tree *para sequence_control = tvb_get_ntohl(parameter_tvb, SEQUENCE_CONTROL_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_sequence_control, + proto_tree_add_uint(parameter_tree, hf_sua_sequence_control, parameter_tvb, SEQUENCE_CONTROL_OFFSET, SEQUENCE_CONTROL_LENGTH, sequence_control); - + proto_item_set_text(parameter_item, "Sequence Control: %u", sequence_control); } @@ -1473,23 +1473,23 @@ dissect_sua_segmentation_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete guint32 segmentation_reference; proto_item *first_remaining_item; proto_tree *first_remaining_tree; - + first_remaining = tvb_get_guint8(parameter_tvb, FIRST_REMAINING_OFFSET); segmentation_reference = tvb_get_ntoh24(parameter_tvb, SEGMENTATION_REFERENCE_OFFSET); - + first_remaining_item = proto_tree_add_text(parameter_tree, parameter_tvb, FIRST_REMAINING_OFFSET, FIRST_REMAINING_LENGTH, "First / Remaining"); first_remaining_tree = proto_item_add_subtree(first_remaining_item, ett_sua_first_remaining); proto_tree_add_boolean(first_remaining_tree, hf_sua_first_bit, parameter_tvb, FIRST_REMAINING_OFFSET, FIRST_REMAINING_LENGTH, first_remaining); - proto_tree_add_uint(first_remaining_tree, hf_sua_number_of_remaining_segments, + proto_tree_add_uint(first_remaining_tree, hf_sua_number_of_remaining_segments, parameter_tvb, FIRST_REMAINING_OFFSET, FIRST_REMAINING_LENGTH, first_remaining); - proto_tree_add_uint(parameter_tree, hf_sua_segmentation_reference, + proto_tree_add_uint(parameter_tree, hf_sua_segmentation_reference, parameter_tvb, SEGMENTATION_REFERENCE_OFFSET, SEGMENTATION_REFERENCE_LENGTH, segmentation_reference); - + proto_item_set_text(parameter_item, "Segmentation"); } @@ -1500,16 +1500,16 @@ static void dissect_sua_smi_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 smi; - + smi = tvb_get_guint8(parameter_tvb, SMI_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_smi_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_smi_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_sua_smi, + proto_tree_add_uint(parameter_tree, hf_sua_smi, parameter_tvb, SMI_OFFSET, SMI_LENGTH, smi); - + proto_item_set_text(parameter_item, "SMI (%u)", smi); } @@ -1526,21 +1526,21 @@ dissect_sua_tid_label_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t { guint8 start, end; guint16 value; - + start = tvb_get_guint8(parameter_tvb, TID_START_OFFSET); end = tvb_get_guint8(parameter_tvb, TID_END_OFFSET); value = tvb_get_ntohs(parameter_tvb, TID_VALUE_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_sua_tid_label_start, + + proto_tree_add_uint(parameter_tree, hf_sua_tid_label_start, parameter_tvb, TID_START_OFFSET, TID_START_LENGTH, start); - proto_tree_add_uint(parameter_tree, hf_sua_tid_label_end, + proto_tree_add_uint(parameter_tree, hf_sua_tid_label_end, parameter_tvb, TID_END_OFFSET, TID_END_LENGTH, end); - proto_tree_add_uint(parameter_tree, hf_sua_tid_label_value, + proto_tree_add_uint(parameter_tree, hf_sua_tid_label_value, parameter_tvb, TID_VALUE_OFFSET, TID_VALUE_LENGTH, value); - + proto_item_set_text(parameter_item, "TID Label"); } @@ -1557,21 +1557,21 @@ dissect_sua_drn_label_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t { guint8 start, end; guint16 value; - + start = tvb_get_guint8(parameter_tvb, DRN_START_OFFSET); end = tvb_get_guint8(parameter_tvb, DRN_END_OFFSET); value = tvb_get_ntohs(parameter_tvb, DRN_VALUE_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_sua_drn_label_start, + + proto_tree_add_uint(parameter_tree, hf_sua_drn_label_start, parameter_tvb, DRN_START_OFFSET, DRN_START_LENGTH, start); - proto_tree_add_uint(parameter_tree, hf_sua_drn_label_end, + proto_tree_add_uint(parameter_tree, hf_sua_drn_label_end, parameter_tvb, DRN_END_OFFSET, DRN_END_LENGTH, end); - proto_tree_add_uint(parameter_tree, hf_sua_drn_label_value, + proto_tree_add_uint(parameter_tree, hf_sua_drn_label_value, parameter_tvb, DRN_VALUE_OFFSET, DRN_VALUE_LENGTH, value); - + proto_item_set_text(parameter_item, "DRN Label"); } @@ -1625,7 +1625,7 @@ dissect_sua_global_title_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete { guint8 number_of_digits, translation_type, numbering_plan, nature_of_address; guint16 length, global_title_length, padding_length; - + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); global_title_length = length - (PARAMETER_HEADER_LENGTH + NO_OF_DIGITS_LENGTH + TRANSLATION_TYPE_LENGTH @@ -1638,27 +1638,27 @@ dissect_sua_global_title_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete numbering_plan = tvb_get_guint8(parameter_tvb, NUMBERING_PLAN_OFFSET); nature_of_address = tvb_get_guint8(parameter_tvb, NATURE_OF_ADDRESS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_number_of_digits, + proto_tree_add_uint(parameter_tree, hf_sua_number_of_digits, parameter_tvb, NO_OF_DIGITS_OFFSET, NO_OF_DIGITS_LENGTH, number_of_digits); - proto_tree_add_uint(parameter_tree, hf_sua_translation_type, + proto_tree_add_uint(parameter_tree, hf_sua_translation_type, parameter_tvb, TRANSLATION_TYPE_OFFSET, TRANSLATION_TYPE_LENGTH, translation_type); - proto_tree_add_uint(parameter_tree, hf_sua_numbering_plan, + proto_tree_add_uint(parameter_tree, hf_sua_numbering_plan, parameter_tvb, NUMBERING_PLAN_OFFSET, NUMBERING_PLAN_LENGTH, numbering_plan); - proto_tree_add_uint(parameter_tree, hf_sua_nature_of_address, + proto_tree_add_uint(parameter_tree, hf_sua_nature_of_address, parameter_tvb, NATURE_OF_ADDRESS_OFFSET, NATURE_OF_ADDRESS_LENGTH, nature_of_address); - proto_tree_add_bytes(parameter_tree, hf_sua_global_title, + proto_tree_add_bytes(parameter_tree, hf_sua_global_title, parameter_tvb, GLOBAL_TITLE_OFFSET, global_title_length, tvb_get_ptr(parameter_tvb, GLOBAL_TITLE_OFFSET, global_title_length)); if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_global_title_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_global_title_padding, parameter_tvb, GLOBAL_TITLE_OFFSET + global_title_length, padding_length, tvb_get_ptr(parameter_tvb, GLOBAL_TITLE_OFFSET + global_title_length, padding_length)); - + proto_item_set_text(parameter_item, "Global Title"); } @@ -1672,10 +1672,10 @@ dissect_sua_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ mask = tvb_get_guint8(parameter_tvb, AFFECTED_MASK_OFFSET); dpc = tvb_get_ntoh24(parameter_tvb, AFFECTED_DPC_OFFSET); - proto_tree_add_uint(parameter_tree, hf_sua_point_code_mask, + proto_tree_add_uint(parameter_tree, hf_sua_point_code_mask, parameter_tvb, PARAMETER_VALUE_OFFSET + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, mask); - proto_tree_add_uint(parameter_tree, hf_sua_point_code_dpc, + proto_tree_add_uint(parameter_tree, hf_sua_point_code_dpc, parameter_tvb, PARAMETER_VALUE_OFFSET + AFFECTED_DPC_OFFSET, AFFECTED_DPC_LENGTH, dpc); proto_item_set_text(parameter_item, "Point Code"); @@ -1689,16 +1689,16 @@ static void dissect_sua_ssn_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 ssn; - + ssn = tvb_get_guint8(parameter_tvb, SSN_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_sua_ssn_reserved, + + proto_tree_add_bytes(parameter_tree, hf_sua_ssn_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_sua_ssn_number, + proto_tree_add_uint(parameter_tree, hf_sua_ssn_number, parameter_tvb, SSN_OFFSET, SSN_LENGTH, ssn); - + proto_item_set_text(parameter_item, "Subsystem number (%u)", ssn); } @@ -1710,10 +1710,10 @@ dissect_sua_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, { guint32 ipv4_address; - tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH); + tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH); proto_tree_add_ipv4(parameter_tree, hf_sua_ipv4, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, - ipv4_address); + ipv4_address); proto_item_set_text(parameter_item, "IPV4 Address"); } @@ -1727,12 +1727,12 @@ dissect_sua_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr padding_length = nr_of_padding_bytes(length); hostname_length = length - PARAMETER_HEADER_LENGTH; hostname = (char *)tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, hostname_length); - + proto_tree_add_string(parameter_tree, hf_sua_hostname, parameter_tvb, PARAMETER_VALUE_OFFSET, hostname_length, hostname); if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_hostname_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_hostname_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + hostname_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + hostname_length, padding_length)); @@ -1748,7 +1748,7 @@ dissect_sua_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_tree_add_ipv6(parameter_tree, hf_sua_ipv6, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH)); - + proto_item_set_text(parameter_item, "IPV6 Address"); } @@ -1756,19 +1756,19 @@ static void dissect_sua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 tag, length, parameter_value_length, padding_length; - + tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); parameter_value_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_bytes(parameter_tree, hf_sua_parameter_value, + proto_tree_add_bytes(parameter_tree, hf_sua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); - + if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_sua_parameter_padding, + proto_tree_add_bytes(parameter_tree, hf_sua_parameter_padding, parameter_tvb, PARAMETER_VALUE_OFFSET + parameter_value_length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET + parameter_value_length, padding_length)); @@ -1796,11 +1796,11 @@ dissect_sua_parameter(tvbuff_t *parameter_tvb, proto_tree *sua_tree) parameter_tree = proto_item_add_subtree(parameter_item, ett_sua_parameter); /* add tag and length to the sua tree */ - proto_tree_add_uint(parameter_tree, hf_sua_parameter_tag, + proto_tree_add_uint(parameter_tree, hf_sua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag); - - proto_tree_add_uint(parameter_tree, hf_sua_parameter_length, + + proto_tree_add_uint(parameter_tree, hf_sua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); @@ -1942,16 +1942,16 @@ dissect_sua_tlv_list(tvbuff_t *tlv_tvb, proto_tree *sua_tree, gint initial_offse { gint offset, length, padding_length, total_length; tvbuff_t *parameter_tvb; - + offset = initial_offset; - + while(tvb_reported_length_remaining(tlv_tvb, offset)) { length = tvb_get_ntohs(tlv_tvb, offset + PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(tlv_tvb, offset, total_length, total_length); - dissect_sua_parameter(parameter_tvb, sua_tree); + dissect_sua_parameter(parameter_tvb, sua_tree); /* get rid of the handled parameter */ offset += total_length; } @@ -1964,7 +1964,7 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t common_header_tvb = tvb_new_subset(message_tvb, COMMON_HEADER_OFFSET, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); dissect_sua_common_header(common_header_tvb, pinfo, sua_tree); - + if (sua_tree) dissect_sua_tlv_list(message_tvb, sua_tree, COMMON_HEADER_LENGTH); } @@ -2025,17 +2025,17 @@ static const value_string sua_light_message_type_acro_values[] = { #define SUAL_ERR_INVMSGTYP 0x0006 static const value_string sua_light_error_code_values[] = { - { SUAL_ERR_INVVERS, "Invalid Protocol Version"}, - { SUAL_ERR_INVSTRID, "Invalid Stream Identifier"}, + { SUAL_ERR_INVVERS, "Invalid Protocol Version"}, + { SUAL_ERR_INVSTRID, "Invalid Stream Identifier"}, { SUAL_ERR_INVMSGTYP, "Invalid Message Type"}, { 0, NULL}}; static void -dissect_sua_light_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, +dissect_sua_light_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *sual_tree, guint16 *subsystem_number) { guint8 version, spare_1; - guint16 message_type, spare_2; + guint16 message_type, spare_2; guint32 message_length; /* Extract the common header */ @@ -2067,7 +2067,7 @@ dissect_sua_light_payload(tvbuff_t *payload_tvb, packet_info *pinfo, guint16 subsystem_number, proto_tree *sual_tree, proto_tree *tree) { guint payload_length = tvb_reported_length(payload_tvb); - + /* do lookup with the subdissector table */ if ( ! dissector_try_port (sua_light_dissector_table, subsystem_number, payload_tvb, pinfo, tree)) { @@ -2079,8 +2079,8 @@ dissect_sua_light_payload(tvbuff_t *payload_tvb, packet_info *pinfo, static void dissect_sua_light_error_payload(tvbuff_t *payload_tvb, proto_tree *sual_tree) { - if (sual_tree) - proto_tree_add_item(sual_tree, hf_sua_light_error_code, payload_tvb, 0, 2, FALSE); + if (sual_tree) + proto_tree_add_item(sual_tree, hf_sua_light_error_code, payload_tvb, 0, 2, FALSE); } static void @@ -2105,7 +2105,7 @@ dissect_sua_light_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree if (message_type != SUAL_MSG_ERR) dissect_sua_light_payload(payload_tvb, pinfo, subsystem_number, sual_tree, tree); else - dissect_sua_light_error_payload(payload_tvb, sual_tree); + dissect_sua_light_error_payload(payload_tvb, sual_tree); } } @@ -2118,15 +2118,15 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ switch(sua_version) { case IETF_VERSION08: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA"); break; - case SIEMENS_VERSION: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + case SIEMENS_VERSION: + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SUA-Light"); break; } - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -2136,7 +2136,7 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) } else { sua_tree = NULL; }; - + /* dissect the message */ switch(sua_version) { case IETF_VERSION08: @@ -2151,500 +2151,500 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_sua(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_sua_version, { "Version", "sua.version", - FT_UINT8, BASE_DEC, VALS(sua_protocol_version_values), 0x0, + FT_UINT8, BASE_DEC, VALS(sua_protocol_version_values), 0x0, "", HFILL } }, { &hf_sua_reserved, { "Reserved", "sua.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_message_class, { "Message Class", "sua.message_class", - FT_UINT8, BASE_DEC, VALS(sua_message_class_values), 0x0, + FT_UINT8, BASE_DEC, VALS(sua_message_class_values), 0x0, "", HFILL } }, { &hf_sua_message_type, { "Message Type", "sua.message_type", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_message_length, { "Message Length", "sua.message_length", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_parameter_tag, { "Parameter Tag", "sua.parameter_tag", - FT_UINT16, BASE_HEX, VALS(sua_parameter_tag_values), 0x0, + FT_UINT16, BASE_HEX, VALS(sua_parameter_tag_values), 0x0, "", HFILL } }, { &hf_sua_parameter_length, { "Parameter Length", "sua.parameter_length", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_parameter_value, { "Parameter Value", "sua.parameter_value", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_parameter_padding, { "Padding", "sua.parameter_padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_data_padding, { "Padding", "sua.data.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_info_string, { "Info string", "sua.info_string.string", - FT_STRING, BASE_NONE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_info_string_padding, { "Padding", "sua.info_string.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_routing_context, { "Routing context", "sua.routing_context.context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_diagnostic_information_info, { "Diagnostic Information", "sua.diagnostic_information.info", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_diagnostic_information_padding, { "Padding", "sua.diagnostic_information.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_heartbeat_data, { "Heratbeat Data", "sua.heartbeat.data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_heartbeat_padding, { "Padding", "sua.heartbeat.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_traffic_mode_type, { "Traffic mode Type", "sua.traffic_mode_type.type", - FT_UINT32, BASE_DEC, VALS(sua_traffic_mode_type_values), 0x0, + FT_UINT32, BASE_DEC, VALS(sua_traffic_mode_type_values), 0x0, "", HFILL } }, { &hf_sua_error_code, { "Error code", "sua.error_code.code", - FT_UINT32, BASE_DEC, VALS(sua_error_code_values), 0x0, + FT_UINT32, BASE_DEC, VALS(sua_error_code_values), 0x0, "", HFILL } }, { &hf_sua_status_type, { "Status type", "sua.status.type", - FT_UINT16, BASE_DEC, VALS(sua_status_type_values), 0x0, + FT_UINT16, BASE_DEC, VALS(sua_status_type_values), 0x0, "", HFILL } - }, + }, { &hf_sua_status_info, { "Status info", "sua.status.info", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_congestion_level, { "Congestion Level", "sua.congestion_level.level", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_asp_identifier, { "ASP Identifier", "sua.asp_identifier.id", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_mask, { "Mask", "sua.affected_point_code.mask", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_dpc, { "Affected DPC", "sua.affected_pointcode.dpc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_ss7_hop_counter_counter, { "SS7 Hop Counter", "sua.ss7_hop_counter.counter", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_ss7_hop_counter_reserved, { "Reserved", "sua.ss7_hop_counter.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_source_address_routing_indicator, { "Routing Indicator", "sua.source_address.routing_indicator", - FT_UINT16, BASE_DEC, VALS(sua_routing_indicator_values), 0x0, + FT_UINT16, BASE_DEC, VALS(sua_routing_indicator_values), 0x0, "", HFILL } }, { &hf_sua_source_address_reserved_bits, { "Reserved Bits", "sua.source_address.reserved_bits", - FT_UINT16, BASE_DEC, NULL, ADDRESS_RESERVED_BITMASK, + FT_UINT16, BASE_DEC, NULL, ADDRESS_RESERVED_BITMASK, "", HFILL } }, { &hf_sua_source_address_gt_bit, { "Include GT", "sua.source_address.gt_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_GT_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_GT_BITMASK, "", HFILL } }, { &hf_sua_source_address_pc_bit, { "Include PC", "sua.source_address.pc_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_PC_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_PC_BITMASK, "", HFILL } }, { &hf_sua_source_address_ssn_bit, { "Include SSN", "sua.source_address.ssn_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_SSN_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_SSN_BITMASK, "", HFILL } }, { &hf_sua_destination_address_routing_indicator, { "Routing Indicator", "sua.destination_address.routing_indicator", - FT_UINT16, BASE_DEC, VALS(sua_routing_indicator_values), 0x0, + FT_UINT16, BASE_DEC, VALS(sua_routing_indicator_values), 0x0, "", HFILL } }, { &hf_sua_destination_address_reserved_bits, { "Reserved Bits", "sua.destination_address.reserved_bits", - FT_UINT16, BASE_DEC, NULL, ADDRESS_RESERVED_BITMASK, + FT_UINT16, BASE_DEC, NULL, ADDRESS_RESERVED_BITMASK, "", HFILL } }, { &hf_sua_destination_address_gt_bit, { "Include GT", "sua.destination_address.gt_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_GT_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_GT_BITMASK, "", HFILL } }, { &hf_sua_destination_address_pc_bit, { "Include PC", "sua.destination_address.pc_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_PC_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_PC_BITMASK, "", HFILL } }, { &hf_sua_destination_address_ssn_bit, { "Include SSN", "sua.destination_address.ssn_bit", - FT_BOOLEAN, 16, NULL, ADDRESS_SSN_BITMASK, + FT_BOOLEAN, 16, NULL, ADDRESS_SSN_BITMASK, "", HFILL } }, { &hf_sua_source_reference_number, { "Source Reference Number", "sua.source_reference_number.number", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_destination_reference_number, { "Destination Reference Number", "sua.destination_reference_number", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_cause_reserved, { "Reserved", "sua.sccp_cause.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_cause_type, { "Cause Type", "sua.sccp_cause.type", - FT_UINT8, BASE_HEX, VALS(sua_cause_type_values), 0x0, + FT_UINT8, BASE_HEX, VALS(sua_cause_type_values), 0x0, "", HFILL } - }, + }, { &hf_sua_cause_value, { "Cause Value", "sua.sccp_cause.value", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_sequence_number_reserved, { "Reserved", "sua.sequence_number.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_sequence_number_rec_number, { "Receive Sequence Number P(R)", "sua.sequence_number.receive_sequence_number", - FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, + FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, "", HFILL } }, { &hf_sua_sequence_number_more_data_bit, { "More Data Bit", "sua.sequence_number.more_data_bit", - FT_BOOLEAN, 8, TFS(&sua_more_data_bit_value), MORE_DATA_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_more_data_bit_value), MORE_DATA_BIT_MASK, "", HFILL } }, { &hf_sua_sequence_number_sent_number, { "Sent Sequence Number P(S)", "sua.sequence_number.sent_sequence_number", - FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, + FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, "", HFILL } }, { &hf_sua_sequence_number_spare_bit, { "Spare Bit", "sua.sequence_number.spare_bit", - FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, + FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, "", HFILL } }, { &hf_sua_receive_sequence_number_reserved, { "Reserved", "sua.receive_sequence_number.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_receive_sequence_number_number, { "Receive Sequence Number P(R)", "sua.receive_sequence_number.number", - FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, + FT_UINT8, BASE_DEC, NULL, SEQ_NUM_MASK, "", HFILL } }, { &hf_sua_receive_sequence_number_spare_bit, { "Spare Bit", "sua.receive_sequence_number.spare_bit", - FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, + FT_BOOLEAN, 8, NULL, SPARE_BIT_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_reserved, { "Reserved", "sua.asp_capabilities.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_asp_capabilities_reserved_bits, { "Reserved Bits", "sua.asp_capabilities.reserved_bits", - FT_UINT8, BASE_HEX, NULL, RESERVED_BITS_MASK, + FT_UINT8, BASE_HEX, NULL, RESERVED_BITS_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_a_bit, { "Protocol Class 3", "sua.asp_capabilities.a_bit", - FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), A_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), A_BIT_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_b_bit, { "Protocol Class 2", "sua.asp_capabilities.b_bit", - FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), B_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), B_BIT_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_c_bit, { "Protocol Class 1", "sua.asp_capabilities.c_bit", - FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), C_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), C_BIT_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_d_bit, { "Protocol Class 0", "sua.asp_capabilities.d_bit", - FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), D_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_supported_bit_value), D_BIT_MASK, "", HFILL } }, { &hf_sua_asp_capabilities_interworking, { "Interworking", "sua.asp_capabilities.interworking", - FT_UINT8, BASE_HEX, VALS(sua_interworking_values), 0x0, + FT_UINT8, BASE_HEX, VALS(sua_interworking_values), 0x0, "", HFILL } }, { &hf_sua_credit, { "Credit", "sua.credit.credit", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_cause, { "Cause", "sua.cause_user.cause", - FT_UINT16, BASE_DEC, VALS(sua_cause_values), 0x0, + FT_UINT16, BASE_DEC, VALS(sua_cause_values), 0x0, "", HFILL } }, { &hf_sua_user, { "User", "sua.cause_user.user", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_network_appearance, { "Network Appearance", "sua.network_appearance.appearance", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_routing_key_identifier, { "Local Routing Key Identifier", "sua.routing_key.identifier", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_sua_registration_result_routing_key_identifier, { "Local Routing Key Identifier", "sua.registration_result.local_routing_key_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_registration_result_status, { "Registration Status", "sua.registration_result.registration_status", - FT_UINT32, BASE_DEC, VALS(sua_registration_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(sua_registration_status_values), 0x0, "", HFILL } - }, + }, { &hf_sua_registration_result_routing_context, { "Routing Context", "sua.registration_result.routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_deregistration_result_status, { "Deregistration Status", "sua.deregistration_result.deregistration_status", - FT_UINT32, BASE_DEC, VALS(sua_deregistration_status_values), 0x0, + FT_UINT32, BASE_DEC, VALS(sua_deregistration_status_values), 0x0, "", HFILL } - }, + }, { &hf_sua_deregistration_result_routing_context, { "Routing Context", "sua.deregistration_result.routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_correlation_id, { "Correlation ID", "sua.correlation_id.identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_importance_reserved, { "Reserved", "sua.importance.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_importance, { "Importance", "sua.importance.inportance", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_message_priority_reserved, { "Reserved", "sua.message_priority.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_message_priority, { "Message Priority", "sua.message_priority.priority", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_protocol_class_reserved, { "Reserved", "sua.protcol_class.reserved", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL } }, {&hf_sua_return_on_error_bit, { "Return On Error Bit", "sua.protocol_class.return_on_error_bit", - FT_BOOLEAN, 8, TFS(&sua_return_on_error_bit_value), RETURN_ON_ERROR_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_return_on_error_bit_value), RETURN_ON_ERROR_BIT_MASK, "", HFILL } }, {&hf_sua_protocol_class, { "Protocol Class", "sua.protocol_class.class", - FT_UINT8, BASE_DEC, NULL, PROTOCOL_CLASS_MASK, + FT_UINT8, BASE_DEC, NULL, PROTOCOL_CLASS_MASK, "", HFILL } }, { &hf_sua_sequence_control, { "Sequence Control", "sua.sequence_control.sequence_control", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, {&hf_sua_first_bit, { "First Segment Bit", "sua.segmentation.first_bit", - FT_BOOLEAN, 8, TFS(&sua_first_bit_value), FIRST_BIT_MASK, + FT_BOOLEAN, 8, TFS(&sua_first_bit_value), FIRST_BIT_MASK, "", HFILL } }, {&hf_sua_number_of_remaining_segments, { "Number of Remaining Segments", "sua.segmentation.number_of_remaining_segments", - FT_UINT8, BASE_DEC, NULL, NUMBER_OF_SEGMENTS_MASK, + FT_UINT8, BASE_DEC, NULL, NUMBER_OF_SEGMENTS_MASK, "", HFILL } }, { &hf_sua_segmentation_reference, { "Segmentation Reference", "sua.segmentation.reference", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_smi_reserved, { "Reserved", "sua.smi.reserved", - FT_BYTES, BASE_DEC, NULL, 0x0, + FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_smi, { "SMI", "sua.smi.smi", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_tid_label_start, { "Start", "sua.tid_label.start", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_tid_label_end, { "End", "sua.tid_label.end", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_tid_label_value, { "Label Value", "sua.tid_label.value", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_drn_label_start, { "Start", "sua.drn_label.start", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_drn_label_end, { "End", "sua.drn_label.end", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_drn_label_value, { "Label Value", "sua.drn_label.value", - FT_UINT16, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_number_of_digits, { "Number of Digits", "sua.global_title.number_of_digits", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_translation_type, { "Translation Type", "sua.global_title.translation_type", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_numbering_plan, { "Numbering Plan", "sua.global_title.numbering_plan", - FT_UINT8, BASE_HEX, VALS(sua_numbering_plan_values), 0x0, + FT_UINT8, BASE_HEX, VALS(sua_numbering_plan_values), 0x0, "", HFILL } - }, + }, { &hf_sua_nature_of_address, { "Nature of Address", "sua.global_title.nature_of_address", - FT_UINT8, BASE_HEX, VALS(sua_nature_of_address_values), 0x0, + FT_UINT8, BASE_HEX, VALS(sua_nature_of_address_values), 0x0, "", HFILL } - }, + }, { &hf_sua_nature_of_address, { "Nature Of Address", "sua.global_title.nature_of_address", - FT_UINT8, BASE_HEX, VALS(sua_nature_of_address_values), 0x0, + FT_UINT8, BASE_HEX, VALS(sua_nature_of_address_values), 0x0, "", HFILL } - }, + }, { &hf_sua_global_title, { "Global Title", "sua.global_title.signals", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_global_title_padding, { "Padding", "sua.global_title.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_point_code_mask, { "Mask", "sua.point_code.mask", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_point_code_dpc, { "Point Code", "sua.point_code.pc", - FT_UINT24, BASE_DEC, NULL, 0x0, + FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_ssn_reserved, { "Reserved", "sua.ssn.reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_ssn_number, { "Subsystem Number", "sua.ssn.number", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } - }, + }, {&hf_sua_ipv4, { "IP Version 4 address", "sua.ipv4.address", FT_IPv4, BASE_NONE, NULL, 0x0, @@ -2652,14 +2652,14 @@ proto_register_sua(void) }, {&hf_sua_hostname, { "Hostname", "sua.hostname.name", - FT_STRING, BASE_NONE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, {&hf_sua_hostname_padding, { "Padding", "sua.hostname.padding", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } - }, + }, {&hf_sua_ipv6, { "IP Version 6 address", "sua.ipv6.address", FT_IPv6, BASE_NONE, NULL, 0x0, @@ -2667,32 +2667,32 @@ proto_register_sua(void) }, { &hf_sua_light_version, { "Version", "sua.light.version", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_light_spare_1, { "Spare", "sua.light.spare_1", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } - }, + }, { &hf_sua_light_message_type, { "Message Type", "sua.light.message_type", - FT_UINT16, BASE_DEC, VALS(sua_light_message_type_values), 0x0, + FT_UINT16, BASE_DEC, VALS(sua_light_message_type_values), 0x0, "", HFILL } }, { &hf_sua_light_subsystem_number, { "Subsystem number", "sua.light.subsystem_number", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_light_spare_2, { "Spare", "sua.light.spare_2", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_light_message_length, { "Message length", "sua.light.message_length", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sua_light_error_code, @@ -2701,7 +2701,7 @@ proto_register_sua(void) "", HFILL } } }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_sua, @@ -2716,21 +2716,21 @@ proto_register_sua(void) &ett_sua_first_remaining, &ett_sua_return_on_error_bit_and_protocol_class }; - + static enum_val_t sua_options[] = { { "Internet draft 8 version", IETF_VERSION08 }, { "SUA light (Siemens proprietary)", SIEMENS_VERSION }, { NULL, 0 } }; - + /* Register the protocol name and description */ proto_sua = proto_register_protocol("SS7 SCCP-User Adaptation Layer", "SUA", "sua"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_sua, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + sua_module = prefs_register_protocol(proto_sua, NULL); sua_light_dissector_table = register_dissector_table("sual.subsystem_number", "SUA Light subsystem number", FT_UINT16, diff --git a/packet-syslog.c b/packet-syslog.c index eeb6c3197d..45d66e9c98 100644 --- a/packet-syslog.c +++ b/packet-syslog.c @@ -3,22 +3,22 @@ * * Copyright 2000, Gerald Combs <gerald@ethereal.com> * - * $Id: packet-syslog.c,v 1.18 2002/05/30 08:34:19 guy Exp $ + * $Id: packet-syslog.c,v 1.19 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -128,7 +128,7 @@ static gint hf_syslog_msg = -1; static gint ett_syslog = -1; -/* I couldn't find any documentation for the syslog message format. +/* I couldn't find any documentation for the syslog message format. According to the BSD sources, the message format is '<', P, '>', and T. P is a decimal value, which should be treated as an 8 bit unsigned integer. The lower three bits comprise the level, and the @@ -148,7 +148,7 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Syslog"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + if (tvb_get_guint8(tvb, msg_off) == '<') { /* A facility and level follow. */ msg_off++; @@ -173,17 +173,17 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, msg_str, msg_off, msg_len); msg_str[msg_len] = '\0'; } - + if (check_col(pinfo->cinfo, COL_INFO)) { if (pri >= 0) { - col_add_fstr(pinfo->cinfo, COL_INFO, "%s.%s: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s.%s: %s", val_to_str(fac, short_fac, "UNKNOWN"), val_to_str(lev, short_lev, "UNKNOWN"), msg_str); } else { col_add_fstr(pinfo->cinfo, COL_INFO, "%s", msg_str); } } - + if (tree) { if (pri >= 0) { ti = proto_tree_add_protocol_format(tree, proto_syslog, tvb, 0, -1, @@ -206,10 +206,10 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } return; } - + /* Register the protocol with Ethereal */ void proto_register_syslog(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { diff --git a/packet-tacacs.c b/packet-tacacs.c index 4f399ac682..64c3ff2292 100644 --- a/packet-tacacs.c +++ b/packet-tacacs.c @@ -2,31 +2,31 @@ * Routines for cisco tacacs/xtacacs/tacacs+ packet dissection * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-tacacs.c,v 1.22 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tacacs.c,v 1.23 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from old packet-tacacs.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* rfc-1492 for tacacs and xtacacs +/* rfc-1492 for tacacs and xtacacs * draft-grant-tacacs-00.txt for tacacs+ (tacplus) */ @@ -89,7 +89,7 @@ static const value_string tacacs_type_vals[] = { { TACACS_SLIP_ON, "SLIP on" }, { TACACS_SLIP_OFF, "SLIP off" }, { TACACS_SLIP_ADDR, "SLIP Addr" }, - { 0, NULL }}; + { 0, NULL }}; static const value_string tacacs_reason_vals[] = { { 0 , "none" }, @@ -140,7 +140,7 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, tacacs_type_vals, "Unknown (0x%02x)")); - if (tree) + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_tacacs, tvb, 0, -1, version==0?"TACACS":"XTACACS"); @@ -339,10 +339,10 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, - request ? "Request" : "Response"); + request ? "Request" : "Response"); } - if (tree) + if (tree) { ti = proto_tree_add_protocol_format(tree, proto_tacplus, tvb, 0, -1, "TACACS+"); diff --git a/packet-tcp.c b/packet-tcp.c index f9a7532790..310f356008 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,22 +1,22 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.156 2002/08/22 19:47:15 guy Exp $ + * $Id: packet-tcp.c,v 1.157 2002/08/28 21:00:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -116,7 +116,7 @@ static dissector_handle_t data_handle; -/* ************************************************************************** +/* ************************************************************************** * stuff to analyze TCP sequencenumbers for retransmissions, missing segments, * RTT and reltive sequence numbers. * **************************************************************************/ @@ -277,7 +277,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 } /* handle the sequence numbers */ - /* if this was a SYN packet, then remove existing list and + /* if this was a SYN packet, then remove existing list and * put SEQ+1 first the list */ if(flags&TH_SYN){ for(ual=ual1;ual1;ual1=ual){ @@ -311,7 +311,7 @@ tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint3 /* if we get past here we know that ual1 points to a segment */ - /* To handle FIN, just pretend they have a length of 1. + /* To handle FIN, just pretend they have a length of 1. else the ACK following the FIN-ACK will look like it was outside the window. */ if( (!seglen) && (flags&TH_FIN) ){ @@ -399,7 +399,7 @@ seq_finished: goto ack_finished; } - /* if we dont have any real segments in the other direction not + /* if we dont have any real segments in the other direction not * acked yet (as we see from the magic frame==0 entry) * then there is no point in continuing */ @@ -484,7 +484,7 @@ seq_finished: ack_finished: - /* we might have deleted the entire ual2 list, if this is an ACK, + /* we might have deleted the entire ual2 list, if this is an ACK, make sure ual2 at least has a dummy entry for the current ACK */ if( (!ual2) && (flags&TH_ACK) ){ ual2=g_mem_chunk_alloc(tcp_unacked_chunk); @@ -542,14 +542,14 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree item=proto_tree_add_text(parent_tree, tvb, 0, 0, "SEQ/ACK analysis"); tree=proto_item_add_subtree(item, ett_tcp_analysis); - /* encapsulate all proto_tree_add_xxx in ifs so we only print what + /* encapsulate all proto_tree_add_xxx in ifs so we only print what data we actually have */ if(ta->frame_acked){ - proto_tree_add_uint(tree, hf_tcp_analysis_acks_frame, + proto_tree_add_uint(tree, hf_tcp_analysis_acks_frame, tvb, 0, 0, ta->frame_acked); } if( ta->ts.secs || ta->ts.nsecs ){ - proto_tree_add_time(tree, hf_tcp_analysis_ack_rtt, + proto_tree_add_time(tree, hf_tcp_analysis_ack_rtt, tvb, 0, 0, &ta->ts); } @@ -630,7 +630,7 @@ tcp_analyze_seq_init(void) g_hash_table_destroy(tcp_rel_seq_table); tcp_rel_seq_table = NULL; } - + /* * Now destroy the chunk from which the conversation table * structures were allocated. @@ -680,7 +680,7 @@ tcp_analyze_seq_init(void) } /* ************************************************************************** - * End of tcp sequence number analysis + * End of tcp sequence number analysis * **************************************************************************/ @@ -692,7 +692,7 @@ tcp_analyze_seq_init(void) /* * TCP option */ - + #define TCPOPT_NOP 1 /* Padding */ #define TCPOPT_EOL 0 /* End of options */ #define TCPOPT_MSS 2 /* Segment size negotiating */ @@ -890,7 +890,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, (nxtseq < (tsk->start_seq + tsk->tot_len)) ); if(!ipfd_head){ - /* fragment_add() returned NULL, This means that + /* fragment_add() returned NULL, This means that desegmentation is not completed yet. (its like defragmentation but we know we will always add the segments in order). @@ -912,14 +912,14 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, contain a continuation of a higher-level PDU. Call the normal subdissector. */ - decode_tcp_ports(tvb, offset, pinfo, tree, + decode_tcp_ports(tvb, offset, pinfo, tree, sport, dport); called_dissector = TRUE; /* Did the subdissector ask us to desegment some more data - before it could handle the packet? + before it could handle the packet? If so we have to create some structures in our table but - this is something we only do the first time we see this + this is something we only do the first time we see this packet. */ if(pinfo->desegment_len) { @@ -1706,7 +1706,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->ptype = PT_TCP; pinfo->srcport = th_sport; pinfo->destport = th_dport; - + th_seq = tvb_get_ntohl(tvb, offset + 4); th_ack = tvb_get_ntohl(tvb, offset + 8); th_off_x2 = tvb_get_guint8(tvb, offset + 12); @@ -1740,7 +1740,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Compute the sequence number of next octet after this segment. */ nxtseq = th_seq + seglen; - if (check_col(pinfo->cinfo, COL_INFO) || tree) { + if (check_col(pinfo->cinfo, COL_INFO) || tree) { for (i = 0; i < 8; i++) { bpos = 1 << i; if (th_flags & bpos) { @@ -1826,7 +1826,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) can checksum it and, unless it's being returned in an error packet, are willing to allow subdissectors to request reassembly on it. */ - + if (tcp_check_checksum) { /* We haven't turned checksum checking off; checksum it. */ @@ -2096,15 +2096,15 @@ proto_register_tcp(void) "This is a keep-alive segment", HFILL }}, { &hf_tcp_len, - { "TCP Segment Len", "tcp.len", FT_UINT32, BASE_DEC, NULL, 0x0, + { "TCP Segment Len", "tcp.len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, { &hf_tcp_analysis_acks_frame, - { "This is an ACK to the segment in frame", "tcp.analysis.acks_frame", FT_UINT32, BASE_DEC, NULL, 0x0, + { "This is an ACK to the segment in frame", "tcp.analysis.acks_frame", FT_UINT32, BASE_DEC, NULL, 0x0, "Which previous segment is this an ACK for", HFILL}}, { &hf_tcp_analysis_ack_rtt, - { "The RTT to ACK the segment was", "tcp.analysis.ack_rtt", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, + { "The RTT to ACK the segment was", "tcp.analysis.ack_rtt", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "How long time it took to ACK the segment (RTT)", HFILL}}, { &hf_tcp_urgent_pointer, diff --git a/packet-tcp.h b/packet-tcp.h index 006b7a3559..45ed5573a2 100644 --- a/packet-tcp.h +++ b/packet-tcp.h @@ -1,21 +1,21 @@ /* packet-tcp.h * - * $Id: packet-tcp.h,v 1.11 2002/05/05 00:57:57 guy Exp $ + * $Id: packet-tcp.h,v 1.12 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-tds.c b/packet-tds.c index 6d4a279f69..bae91d54e6 100644 --- a/packet-tds.c +++ b/packet-tds.c @@ -2,7 +2,7 @@ * Routines for TDS NetLib dissection * Copyright 2000-2002, Brian Bruns <camber@ais.org> * - * $Id: packet-tds.c,v 1.2 2002/08/20 02:04:00 guy Exp $ + * $Id: packet-tds.c,v 1.3 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,8 +25,8 @@ /* * The NETLIB protocol is a small blocking protocol designed to allow TDS - * to be placed within different transports (TCP, DECNet, IPX/SPX). It - * consist of an eight byte header containing a two byte size field, a last + * to be placed within different transports (TCP, DECNet, IPX/SPX). It + * consist of an eight byte header containing a two byte size field, a last * packet indicator, a one byte packet type field, and a 4 byte field used in * RPC communications whose purpose is unknown (it is most likely a conversation * number to multiplex multiple conversations over a single socket). @@ -57,13 +57,13 @@ * netlib packets may appear in single real packets. TDS PDUs may be split * over netlib packets (and real packets) and most certainly can appear * multiple times within a netlib packet. - * + * * Because of this, I abandoned my earlier attempt at making two dissectors, * one for netlib and one for TDS. Counterintuitively, a single dissector * turned out to be simpler than splitting it up. - * + * * Here are some of the (hefty) limitations of the current code - * + * * . We currently do not handle netlib headers that cross packet boundaries. * This should be an easy fix. * . I probably could have used the packet reassembly stuff, but I started @@ -79,10 +79,10 @@ * there are fields in the login packet which determine byte order. * . result sets that span netlib packets are not working * . TDS 7 and 4.2 result sets are not working yet - * + * * All that said, the code does deal gracefully with different boudary * conditions and what remains are the easier bits, IMHO. - * + * */ #ifdef HAVE_CONFIG_H @@ -112,7 +112,7 @@ x==TDS_RESP_PKT || \ x==TDS_QUERY5_PKT || \ x==TDS_QUERY5_PKT || \ - x==TDS_LOGIN7_PKT) + x==TDS_LOGIN7_PKT) /* The following constants are imported more or less directly from FreeTDS */ @@ -261,7 +261,7 @@ static const value_string env_chg_names[] = { #define MAX_COLUMNS 256 /* - * this is where we store the column information to be used in decoding the + * this is where we store the column information to be used in decoding the * TDS_ROW_TOKEN PDU's */ struct _tds_col { @@ -271,9 +271,9 @@ struct _tds_col { int csize; }; -/* +/* * The first time ethereal decodes a stream it calls each packet in order. - * We use this structure to pass data from the dissection of one packet to + * We use this structure to pass data from the dissection of one packet to * the next. After the initial dissection, this structure is largely unused. */ struct _conv_data { @@ -284,8 +284,8 @@ struct _conv_data { unsigned char tds_remainder[4096]; }; -/* - * Now on the first dissection of a packet copy the global (_conv_data) +/* + * Now on the first dissection of a packet copy the global (_conv_data) * to the packet data so that we may retrieve out of order later. */ struct _packet_data { @@ -296,8 +296,8 @@ struct _packet_data { unsigned char tds_remainder[4096]; }; -/* - * and finally a place for netlib packets within tcp packets +/* + * and finally a place for netlib packets within tcp packets */ struct _netlib_data { guint packet_type; @@ -375,7 +375,7 @@ static int tds_get_token_size(int token) } # if 0 /* - * data_to_string should take column data and turn it into something we can + * data_to_string should take column data and turn it into something we can * display on the tree. */ static char *data_to_string(void *data, guint col_type, guint col_size) @@ -405,8 +405,8 @@ static char *data_to_string(void *data, guint col_type, guint col_size) } #endif /* - * This function computes the number of bytes remaining from a PDU started in - * the previous netlib packet. + * This function computes the number of bytes remaining from a PDU started in + * the previous netlib packet. * XXX - needs some more PDU types added. */ static int @@ -459,7 +459,7 @@ int switched = 0; /* * Since rows are special PDUs in that they are not fixed and lack a size field, - * the length must be computed using the column information seen in the result + * the length must be computed using the column information seen in the result * PDU. This function does just that. */ static size_t @@ -482,10 +482,10 @@ guint cur, i, csize; return (cur - offset + 1); } -/* - * read the results PDU and store the relevent information in the _netlib_data +/* + * read the results PDU and store the relevent information in the _netlib_data * structure for later use (see tds_get_row_size) - * XXX - assumes that result token will be entirely contained within packet + * XXX - assumes that result token will be entirely contained within packet * boundry */ static gboolean @@ -494,13 +494,13 @@ read_results_tds5(tvbuff_t *tvb, struct _netlib_data *nl_data, int offset) guint len, name_len; guint cur; guint i; - + len = tvb_get_letohs(tvb, offset+1); cur = offset + 3; - /* - * This would be the logical place to check for little/big endianess if we - * didn't see the login packet. + /* + * This would be the logical place to check for little/big endianess if we + * didn't see the login packet. */ nl_data->num_cols = tvb_get_letohs(tvb, cur); @@ -533,8 +533,8 @@ guint i; return TRUE; } /* - * This function copies information about data crossing the netlib packet - * boundary from _netlib_data to _conv_data it is called at the end of packet + * This function copies information about data crossing the netlib packet + * boundary from _netlib_data to _conv_data it is called at the end of packet * dissection during the first decoding. */ void @@ -561,8 +561,8 @@ store_conv_data(packet_info *pinfo, struct _netlib_data *nl_data) conversation_add_proto_data(conv,proto_tds, conv_data); } /* - * This function copies information about data crossing the netlib packet - * boundary from _netlib_data to _pkt_data it is called after load_nelib_data + * This function copies information about data crossing the netlib packet + * boundary from _netlib_data to _pkt_data it is called after load_nelib_data * during packet dissection when the packet has not previously been seen. */ void @@ -633,9 +633,9 @@ load_netlib_data(packet_info *pinfo, struct _netlib_data *nl_data) } -/* - * read the eight byte netlib header, write the interesting parts into - * netlib_data, and return false if this is illegal (for heuristics) +/* + * read the eight byte netlib header, write the interesting parts into + * netlib_data, and return false if this is illegal (for heuristics) */ static gboolean netlib_read_header(tvbuff_t *tvb, guint offset, struct _netlib_data *nl_data) @@ -669,7 +669,7 @@ netlib_read_header(tvbuff_t *tvb, guint offset, struct _netlib_data *nl_data) * weak heuristics of the netlib check. */ static gboolean -netlib_check_login_pkt(tvbuff_t *tvb, int offset, packet_info *pinfo, struct _netlib_data *nl_data) +netlib_check_login_pkt(tvbuff_t *tvb, int offset, packet_info *pinfo, struct _netlib_data *nl_data) { guint tds_major, bytes_avail; @@ -679,7 +679,7 @@ netlib_check_login_pkt(tvbuff_t *tvb, int offset, packet_info *pinfo, struct _ne * we have two login packet styles, one for TDS 4.2 and 5.0 */ if (nl_data->packet_type==TDS_LOGIN_PKT) { - /* Use major version number to validate TDS 4/5 login + /* Use major version number to validate TDS 4/5 login * packet */ /* Login packet is first in stream and should not be fragmented... @@ -705,7 +705,7 @@ netlib_check_login_pkt(tvbuff_t *tvb, int offset, packet_info *pinfo, struct _ne return FALSE; } /* check if it is MS SQL default port */ - } else if (pinfo->srcport != 1433 && + } else if (pinfo->srcport != 1433 && pinfo->destport != 1433) { /* otherwise, we can not ensure this is netlib */ /* beyond a reasonable doubt. */ @@ -714,7 +714,7 @@ netlib_check_login_pkt(tvbuff_t *tvb, int offset, packet_info *pinfo, struct _ne } return TRUE; } - + static gboolean dissect_tds_env_chg(tvbuff_t *tvb, struct _netlib_data *nl_data _U_, guint offset, guint last_byte _U_, proto_tree *tree) { @@ -760,22 +760,22 @@ guint pos, token, token_sz = 0; gint skip_count; proto_tree *pdu_tree; - /* + /* * if we have unprocessed bytes from the previous dissection then we deal * those first. */ if (nl_data->netlib_unread_bytes) { end_of_pkt = nl_data->netlib_unread_bytes; } else { - /* - * otherwise the end of the packet is where we are now plus the + /* + * otherwise the end of the packet is where we are now plus the * packet_size minus the 8 header bytes. */ end_of_pkt = offset + nl_data->packet_size - 8; } /* - * the last byte to dissect is the end of the netlib packet or the end of + * the last byte to dissect is the end of the netlib packet or the end of * the tcp packet (tvb buffer) which ever comes first */ last_byte = tvb_length(tvb) > end_of_pkt ? end_of_pkt : tvb_length(tvb); @@ -790,9 +790,9 @@ proto_tree *pdu_tree; /* XXX - should be calling dissection here */ skip_count = get_skip_count(tvb, offset, nl_data, last_byte); - /* + /* * we started with left overs and the data continues to the end of - * this packet. Just add it on, and skip to the next packet + * this packet. Just add it on, and skip to the next packet */ if (skip_count == -1) { token = nl_data->tds_remainder[0]; @@ -834,7 +834,7 @@ proto_tree *pdu_tree; token_sz = tds_get_row_size(tvb, nl_data, pos + 1, last_byte); if (! token_sz) { - /* + /* * partial row, set size to end of packet and stash * the top half for the next packet dissection */ @@ -874,7 +874,7 @@ proto_tree *pdu_tree; /* and step to the end of the PDU, rinse, lather, repeat */ pos += token_sz; - + } } @@ -888,7 +888,7 @@ dissect_netlib_hdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, stru bytes_remaining = tvb_length(tvb) - offset; bytes_avail = bytes_remaining > nl_data->packet_size ? nl_data->packet_size : bytes_remaining; - + /* In the interest of speed, if "tree" is NULL, don't do any work not * necessary to generate protocol tree items. */ @@ -899,12 +899,12 @@ dissect_netlib_hdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, stru "Netlib Header"); netlib_tree = proto_item_add_subtree(netlib_hdr, ett_netlib); - proto_tree_add_text(netlib_tree, tvb, offset, 1, "Packet Type: %02x %s", - nl_data->packet_type, val_to_str(nl_data->packet_type, + proto_tree_add_text(netlib_tree, tvb, offset, 1, "Packet Type: %02x %s", + nl_data->packet_type, val_to_str(nl_data->packet_type, packet_type_names, "Unknown Packet Type")); - proto_tree_add_uint(netlib_tree, hf_netlib_last, tvb, offset+1, 1, + proto_tree_add_uint(netlib_tree, hf_netlib_last, tvb, offset+1, 1, nl_data->packet_last); - proto_tree_add_uint(netlib_tree, hf_netlib_size, tvb, offset+2, 2, + proto_tree_add_uint(netlib_tree, hf_netlib_size, tvb, offset+2, 2, nl_data->packet_size); } } @@ -927,7 +927,7 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conv = find_conversation (&pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - /* + /* * we don't know if this is our packet yet, so do nothing if we don't have * a conversation. */ @@ -943,14 +943,14 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } #ifdef DEBUG - printf("offset = %d\n", offset); + printf("offset = %d\n", offset); #endif load_netlib_data(pinfo, &nl_data); - /* - * if offset is > 0 then we have undecoded data at the front of the - * packet. Call the TDS dissector on it. + /* + * if offset is > 0 then we have undecoded data at the front of the + * packet. Call the TDS dissector on it. */ if (nl_data.packet_type == TDS_RESP_PKT && offset) { dissect_tds(tvb, pinfo, tree, &nl_data, 0); @@ -960,9 +960,9 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (bytes_remaining > 0) { - /* - * if packet is less than 8 characters, its not a - * netlib packet + /* + * if packet is less than 8 characters, its not a + * netlib packet * This is not entirely correct...fix. */ if (bytes_remaining < 8) { @@ -972,15 +972,15 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* read header fields and check their validity */ if (!netlib_read_header(tvb, offset, &nl_data)) return FALSE; - + /* If we don't have a conversation is this a TDS stream? */ if (conv == NULL) { if (!netlib_check_login_pkt(tvb, offset, pinfo, &nl_data)) { return FALSE; } /* first packet checks out, create a conversation */ - conv = conversation_new (&pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, pinfo->destport, + conv = conversation_new (&pinfo->src, &pinfo->dst, + pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } @@ -1002,21 +1002,21 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } nl_data.netlib_unread_bytes = offset - tvb_length(tvb); - /* + /* * copy carry over data to the conversation buffer, to retrieve at beginning - * of next packet + * of next packet */ store_conv_data(pinfo, &nl_data); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDS"); - + /* set the packet description based on its TDS packet type */ if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s", - val_to_str(nl_data.packet_type, packet_type_names, + val_to_str(nl_data.packet_type, packet_type_names, "Unknown Packet Type: %u")); } @@ -1033,23 +1033,23 @@ dissect_netlib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_netlib(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_netlib_size, { "Size", "netlib.size", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "Packet Size", HFILL } }, { &hf_netlib_type, { "Type", "netlib.type", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, "Packet Type", HFILL } }, { &hf_netlib_last, { "Last Packet", "netlib.last", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Last Packet Indicator", HFILL } }, }; diff --git a/packet-telnet.c b/packet-telnet.c index 9fed183de3..238a509968 100644 --- a/packet-telnet.c +++ b/packet-telnet.c @@ -2,24 +2,24 @@ * Routines for telnet packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-telnet.c,v 1.31 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-telnet.c,v 1.32 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-pop.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -176,7 +176,7 @@ telnet_will_wont_do_dont(proto_tree *telnet_tree, tvbuff_t *tvb, else opt = options[opt_byte]; offset++; - + proto_tree_add_text(telnet_tree, tvb, start_offset, 3, "Command: %s %s", type, opt); return offset; @@ -187,7 +187,7 @@ telnet_command(proto_tree *telnet_tree, tvbuff_t *tvb, int start_offset) { int offset = start_offset; guchar optcode; - + offset += 1; /* skip IAC */ optcode = tvb_get_guint8(tvb, offset); offset++; @@ -386,7 +386,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data_len = iac_offset - offset; if (data_len > 0) telnet_add_text(telnet_tree, tvb, offset, data_len); - + /* * Now interpret the command. */ diff --git a/packet-tftp.c b/packet-tftp.c index 659541db41..493df31a96 100644 --- a/packet-tftp.c +++ b/packet-tftp.c @@ -5,24 +5,24 @@ * Craig Newell <CraigN@cheque.uq.edu.au> * RFC2347 TFTP Option Extension * - * $Id: packet-tftp.c,v 1.39 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tftp.c,v 1.40 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-bootp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -145,7 +145,7 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, 2, opcode); } offset += 2; - + switch (opcode) { case TFTP_RRQ: diff --git a/packet-time.c b/packet-time.c index 900eb23542..02065e4009 100644 --- a/packet-time.c +++ b/packet-time.c @@ -3,24 +3,24 @@ * * Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-time.c,v 1.18 2002/01/24 09:20:52 guy Exp $ + * $Id: packet-time.c,v 1.19 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -47,20 +47,20 @@ dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME"); - + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s", pinfo->srcport == pinfo->match_port ? "Response":"Request"); } - + if (tree) { - + ti = proto_tree_add_item(tree, proto_time, tvb, 0, -1, FALSE); time_tree = proto_item_add_subtree(ti, ett_time); - + proto_tree_add_text(time_tree, tvb, 0, 0, pinfo->srcport==UDP_PORT_TIME? "Type: Response":"Type: Request"); - if (pinfo->srcport == UDP_PORT_TIME) { + if (pinfo->srcport == UDP_PORT_TIME) { guint32 delta_seconds = tvb_get_ntohl(tvb, 0); proto_tree_add_text(time_tree, tvb, 0, 4, "%u seconds since midnight 1 January 1900 GMT", diff --git a/packet-tns.c b/packet-tns.c index fff00bff11..85f63600bd 100644 --- a/packet-tns.c +++ b/packet-tns.c @@ -1,24 +1,24 @@ /* packet-tns.c * Routines for Oracle TNS packet dissection * - * $Id: packet-tns.c,v 1.35 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tns.c,v 1.36 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -225,7 +225,7 @@ static void dissect_tns_service_options(tvbuff_t *tvb, int offset, offset, 2, FALSE); proto_tree_add_item(sopt_tree, hf_tns_sopt_flag_sa, tvb, offset, 2, FALSE); - + } static void dissect_tns_connect_flag(tvbuff_t *tvb, int offset, @@ -244,7 +244,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, { proto_tree *data_tree = NULL, *ti; int is_sns = 0; - + if ( tvb_bytes_exist(tvb, offset+2, 4) ) { if ( tvb_get_guint8(tvb, offset+2) == 0xDE && @@ -266,7 +266,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, else { ti = proto_tree_add_text(tns_tree, tvb, offset, -1, - "Data"); + "Data"); } data_tree = proto_item_add_subtree(ti, ett_tns_data); @@ -277,9 +277,9 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( tree ) { proto_tree *df_tree = NULL; - + ti = proto_tree_add_item(data_tree, hf_tns_data_flag, tvb, offset, 2, FALSE); - + df_tree = proto_item_add_subtree(ti, ett_tns_data_flag); proto_tree_add_item(df_tree, hf_tns_data_flag_send, tvb, offset, 2, FALSE); proto_tree_add_item(df_tree, hf_tns_data_flag_rc, tvb, offset, 2, FALSE); @@ -302,9 +302,9 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, else { col_append_fstr(pinfo->cinfo, COL_INFO, ", Data"); - } + } } - + if ( data_tree ) { call_dissector(data_handle, @@ -331,7 +331,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_connect, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Connect"); @@ -343,7 +343,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, offset, 2, FALSE); } offset += 2; - + if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_compat_version, tvb, @@ -354,14 +354,14 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree *sopt_tree = NULL; - + ti = proto_tree_add_item(connect_tree, hf_tns_service_options, tvb, offset, 2, FALSE); sopt_tree = proto_item_add_subtree(ti, ett_tns_sopt_flag); dissect_tns_service_options(tvb, offset, sopt_tree); - + } offset += 2; @@ -383,10 +383,10 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree *ntp_tree = NULL; - + ti = proto_tree_add_item(connect_tree, hf_tns_nt_proto_characteristics, tvb, offset, 2, FALSE); - + ntp_tree = proto_item_add_subtree(ti, ett_tns_ntp_flag); proto_tree_add_item(ntp_tree, hf_tns_ntp_flag_hangon, tvb, offset, 2, FALSE); @@ -448,7 +448,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree *cflag_tree = NULL; - + ti = proto_tree_add_item(connect_tree, hf_tns_connect_flags0, tvb, offset, 1, FALSE); @@ -461,7 +461,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree *cflag_tree = NULL; - + ti = proto_tree_add_item(connect_tree, hf_tns_connect_flags1, tvb, offset, 1, FALSE); @@ -517,7 +517,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_accept, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Accept"); @@ -529,18 +529,18 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, offset, 2, FALSE); } offset += 2; - + if ( accept_tree ) { proto_tree *sopt_tree = NULL; - - ti = proto_tree_add_item(accept_tree, hf_tns_service_options, + + ti = proto_tree_add_item(accept_tree, hf_tns_service_options, tvb, offset, 2, FALSE); sopt_tree = proto_item_add_subtree(ti, ett_tns_sopt_flag); dissect_tns_service_options(tvb, offset, sopt_tree); - + } offset += 2; @@ -584,28 +584,28 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( accept_tree ) { proto_tree *cflag_tree = NULL; - + ti = proto_tree_add_item(accept_tree, hf_tns_connect_flags0, tvb, offset, 1, FALSE); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); dissect_tns_connect_flag(tvb, offset, cflag_tree); - + } offset += 1; if ( accept_tree ) { proto_tree *cflag_tree = NULL; - + ti = proto_tree_add_item(accept_tree, hf_tns_connect_flags1, tvb, offset, 1, FALSE); cflag_tree = proto_item_add_subtree(ti, ett_tns_conn_flag); dissect_tns_connect_flag(tvb, offset, cflag_tree); - + } offset += 1; @@ -632,7 +632,7 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_refuse, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Refuse"); @@ -682,7 +682,7 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_abort, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Abort"); @@ -733,7 +733,7 @@ static void dissect_tns_marker(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_marker, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { if ( is_attention ) @@ -784,7 +784,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_redirect, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Redirect"); @@ -819,7 +819,7 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_boolean_hidden(tns_tree, hf_tns_control, tvb, 0, 0, TRUE); } - + if ( check_col(pinfo->cinfo, COL_INFO) ) { col_append_str(pinfo->cinfo, COL_INFO, ", Control"); @@ -870,10 +870,10 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, - (pinfo->match_port == pinfo->destport) ? "Request" : "Response"); + (pinfo->match_port == pinfo->destport) ? "Request" : "Response"); } - if (tree) + if (tree) { ti = proto_tree_add_item(tree, proto_tns, tvb, 0, -1, FALSE); tns_tree = proto_item_add_subtree(ti, ett_tns); @@ -973,305 +973,305 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_tns(void) { static hf_register_info hf[] = { - { &hf_tns_response, { - "Response", "tns.response", FT_BOOLEAN, BASE_NONE, + { &hf_tns_response, { + "Response", "tns.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if TNS response", HFILL }}, - { &hf_tns_request, { - "Request", "tns.request", FT_BOOLEAN, BASE_NONE, + { &hf_tns_request, { + "Request", "tns.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if TNS request", HFILL }}, - { &hf_tns_length, { - "Packet Length", "tns.length", FT_UINT16, BASE_DEC, + { &hf_tns_length, { + "Packet Length", "tns.length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of TNS packet", HFILL }}, - { &hf_tns_packet_checksum, { - "Packet Checksum", "tns.packet_checksum", FT_UINT16, BASE_HEX, + { &hf_tns_packet_checksum, { + "Packet Checksum", "tns.packet_checksum", FT_UINT16, BASE_HEX, NULL, 0x0, "Checksum of Packet Data", HFILL }}, - { &hf_tns_header_checksum, { - "Header Checksum", "tns.header_checksum", FT_UINT16, BASE_HEX, + { &hf_tns_header_checksum, { + "Header Checksum", "tns.header_checksum", FT_UINT16, BASE_HEX, NULL, 0x0, "Checksum of Header Data", HFILL }}, - - { &hf_tns_version, { - "Version", "tns.version", FT_UINT16, BASE_DEC, + + { &hf_tns_version, { + "Version", "tns.version", FT_UINT16, BASE_DEC, NULL, 0x0, "Version", HFILL }}, - { &hf_tns_compat_version, { - "Version (Compatible)", "tns.compat_version", FT_UINT16, BASE_DEC, + { &hf_tns_compat_version, { + "Version (Compatible)", "tns.compat_version", FT_UINT16, BASE_DEC, NULL, 0x0, "Version (Compatible)", HFILL }}, - { &hf_tns_service_options, { - "Service Options", "tns.service_options", FT_UINT16, BASE_HEX, + { &hf_tns_service_options, { + "Service Options", "tns.service_options", FT_UINT16, BASE_HEX, NULL, 0x0, "Service Options", HFILL }}, - { &hf_tns_sopt_flag_bconn, { - "Broken Connect Notify", "tns.so_flag.bconn", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_bconn, { + "Broken Connect Notify", "tns.so_flag.bconn", FT_UINT16, BASE_BIN, NULL, 0x2000, "Broken Connect Notify", HFILL }}, - { &hf_tns_sopt_flag_pc, { - "Packet Checksum", "tns.so_flag.pc", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_pc, { + "Packet Checksum", "tns.so_flag.pc", FT_UINT16, BASE_BIN, NULL, 0x1000, "Packet Checksum", HFILL }}, - { &hf_tns_sopt_flag_hc, { - "Header Checksum", "tns.so_flag.hc", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_hc, { + "Header Checksum", "tns.so_flag.hc", FT_UINT16, BASE_BIN, NULL, 0x0800, "Header Checksum", HFILL }}, - { &hf_tns_sopt_flag_fd, { - "Full Duplex", "tns.so_flag.fd", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_fd, { + "Full Duplex", "tns.so_flag.fd", FT_UINT16, BASE_BIN, NULL, 0x0400, "Full Duplex", HFILL }}, - { &hf_tns_sopt_flag_hd, { - "Half Duplex", "tns.so_flag.hd", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_hd, { + "Half Duplex", "tns.so_flag.hd", FT_UINT16, BASE_BIN, NULL, 0x0200, "Half Duplex", HFILL }}, - { &hf_tns_sopt_flag_dc1, { - "Don't Care", "tns.so_flag.dc1", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_dc1, { + "Don't Care", "tns.so_flag.dc1", FT_UINT16, BASE_BIN, NULL, 0x0100, "Don't Care", HFILL }}, - { &hf_tns_sopt_flag_dc2, { - "Don't Care", "tns.so_flag.dc2", FT_UINT16, BASE_BIN, - NULL, 0x0080, "Don't Care", HFILL }}, - { &hf_tns_sopt_flag_dio, { - "Direct IO to Transport", "tns.so_flag.dio", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_dc2, { + "Don't Care", "tns.so_flag.dc2", FT_UINT16, BASE_BIN, + NULL, 0x0080, "Don't Care", HFILL }}, + { &hf_tns_sopt_flag_dio, { + "Direct IO to Transport", "tns.so_flag.dio", FT_UINT16, BASE_BIN, NULL, 0x0010, "Direct IO to Transport", HFILL }}, - { &hf_tns_sopt_flag_ap, { - "Attention Processing", "tns.so_flag.ap", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_ap, { + "Attention Processing", "tns.so_flag.ap", FT_UINT16, BASE_BIN, NULL, 0x0008, "Attention Processing", HFILL }}, - { &hf_tns_sopt_flag_ra, { - "Can Receive Attention", "tns.so_flag.ra", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_ra, { + "Can Receive Attention", "tns.so_flag.ra", FT_UINT16, BASE_BIN, NULL, 0x0004, "Can Receive Attention", HFILL }}, - { &hf_tns_sopt_flag_sa, { - "Can Send Attention", "tns.so_flag.sa", FT_UINT16, BASE_BIN, + { &hf_tns_sopt_flag_sa, { + "Can Send Attention", "tns.so_flag.sa", FT_UINT16, BASE_BIN, NULL, 0x0002, "Can Send Attention", HFILL }}, - { &hf_tns_sdu_size, { - "Session Data Unit Size", "tns.sdu_size", FT_UINT16, BASE_DEC, + { &hf_tns_sdu_size, { + "Session Data Unit Size", "tns.sdu_size", FT_UINT16, BASE_DEC, NULL, 0x0, "Session Data Unit Size", HFILL }}, - { &hf_tns_max_tdu_size, { - "Maximum Transmission Data Unit Size", "tns.max_tdu_size", FT_UINT16, BASE_DEC, + { &hf_tns_max_tdu_size, { + "Maximum Transmission Data Unit Size", "tns.max_tdu_size", FT_UINT16, BASE_DEC, NULL, 0x0, "Maximum Transmission Data Unit Size", HFILL }}, - { &hf_tns_nt_proto_characteristics, { - "NT Protocol Characteristics", "tns.nt_proto_characteristics", FT_UINT16, BASE_HEX, + { &hf_tns_nt_proto_characteristics, { + "NT Protocol Characteristics", "tns.nt_proto_characteristics", FT_UINT16, BASE_HEX, NULL, 0x0, "NT Protocol Characteristics", HFILL }}, - { &hf_tns_ntp_flag_hangon, { - "Hangon to listener connect", "tns.ntp_flag.hangon", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_hangon, { + "Hangon to listener connect", "tns.ntp_flag.hangon", FT_UINT16, BASE_BIN, NULL, 0x8000, "Hangon to listener connect", HFILL }}, - { &hf_tns_ntp_flag_crel, { - "Confirmed release", "tns.ntp_flag.crel", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_crel, { + "Confirmed release", "tns.ntp_flag.crel", FT_UINT16, BASE_BIN, NULL, 0x4000, "Confirmed release", HFILL }}, - { &hf_tns_ntp_flag_tduio, { - "TDU based IO", "tns.ntp_flag.tduio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_tduio, { + "TDU based IO", "tns.ntp_flag.tduio", FT_UINT16, BASE_BIN, NULL, 0x2000, "TDU based IO", HFILL }}, - { &hf_tns_ntp_flag_srun, { - "Spawner running", "tns.ntp_flag.srun", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_srun, { + "Spawner running", "tns.ntp_flag.srun", FT_UINT16, BASE_BIN, NULL, 0x1000, "Spawner running", HFILL }}, - { &hf_tns_ntp_flag_dtest, { - "Data test", "tns.ntp_flag.dtest", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_dtest, { + "Data test", "tns.ntp_flag.dtest", FT_UINT16, BASE_BIN, NULL, 0x0800, "Data Test", HFILL }}, - { &hf_tns_ntp_flag_cbio, { - "Callback IO supported", "tns.ntp_flag.cbio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_cbio, { + "Callback IO supported", "tns.ntp_flag.cbio", FT_UINT16, BASE_BIN, NULL, 0x0400, "Callback IO supported", HFILL }}, - { &hf_tns_ntp_flag_asio, { - "ASync IO Supported", "tns.ntp_flag.asio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_asio, { + "ASync IO Supported", "tns.ntp_flag.asio", FT_UINT16, BASE_BIN, NULL, 0x0200, "ASync IO Supported", HFILL }}, - { &hf_tns_ntp_flag_pio, { - "Packet oriented IO", "tns.ntp_flag.pio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_pio, { + "Packet oriented IO", "tns.ntp_flag.pio", FT_UINT16, BASE_BIN, NULL, 0x0100, "Packet oriented IO", HFILL }}, - { &hf_tns_ntp_flag_grant, { - "Can grant connection to another", "tns.ntp_flag.grant", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_grant, { + "Can grant connection to another", "tns.ntp_flag.grant", FT_UINT16, BASE_BIN, NULL, 0x0080, "Can grant connection to another", HFILL }}, - { &hf_tns_ntp_flag_handoff, { - "Can handoff connection to another", "tns.ntp_flag.handoff", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_handoff, { + "Can handoff connection to another", "tns.ntp_flag.handoff", FT_UINT16, BASE_BIN, NULL, 0x0040, "Can handoff connection to another", HFILL }}, - { &hf_tns_ntp_flag_sigio, { - "Generate SIGIO signal", "tns.ntp_flag.sigio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_sigio, { + "Generate SIGIO signal", "tns.ntp_flag.sigio", FT_UINT16, BASE_BIN, NULL, 0x0020, "Generate SIGIO signal", HFILL }}, - { &hf_tns_ntp_flag_sigpipe, { - "Generate SIGPIPE signal", "tns.ntp_flag.sigpipe", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_sigpipe, { + "Generate SIGPIPE signal", "tns.ntp_flag.sigpipe", FT_UINT16, BASE_BIN, NULL, 0x0010, "Generate SIGPIPE signal", HFILL }}, - { &hf_tns_ntp_flag_sigurg, { - "Generate SIGURG signal", "tns.ntp_flag.sigurg", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_sigurg, { + "Generate SIGURG signal", "tns.ntp_flag.sigurg", FT_UINT16, BASE_BIN, NULL, 0x0008, "Generate SIGURG signal", HFILL }}, - { &hf_tns_ntp_flag_urgentio, { - "Urgent IO supported", "tns.ntp_flag.urgentio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_urgentio, { + "Urgent IO supported", "tns.ntp_flag.urgentio", FT_UINT16, BASE_BIN, NULL, 0x0004, "Urgent IO supported", HFILL }}, - { &hf_tns_ntp_flag_fdio, { - "Full duplex IO supported", "tns.ntp_flag.dfio", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_fdio, { + "Full duplex IO supported", "tns.ntp_flag.dfio", FT_UINT16, BASE_BIN, NULL, 0x0002, "Full duplex IO supported", HFILL }}, - { &hf_tns_ntp_flag_testop, { - "Test operation", "tns.ntp_flag.testop", FT_UINT16, BASE_BIN, + { &hf_tns_ntp_flag_testop, { + "Test operation", "tns.ntp_flag.testop", FT_UINT16, BASE_BIN, NULL, 0x0001, "Test operation", HFILL }}, - { &hf_tns_line_turnaround, { - "Line Turnaround Value", "tns.line_turnaround", FT_UINT16, BASE_DEC, + { &hf_tns_line_turnaround, { + "Line Turnaround Value", "tns.line_turnaround", FT_UINT16, BASE_DEC, NULL, 0x0, "Line Turnaround Value", HFILL }}, - { &hf_tns_value_of_one, { - "Value of 1 in Hardware", "tns.value_of_one", FT_BYTES, BASE_NONE, - NULL, 0x0, "Value of 1 in Hardware", HFILL }}, + { &hf_tns_value_of_one, { + "Value of 1 in Hardware", "tns.value_of_one", FT_BYTES, BASE_NONE, + NULL, 0x0, "Value of 1 in Hardware", HFILL }}, - { &hf_tns_connect, { - "Connect", "tns.connect", FT_BOOLEAN, BASE_NONE, + { &hf_tns_connect, { + "Connect", "tns.connect", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Connect", HFILL }}, - { &hf_tns_connect_data_length, { - "Length of Connect Data", "tns.connect_data_length", FT_UINT16, BASE_DEC, + { &hf_tns_connect_data_length, { + "Length of Connect Data", "tns.connect_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of Connect Data", HFILL }}, - { &hf_tns_connect_data_offset, { - "Offset to Connect Data", "tns.connect_data_offset", FT_UINT16, BASE_DEC, + { &hf_tns_connect_data_offset, { + "Offset to Connect Data", "tns.connect_data_offset", FT_UINT16, BASE_DEC, NULL, 0x0, "Offset to Connect Data", HFILL }}, - { &hf_tns_connect_data_max, { - "Maximum Receivable Connect Data", "tns.connect_data_max", FT_UINT32, BASE_DEC, + { &hf_tns_connect_data_max, { + "Maximum Receivable Connect Data", "tns.connect_data_max", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum Receivable Connect Data", HFILL }}, - { &hf_tns_connect_flags0, { - "Connect Flags 0", "tns.connect_flags0", FT_UINT8, BASE_HEX, + { &hf_tns_connect_flags0, { + "Connect Flags 0", "tns.connect_flags0", FT_UINT8, BASE_HEX, NULL, 0x0, "Connect Flags 0", HFILL }}, - { &hf_tns_connect_flags1, { - "Connect Flags 1", "tns.connect_flags1", FT_UINT8, BASE_HEX, + { &hf_tns_connect_flags1, { + "Connect Flags 1", "tns.connect_flags1", FT_UINT8, BASE_HEX, NULL, 0x0, "Connect Flags 1", HFILL }}, - { &hf_tns_conn_flag_nareq, { - "NA services required", "tns.connect_flags.nareq", FT_UINT8, BASE_BIN, + { &hf_tns_conn_flag_nareq, { + "NA services required", "tns.connect_flags.nareq", FT_UINT8, BASE_BIN, NULL, 0x10, "NA services required", HFILL }}, - { &hf_tns_conn_flag_nalink, { - "NA services linked in", "tns.connect_flags.nalink", FT_UINT8, BASE_BIN, + { &hf_tns_conn_flag_nalink, { + "NA services linked in", "tns.connect_flags.nalink", FT_UINT8, BASE_BIN, NULL, 0x08, "NA services linked in", HFILL }}, - { &hf_tns_conn_flag_enablena, { - "NA services enabled", "tns.connect_flags.enablena", FT_UINT8, BASE_BIN, + { &hf_tns_conn_flag_enablena, { + "NA services enabled", "tns.connect_flags.enablena", FT_UINT8, BASE_BIN, NULL, 0x04, "NA services enabled", HFILL }}, - { &hf_tns_conn_flag_ichg, { - "Interchange is involved", "tns.connect_flags.ichg", FT_UINT8, BASE_BIN, + { &hf_tns_conn_flag_ichg, { + "Interchange is involved", "tns.connect_flags.ichg", FT_UINT8, BASE_BIN, NULL, 0x02, "Interchange is involved", HFILL }}, - { &hf_tns_conn_flag_wantna, { - "NA services wanted", "tns.connect_flags.wantna", FT_UINT8, BASE_BIN, + { &hf_tns_conn_flag_wantna, { + "NA services wanted", "tns.connect_flags.wantna", FT_UINT8, BASE_BIN, NULL, 0x01, "NA services wanted", HFILL }}, - { &hf_tns_trace_cf1, { - "Trace Cross Facility Item 1", "tns.trace_cf1", FT_UINT32, BASE_HEX, + { &hf_tns_trace_cf1, { + "Trace Cross Facility Item 1", "tns.trace_cf1", FT_UINT32, BASE_HEX, NULL, 0x0, "Trace Cross Facility Item 1", HFILL }}, - { &hf_tns_trace_cf2, { - "Trace Cross Facility Item 2", "tns.trace_cf2", FT_UINT32, BASE_HEX, + { &hf_tns_trace_cf2, { + "Trace Cross Facility Item 2", "tns.trace_cf2", FT_UINT32, BASE_HEX, NULL, 0x0, "Trace Cross Facility Item 2", HFILL }}, - { &hf_tns_trace_cid, { - "Trace Unique Connection ID", "tns.trace_cid", FT_UINT64, BASE_HEX, + { &hf_tns_trace_cid, { + "Trace Unique Connection ID", "tns.trace_cid", FT_UINT64, BASE_HEX, NULL, 0x0, "Trace Unique Connection ID", HFILL }}, - { &hf_tns_connect_data, { - "Connect Data", "tns.connect_data", FT_STRING, BASE_NONE, + { &hf_tns_connect_data, { + "Connect Data", "tns.connect_data", FT_STRING, BASE_NONE, NULL, 0x0, "Connect Data", HFILL }}, - { &hf_tns_accept, { - "Accept", "tns.accept", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Accept", HFILL }}, - { &hf_tns_accept_data_length, { - "Accept Data Length", "tns.accept_data_length", FT_UINT16, BASE_DEC, + { &hf_tns_accept, { + "Accept", "tns.accept", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Accept", HFILL }}, + { &hf_tns_accept_data_length, { + "Accept Data Length", "tns.accept_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of Accept Data", HFILL }}, - { &hf_tns_accept_data, { - "Accept Data", "tns.accept_data", FT_STRING, BASE_NONE, + { &hf_tns_accept_data, { + "Accept Data", "tns.accept_data", FT_STRING, BASE_NONE, NULL, 0x0, "Accept Data", HFILL }}, - { &hf_tns_accept_data_offset, { - "Offset to Accept Data", "tns.accept_data_offset", FT_UINT16, BASE_DEC, + { &hf_tns_accept_data_offset, { + "Offset to Accept Data", "tns.accept_data_offset", FT_UINT16, BASE_DEC, NULL, 0x0, "Offset to Accept Data", HFILL }}, - { &hf_tns_refuse, { - "Refuse", "tns.refuse", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Refuse", HFILL }}, - { &hf_tns_refuse_reason_user, { - "Refuse Reason (User)", "tns.refuse_reason_user", FT_UINT8, BASE_HEX, + { &hf_tns_refuse, { + "Refuse", "tns.refuse", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Refuse", HFILL }}, + { &hf_tns_refuse_reason_user, { + "Refuse Reason (User)", "tns.refuse_reason_user", FT_UINT8, BASE_HEX, NULL, 0x0, "Refuse Reason from Application", HFILL }}, - { &hf_tns_refuse_reason_system, { - "Refuse Reason (System)", "tns.refuse_reason_system", FT_UINT8, BASE_HEX, + { &hf_tns_refuse_reason_system, { + "Refuse Reason (System)", "tns.refuse_reason_system", FT_UINT8, BASE_HEX, NULL, 0x0, "Refuse Reason from System", HFILL }}, - { &hf_tns_refuse_data_length, { - "Refuse Data Length", "tns.refuse_data_length", FT_UINT16, BASE_DEC, + { &hf_tns_refuse_data_length, { + "Refuse Data Length", "tns.refuse_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of Refuse Data", HFILL }}, - { &hf_tns_refuse_data, { - "Refuse Data", "tns.refuse_data", FT_STRING, BASE_NONE, + { &hf_tns_refuse_data, { + "Refuse Data", "tns.refuse_data", FT_STRING, BASE_NONE, NULL, 0x0, "Refuse Data", HFILL }}, - { &hf_tns_abort, { - "Abort", "tns.abort", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Abort", HFILL }}, - { &hf_tns_abort_reason_user, { - "Abort Reason (User)", "tns.abort_reason_user", FT_UINT8, BASE_HEX, + { &hf_tns_abort, { + "Abort", "tns.abort", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Abort", HFILL }}, + { &hf_tns_abort_reason_user, { + "Abort Reason (User)", "tns.abort_reason_user", FT_UINT8, BASE_HEX, NULL, 0x0, "Abort Reason from Application", HFILL }}, - { &hf_tns_abort_reason_system, { - "Abort Reason (User)", "tns.abort_reason_system", FT_UINT8, BASE_HEX, + { &hf_tns_abort_reason_system, { + "Abort Reason (User)", "tns.abort_reason_system", FT_UINT8, BASE_HEX, NULL, 0x0, "Abort Reason from System", HFILL }}, - { &hf_tns_abort_data, { - "Abort Data", "tns.abort_data", FT_STRING, BASE_NONE, + { &hf_tns_abort_data, { + "Abort Data", "tns.abort_data", FT_STRING, BASE_NONE, NULL, 0x0, "Abort Data", HFILL }}, - { &hf_tns_marker, { - "Marker", "tns.marker", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Marker", HFILL }}, - { &hf_tns_marker_type, { - "Marker Type", "tns.marker.type", FT_UINT8, BASE_HEX, + { &hf_tns_marker, { + "Marker", "tns.marker", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Marker", HFILL }}, + { &hf_tns_marker_type, { + "Marker Type", "tns.marker.type", FT_UINT8, BASE_HEX, VALS(tns_marker_types), 0x0, "Marker Type", HFILL }}, - { &hf_tns_marker_data_byte, { - "Marker Data Byte", "tns.marker.databyte", FT_UINT8, BASE_HEX, + { &hf_tns_marker_data_byte, { + "Marker Data Byte", "tns.marker.databyte", FT_UINT8, BASE_HEX, NULL, 0x0, "Marker Data Byte", HFILL }}, - { &hf_tns_marker_data, { - "Marker Data", "tns.marker.data", FT_UINT16, BASE_HEX, + { &hf_tns_marker_data, { + "Marker Data", "tns.marker.data", FT_UINT16, BASE_HEX, NULL, 0x0, "Marker Data", HFILL }}, - { &hf_tns_control, { - "Control", "tns.control", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Control", HFILL }}, - { &hf_tns_control_cmd, { - "Control Command", "tns.control.cmd", FT_UINT16, BASE_HEX, + { &hf_tns_control, { + "Control", "tns.control", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Control", HFILL }}, + { &hf_tns_control_cmd, { + "Control Command", "tns.control.cmd", FT_UINT16, BASE_HEX, VALS(tns_control_cmds), 0x0, "Control Command", HFILL }}, - { &hf_tns_control_data, { - "Control Data", "tns.control.data", FT_BYTES, BASE_HEX, + { &hf_tns_control_data, { + "Control Data", "tns.control.data", FT_BYTES, BASE_HEX, NULL, 0x0, "Control Data", HFILL }}, - { &hf_tns_redirect, { - "Redirect", "tns.redirect", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Redirect", HFILL }}, - { &hf_tns_redirect_data_length, { - "Redirect Data Length", "tns.redirect_data_length", FT_UINT16, BASE_DEC, + { &hf_tns_redirect, { + "Redirect", "tns.redirect", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Redirect", HFILL }}, + { &hf_tns_redirect_data_length, { + "Redirect Data Length", "tns.redirect_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of Redirect Data", HFILL }}, - { &hf_tns_redirect_data, { - "Redirect Data", "tns.redirect_data", FT_STRING, BASE_NONE, + { &hf_tns_redirect_data, { + "Redirect Data", "tns.redirect_data", FT_STRING, BASE_NONE, NULL, 0x0, "Redirect Data", HFILL }}, - { &hf_tns_data, { - "Data", "tns.data", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Data", HFILL }}, - - { &hf_tns_data_flag, { - "Data Flag", "tns.data_flag", FT_UINT16, BASE_HEX, + { &hf_tns_data, { + "Data", "tns.data", FT_BOOLEAN, BASE_NONE, + NULL, 0x0, "Data", HFILL }}, + + { &hf_tns_data_flag, { + "Data Flag", "tns.data_flag", FT_UINT16, BASE_HEX, NULL, 0x0, "Data Flag", HFILL }}, - { &hf_tns_data_flag_send, { - "Send Token", "tns.data_flag.send", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_send, { + "Send Token", "tns.data_flag.send", FT_UINT16, BASE_BIN, NULL, 0x1, "Send Token", HFILL }}, - { &hf_tns_data_flag_rc, { - "Request Confirmation", "tns.data_flag.rc", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_rc, { + "Request Confirmation", "tns.data_flag.rc", FT_UINT16, BASE_BIN, NULL, 0x2, "Request Confirmation", HFILL }}, - { &hf_tns_data_flag_c, { - "Confirmation", "tns.data_flag.c", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_c, { + "Confirmation", "tns.data_flag.c", FT_UINT16, BASE_BIN, NULL, 0x4, "Confirmation", HFILL }}, - { &hf_tns_data_flag_reserved, { - "Reserved", "tns.data_flag.reserved", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_reserved, { + "Reserved", "tns.data_flag.reserved", FT_UINT16, BASE_BIN, NULL, 0x8, "Reserved", HFILL }}, - { &hf_tns_data_flag_more, { - "More Data to Come", "tns.data_flag.more", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_more, { + "More Data to Come", "tns.data_flag.more", FT_UINT16, BASE_BIN, NULL, 0x20, "More Data to Come", HFILL }}, - { &hf_tns_data_flag_eof, { - "End of File", "tns.data_flag.eof", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_eof, { + "End of File", "tns.data_flag.eof", FT_UINT16, BASE_BIN, NULL, 0x40, "End of File", HFILL }}, - { &hf_tns_data_flag_dic, { - "Do Immediate Confirmation", "tns.data_flag.dic", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_dic, { + "Do Immediate Confirmation", "tns.data_flag.dic", FT_UINT16, BASE_BIN, NULL, 0x80, "Do Immediate Confirmation", HFILL }}, - { &hf_tns_data_flag_rts, { - "Request To Send", "tns.data_flag.rts", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_rts, { + "Request To Send", "tns.data_flag.rts", FT_UINT16, BASE_BIN, NULL, 0x100, "Request To Send", HFILL }}, - { &hf_tns_data_flag_sntt, { - "Send NT Trailer", "tns.data_flag.sntt", FT_UINT16, BASE_BIN, + { &hf_tns_data_flag_sntt, { + "Send NT Trailer", "tns.data_flag.sntt", FT_UINT16, BASE_BIN, NULL, 0x200, "Send NT Trailer", HFILL }}, - { &hf_tns_reserved_byte, { - "Reserved Byte", "tns.reserved_byte", FT_BYTES, BASE_HEX, + { &hf_tns_reserved_byte, { + "Reserved Byte", "tns.reserved_byte", FT_BYTES, BASE_HEX, NULL, 0x0, "Reserved Byte", HFILL }}, - { &hf_tns_packet_type, { - "Packet Type", "tns.type", FT_UINT8, BASE_DEC, - VALS(tns_type_vals), 0x0, "Type of TNS packet", HFILL }} + { &hf_tns_packet_type, { + "Packet Type", "tns.type", FT_UINT8, BASE_DEC, + VALS(tns_type_vals), 0x0, "Type of TNS packet", HFILL }} }; diff --git a/packet-tns.h b/packet-tns.h index 35328b72d9..93b8f9cbf8 100644 --- a/packet-tns.h +++ b/packet-tns.h @@ -1,22 +1,22 @@ /* packet-tns.h * - * $Id: packet-tns.h,v 1.4 2001/10/06 14:24:36 nneul Exp $ + * $Id: packet-tns.h,v 1.5 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-tpkt.c b/packet-tpkt.c index 991d876fa4..34396e32be 100644 --- a/packet-tpkt.c +++ b/packet-tpkt.c @@ -7,22 +7,22 @@ * Routine to dissect RFC 1006 TPKT packet containing OSI TP PDU * Copyright 2001, Martin Thomas <Martin_A_Thomas@yahoo.com> * - * $Id: packet-tpkt.c,v 1.21 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tpkt.c,v 1.22 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -57,7 +57,7 @@ static gboolean tpkt_desegment = TRUE; #define TCP_PORT_TPKT 102 /* find the dissector for OSI TP (aka COTP) */ -static dissector_handle_t osi_tp_handle; +static dissector_handle_t osi_tp_handle; /* * Check whether this could be a TPKT-encapsulated PDU. @@ -85,8 +85,8 @@ is_tpkt(tvbuff_t *tvb, int min_len) return -1; /* there aren't */ /* - * The first octet should be 3 and the second one should be 0 - * The H.323 implementers guide suggests that this might not + * The first octet should be 3 and the second one should be 0 + * The H.323 implementers guide suggests that this might not * always be the case.... */ if (!(tvb_get_guint8(tvb, 0) == 3 && tvb_get_guint8(tvb, 1) == 0)) @@ -134,7 +134,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ if (tpkt_desegment && check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, ""); - + while (tvb_reported_length_remaining(tvb, offset) != 0) { /* * Is the first byte of this putative TPKT header @@ -325,47 +325,47 @@ dissect_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_tpkt(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_tpkt_version, - { - "Version", - "tpkt.version", - FT_UINT8, - BASE_DEC, - NULL, + { + "Version", + "tpkt.version", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_tpkt_reserved, - { - "Reserved", - "tpkt.reserved", - FT_UINT8, - BASE_DEC, - NULL, + { + "Reserved", + "tpkt.reserved", + FT_UINT8, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_tpkt_length, - { - "Length", - "tpkt.length", - FT_UINT16, - BASE_DEC, - NULL, + { + "Length", + "tpkt.length", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_tpkt, }; diff --git a/packet-tpkt.h b/packet-tpkt.h index cac6a7a085..d5e1665fc7 100644 --- a/packet-tpkt.h +++ b/packet-tpkt.h @@ -5,22 +5,22 @@ * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema <andreas.sikkema@philips.com> * - * $Id: packet-tpkt.h,v 1.8 2002/05/13 21:18:25 guy Exp $ + * $Id: packet-tpkt.h,v 1.9 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-tr.c b/packet-tr.c index 7eaff89c8b..ad857e4dfd 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,22 +2,22 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-tr.c,v 1.72 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tr.c,v 1.73 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ #include <epan/packet.h> #include "packet-tr.h" #include "packet-llc.h" - + static int proto_tr = -1; static int hf_tr_dst = -1; static int hf_tr_src = -1; @@ -118,8 +118,8 @@ static dissector_handle_t data_handle; /* * DODGY LINUX HACK DODGY LINUX HACK - * Linux 2.0.x always passes frames to the Token Ring driver for transmission with - * 18 bytes padding for source routing information. Some drivers copy the first + * Linux 2.0.x always passes frames to the Token Ring driver for transmission with + * 18 bytes padding for source routing information. Some drivers copy the first * (18 - srlen) bytes up the frame (18 - srlen) bytes thus removing the padding. * Other drivers just make a copy of the entire frame and then hack about with it * so the frame the sniffer gets is fine (just has extra sr routing). @@ -130,7 +130,7 @@ static dissector_handle_t data_handle; * This only detects frames that we have sent ourselves so if we are packet sniffing * on the machine we are watching this is useful. * Compare offset 0 with offset x+1 for a length of x bytes for all value of x = 1 to 18 - * if match then Linux driver has done in situ source route compression of the crappy + * if match then Linux driver has done in situ source route compression of the crappy * Linux 2.0.x frame so the beginning of the real frame is x bytes in. * (And this real frame x bytes in looks like a proper TR frame that goes on the wire * with none of the Linux idiosyncrasies). @@ -156,7 +156,7 @@ int check_for_old_linux_tvb(tvbuff_t *tvb) return x; } } - return 0; + return 0; } static @@ -170,7 +170,7 @@ int check_for_old_linux(const guchar * pd) return x; } } - return 0; + return 0; } @@ -199,7 +199,7 @@ capture_tr(const guchar *pd, int offset, int len, packet_counts *ld) { if ((x = check_for_old_linux(pd))) { /* Actually packet starts x bytes into what we have got but with all - source routing compressed + source routing compressed */ /* pd = &pd[x]; */ offset+=x; } @@ -278,7 +278,7 @@ capture_tr(const guchar *pd, int offset, int len, packet_counts *ld) { offset += 8; /* Skip fake LLC and SNAP */ } } - + offset += actual_rif_bytes + TR_MIN_HEADER_LEN; /* The package is either MAC or LLC */ @@ -325,7 +325,7 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* non-source-routed version of source addr */ static guint8 trn_shost_nonsr[6]; int x; - + /* Token-Ring Strings */ char *fc[] = { "MAC", "LLC", "Reserved", "Unknown" }; @@ -384,8 +384,8 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( ( first2_sr == 0xaaaa && tvb_get_guint8(tr_tvb, trn_rif_bytes + 0x10) == 0x03) || - - first2_sr == 0xe0e0 || + + first2_sr == 0xe0e0 || first2_sr == 0xe0aa ) { source_routed = 1; @@ -415,11 +415,11 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (frame_type == 1 && ( (source_routed && trn_rif_bytes == 2) || !source_routed) ) { /* look for SNAP or IPX only */ - if ( + if ( (tvb_get_ntohs(tr_tvb, 0x20) == 0xaaaa && tvb_get_guint8(tr_tvb, 0x22) == 0x03) || - tvb_get_ntohs(tr_tvb, 0x20) == 0xe0e0 ) { + tvb_get_ntohs(tr_tvb, 0x20) == 0xe0e0 ) { actual_rif_bytes = 18; } @@ -575,7 +575,7 @@ add_ring_bridge_pairs(int rcf_len, tvbuff_t *tvb, proto_tree *tree) size = sprintf(buffer+buff_offset, "-%01X-%03X",brdgnmb,segment); proto_tree_add_uint_hidden(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 3 + j, 2, segment); proto_tree_add_uint_hidden(tree, hf_tr_rif_bridge, tvb, TR_MIN_HEADER_LEN + 2 + j, 1, brdgnmb); - buff_offset += size; + buff_offset += size; } proto_tree_add_string(tree, hf_tr_rif, tvb, TR_MIN_HEADER_LEN + 2, rcf_len, buffer); diff --git a/packet-tr.h b/packet-tr.h index 280db644cd..d988b46826 100644 --- a/packet-tr.h +++ b/packet-tr.h @@ -1,21 +1,21 @@ /* packet-tr.h * - * $Id: packet-tr.h,v 1.6 2002/08/02 23:36:03 jmayer Exp $ + * $Id: packet-tr.h,v 1.7 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-trmac.c b/packet-trmac.c index 1e20bef190..0d15d53edd 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,22 +2,22 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-trmac.c,v 1.37 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-trmac.c,v 1.38 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -112,7 +112,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree) guchar errors[6]; /* isolating or non-isolating */ - /* Check the SV length. + /* Check the SV length. XXX - Should we do this in each case statement below, e.g. to force an SV length of 6 for the NAUN address? */ if (sv_length < 1) { @@ -140,7 +140,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree) break; case 0x02: /* NAUN */ - proto_tree_add_ether(tree, hf_trmac_naun, tvb, svoff+1, sv_length-1, + proto_tree_add_ether(tree, hf_trmac_naun, tvb, svoff+1, sv_length-1, tvb_get_ptr(tvb, svoff+2, 6)); break; diff --git a/packet-tsp.c b/packet-tsp.c index 2f798565f7..c96def8c7a 100644 --- a/packet-tsp.c +++ b/packet-tsp.c @@ -3,24 +3,24 @@ * * Uwe Girlich <Uwe.Girlich@philosys.de> * - * $Id: packet-tsp.c,v 1.2 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-tsp.c,v 1.3 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-quake.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,19 +33,19 @@ #include <glib.h> #include <epan/packet.h> -/* +/* * For a full documentation of the Time Synchronization Protocol (TSP) see: * http://docs.freebsd.org/44doc/smm/12.timed/paper.pdf */ static int proto_tsp = -1; -static int hf_tsp_type = -1; -static int hf_tsp_vers = -1; -static int hf_tsp_seq = -1; -static int hf_tsp_hopcnt = -1; -static int hf_tsp_time_sec = -1; -static int hf_tsp_time_usec = -1; -static int hf_tsp_name = -1; +static int hf_tsp_type = -1; +static int hf_tsp_vers = -1; +static int hf_tsp_seq = -1; +static int hf_tsp_hopcnt = -1; +static int hf_tsp_time_sec = -1; +static int hf_tsp_time_usec = -1; +static int hf_tsp_name = -1; static gint ett_tsp = -1; diff --git a/packet-ucp.c b/packet-ucp.c index c373012065..2042505f73 100644 --- a/packet-ucp.c +++ b/packet-ucp.c @@ -2,7 +2,7 @@ * Routines for Universal Computer Protocol dissection * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl> * - * $Id: packet-ucp.c,v 1.18 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-ucp.c,v 1.19 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -664,7 +664,7 @@ ucp_mktime(char *datestr) r_time.tm_mday = 10 * (datestr[0] - '0') + (datestr[1] - '0'); r_time.tm_mon = (10 * (datestr[2] - '0') + (datestr[3] - '0')) - 1; r_time.tm_year = 10 * (datestr[4] - '0') + (datestr[5] - '0'); - if (r_time.tm_year < 90) + if (r_time.tm_year < 90) r_time.tm_year += 100; r_time.tm_hour = 10 * (datestr[6] - '0') + (datestr[7] - '0'); r_time.tm_min = 10 * (datestr[8] - '0') + (datestr[9] - '0'); @@ -722,7 +722,7 @@ ucp_handle_int(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) guint intval = 0; int tmpoff = *offset; int idx = 0; - + while ((strval[idx++] = tvb_get_guint8(tvb, tmpoff++)) != '/') ; if (idx > 1) { @@ -762,7 +762,7 @@ ucp_handle_data(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) while (tvb_get_guint8(tvb, tmpoff++) != '/') ; - if ((tmpoff - *offset) > 1) + if ((tmpoff - *offset) > 1) proto_tree_add_item(tree, field, tvb, *offset, tmpoff - *offset - 1, FALSE); *offset = tmpoff; @@ -1542,7 +1542,7 @@ dissect_ucp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; /* - * Try getting the operation-type and whether it's a request/response + * Try getting the operation-type and whether it's a request/response */ O_R = tvb_get_guint8(tvb, UCP_O_R_OFFSET); if (match_strval(O_R, vals_hdr_O_R) == NULL) diff --git a/packet-udp.c b/packet-udp.c index e695bddc25..bb034533bc 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,30 +1,30 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.104 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-udp.c,v 1.105 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * Richard Sharpe, 13-Feb-1999, added dispatch table support and + * Richard Sharpe, 13-Feb-1999, added dispatch table support and * support for tftp. - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -45,7 +45,7 @@ #include "packet-ip.h" #include <epan/conversation.h> -static int proto_udp = -1; +static int proto_udp = -1; static int hf_udp_srcport = -1; static int hf_udp_dstport = -1; static int hf_udp_port = -1; @@ -154,11 +154,11 @@ dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) uh_dport = g_ntohs(uh.uh_dport); uh_ulen = g_ntohs(uh.uh_ulen); uh_sum = g_ntohs(uh.uh_sum); - + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Source port: %s Destination port: %s", get_udp_port(uh_sport), get_udp_port(uh_dport)); - + if (tree) { if (udp_summary_in_tree) { ti = proto_tree_add_protocol_format(tree, proto_udp, tvb, offset, 8, @@ -288,11 +288,11 @@ proto_register_udp(void) udp_dissector_table = register_dissector_table("udp.port", "UDP port", FT_UINT16, BASE_DEC); register_heur_dissector_list("udp", &heur_subdissector_list); - + /* Register configuration preferences */ udp_module = prefs_register_protocol(proto_udp, NULL); prefs_register_bool_preference(udp_module, "udp_summary_in_tree", - "Show UDP summary in protocol tree", + "Show UDP summary in protocol tree", "Whether the UDP summary line should be shown in the protocol tree", &udp_summary_in_tree); } diff --git a/packet-udp.h b/packet-udp.h index c8192690e3..923cd2096d 100644 --- a/packet-udp.h +++ b/packet-udp.h @@ -1,22 +1,22 @@ /* packet-udp.h * - * $Id: packet-udp.h,v 1.5 2000/11/18 10:38:25 guy Exp $ + * $Id: packet-udp.h,v 1.6 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-v120.c b/packet-v120.c index 00af379193..723a0118a9 100644 --- a/packet-v120.c +++ b/packet-v120.c @@ -2,22 +2,22 @@ * Routines for v120 frame disassembly * Bert Driehuis <driehuis@playbeing.org> * - * $Id: packet-v120.c,v 1.27 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-v120.c,v 1.28 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-vines.c b/packet-vines.c index a53418522a..8655008dd4 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.42 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vines.c,v 1.43 2002/08/28 21:00:36 jmayer Exp $ * * Don Lafontaine <lafont02@cn.ca> * @@ -9,17 +9,17 @@ * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * Joerg Mayer <jmayer@loplof.de> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -96,7 +96,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vines_frp_tree = proto_item_add_subtree(ti, ett_vines_frp); vines_frp_ctrl = tvb_get_guint8(tvb, 0); - + /* * 1: first fragment of vines packet * 2: last fragment of vines packet @@ -124,12 +124,12 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) strcpy(frp_flags_str, "please report: unknown"); break; } - - proto_tree_add_text(vines_frp_tree, tvb, 0, 1, - "Control Flags: 0x%02x = %s fragment", + + proto_tree_add_text(vines_frp_tree, tvb, 0, 1, + "Control Flags: 0x%02x = %s fragment", vines_frp_ctrl, frp_flags_str); - proto_tree_add_text(vines_frp_tree, tvb, 1, 1, + proto_tree_add_text(vines_frp_tree, tvb, 1, 1, "Sequence Number: 0x%02x", tvb_get_guint8(tvb, 1)); } @@ -204,7 +204,7 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "IPC (%02x)", viph.vip_proto); break; - case VIP_PROTO_SPP: + case VIP_PROTO_SPP: if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SPP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -232,7 +232,7 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IP"); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown VIP protocol (%02x)", + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown VIP protocol (%02x)", viph.vip_proto); } @@ -248,8 +248,8 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((viph.vip_dnet == 0xffffffff) && (viph.vip_dsub == 0xffff)) { is_broadcast = 1; } - hops = viph.vip_tctl & 0xf; - + hops = viph.vip_tctl & 0xf; + /* viph.ip_tos = IPTOS_TOS(viph.ip_tos); switch (viph.ip_tos) { @@ -275,28 +275,28 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_vines, tvb, + ti = proto_tree_add_protocol_format(tree, proto_vines, tvb, offset, (viph.vip_pktlen), "Vines IP"); vip_tree = proto_item_add_subtree(ti, ett_vines); - proto_tree_add_text(vip_tree, tvb, offset, 2, - "Packet checksum: 0x%04x", + proto_tree_add_text(vip_tree, tvb, offset, 2, + "Packet checksum: 0x%04x", viph.vip_chksum); - proto_tree_add_text(vip_tree, tvb, offset + 2, 2, - "Packet length: 0x%04x (%d)", - viph.vip_pktlen, viph.vip_pktlen); - proto_tree_add_text(vip_tree, tvb, offset + 4, 1, + proto_tree_add_text(vip_tree, tvb, offset + 2, 2, + "Packet length: 0x%04x (%d)", + viph.vip_pktlen, viph.vip_pktlen); + proto_tree_add_text(vip_tree, tvb, offset + 4, 1, "Transport control: 0x%02x", viph.vip_tctl); - proto_tree_add_uint(vip_tree, hf_vines_protocol, tvb, - offset + 5, 1, + proto_tree_add_uint(vip_tree, hf_vines_protocol, tvb, + offset + 5, 1, viph.vip_proto); - proto_tree_add_text(vip_tree, tvb, offset + 6, - VINES_ADDR_LEN, + proto_tree_add_text(vip_tree, tvb, offset + 6, + VINES_ADDR_LEN, "Destination: %s", vines_addr_to_str(dst_addr)); - proto_tree_add_text(vip_tree, tvb, offset + 12, - VINES_ADDR_LEN, + proto_tree_add_text(vip_tree, tvb, offset + 12, + VINES_ADDR_LEN, "Source: %s", vines_addr_to_str(src_addr)); @@ -367,15 +367,15 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) viph.vspp_rmtid = g_ntohs(viph.vspp_rmtid); switch (viph.vspp_pkttype) { - case VSPP_PKTTYPE_DATA: + case VSPP_PKTTYPE_DATA: if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP Data"); break; - case VSPP_PKTTYPE_DISC: + case VSPP_PKTTYPE_DISC: if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP Disconnect"); break; - case VSPP_PKTTYPE_PROBE: + case VSPP_PKTTYPE_PROBE: if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP Probe"); break; @@ -389,9 +389,9 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, - "NS=%04x NR=%04x Window=%04x RID=%04x LID=%04x D=%04x S=%04x", - viph.vspp_seqno, viph.vspp_ack, viph.vspp_win, + col_add_fstr(pinfo->cinfo, COL_INFO, + "NS=%04x NR=%04x Window=%04x RID=%04x LID=%04x D=%04x S=%04x", + viph.vspp_seqno, viph.vspp_ack, viph.vspp_win, viph.vspp_rmtid, viph.vspp_lclid, viph.vspp_dport, viph.vspp_sport); @@ -417,29 +417,29 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) strcpy(tos_str, "Unknon. Malformed?"); break; } - */ + */ if (tree) { ti = proto_tree_add_item(tree, proto_vines_spp, tvb, offset, sizeof(viph), FALSE); vspp_tree = proto_item_add_subtree(ti, ett_vines_spp); - proto_tree_add_text(vspp_tree, tvb, offset, 2, + proto_tree_add_text(vspp_tree, tvb, offset, 2, "Source port: 0x%04x", viph.vspp_sport); - proto_tree_add_text(vspp_tree, tvb, offset + 2, 2, + proto_tree_add_text(vspp_tree, tvb, offset + 2, 2, "Destination port: 0x%04x", - viph.vspp_dport); - proto_tree_add_text(vspp_tree, tvb, offset + 4, 1, + viph.vspp_dport); + proto_tree_add_text(vspp_tree, tvb, offset + 4, 1, "Packet type: 0x%02x", viph.vspp_pkttype); - proto_tree_add_text(vspp_tree, tvb, offset + 5, 1, + proto_tree_add_text(vspp_tree, tvb, offset + 5, 1, "Control: 0x%02x", viph.vspp_control); - proto_tree_add_text(vspp_tree, tvb, offset + 6, 2, + proto_tree_add_text(vspp_tree, tvb, offset + 6, 2, "Local Connection ID: 0x%04x", viph.vspp_lclid); proto_tree_add_text(vspp_tree, tvb, offset + 8, 2, - "Remote Connection ID: 0x%04x", + "Remote Connection ID: 0x%04x", viph.vspp_rmtid); proto_tree_add_text(vspp_tree, tvb, offset + 10, 2, - "Sequence number: 0x%04x", + "Sequence number: 0x%04x", viph.vspp_seqno); proto_tree_add_text(vspp_tree, tvb, offset + 12, 2, "Ack number: 0x%04x", viph.vspp_ack); diff --git a/packet-vines.h b/packet-vines.h index bb5a486ead..c65beb9fc2 100644 --- a/packet-vines.h +++ b/packet-vines.h @@ -1,7 +1,7 @@ /* packet-vines.h * Definitions for packet disassembly structures and routines * - * $Id: packet-vines.h,v 1.12 2002/04/24 06:03:34 guy Exp $ + * $Id: packet-vines.h,v 1.13 2002/08/28 21:00:36 jmayer Exp $ * * Don Lafontaine <lafont02@cn.ca> * @@ -9,17 +9,17 @@ * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * Joerg Mayer <jmayer@loplof.de> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -94,10 +94,10 @@ typedef struct _e_vsmb { guint16 vsmb_d4; guint32 vsmb_d5; guint32 vsmb_d6; - guint16 vsmb_treeid; + guint16 vsmb_treeid; guint16 vsmb_pid; guint16 vsmb_uid; - guint16 vsmb_mid; + guint16 vsmb_mid; guint8 vsmb_wcnt; guint16 vsmb_pbytes; guint16 vsmb_dbytes; diff --git a/packet-vj.c b/packet-vj.c index cb598b02dd..aa540ff3af 100644 --- a/packet-vj.c +++ b/packet-vj.c @@ -1,7 +1,7 @@ /* packet-vj.c - * Routines for Van Jacobson header decompression. + * Routines for Van Jacobson header decompression. * - * $Id: packet-vj.c,v 1.15 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vj.c,v 1.16 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -9,7 +9,7 @@ * This file created by Irfan Khan <ikhan@qualcomm.com> * Copyright (c) 2001 by QUALCOMM, Incorporated. * All Rights reserved. - * + * * Routines to compress and uncompress TCP packets (for transmission * over low speed serial lines). * @@ -55,7 +55,7 @@ * Use ip_fast_csum from ip.h * - July 1995 Christos A. Polyzols * Spotted bug in tcp option checking - * - Sep 2001 Irfan Khan + * - Sep 2001 Irfan Khan * Rewrite to make the code work for ethereal. */ @@ -111,7 +111,7 @@ /* VJ Mem Chunk defines */ #define VJ_DATA_SIZE 128 /* Max IP hdr(64)+Max TCP hdr(64) */ -#define VJ_ATOM_COUNT 250 /* Number of Atoms per block */ +#define VJ_ATOM_COUNT 250 /* Number of Atoms per block */ /* IP and TCP header types */ typedef struct { @@ -143,7 +143,7 @@ typedef struct { /* State per active tcp conversation */ typedef struct cstate { - iphdr_type cs_ip; + iphdr_type cs_ip; tcphdr_type cs_tcp; guint8 cs_ipopt[IP_MAX_OPT_LEN]; guint8 cs_tcpopt[TCP_MAX_OPT_LEN]; @@ -186,14 +186,14 @@ static dissector_handle_t data_handle; /* State repository (Full Duplex) */ #define RX_TX_STATE_COUNT 2 static slcompress *rx_tx_state[RX_TX_STATE_COUNT] = {NULL, NULL}; - + /* Mem Chunks for storing decompressed headers */ static GMemChunk *vj_header_memchunk = NULL; typedef struct { int offset; /* uppermost bit is "can't dissect" flag */ guint8 data[VJ_DATA_SIZE]; } vj_header_t; - + /* Function prototypes */ static int get_unsigned_delta(tvbuff_t *tvb, int *offsetp, int hf, proto_tree *tree); @@ -374,7 +374,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) } } - /* + /* * Set up tvbuff containing packet with protocol type. * Neither header checksum is recalculated. * @@ -494,7 +494,7 @@ proto_register_vj(void) { "IP ID delta", "vj.ip_id_delta", FT_UINT16, BASE_DEC, NULL, 0x0, "Delta for IP ID", HFILL }}, }; - static gint *ett[] = { + static gint *ett[] = { &ett_vj, &ett_vj_changes, }; @@ -522,7 +522,7 @@ proto_reg_handoff_vj(void) } /* Initialization function */ -static void +static void vj_init(void) { gint i = ZERO; @@ -530,7 +530,7 @@ vj_init(void) if(vj_header_memchunk != NULL) g_mem_chunk_destroy(vj_header_memchunk); - vj_header_memchunk = g_mem_chunk_new("vj header store", sizeof (vj_header_t), + vj_header_memchunk = g_mem_chunk_new("vj header store", sizeof (vj_header_t), sizeof (vj_header_t) * VJ_ATOM_COUNT, G_ALLOC_ONLY); for(i = 0; i < RX_TX_STATE_COUNT; i++) { @@ -559,12 +559,12 @@ slhc_init(void) for (i = 0; i < TCP_SIMUL_CONV_MAX; i++) comp->rstate[i].flags |= SLF_TOSS; return comp; -} +} /* Setup the decompressed packet tvb for VJ compressed packets */ -static gint -vjc_tvb_setup(tvbuff_t *src_tvb, - tvbuff_t **dst_tvb, +static gint +vjc_tvb_setup(tvbuff_t *src_tvb, + tvbuff_t **dst_tvb, packet_info *pinfo) { vj_header_t *hdr_buf; @@ -606,7 +606,7 @@ vjc_tvb_setup(tvbuff_t *src_tvb, tvb_set_child_real_data_tvbuff(src_tvb, *dst_tvb); add_new_data_source(pinfo, *dst_tvb, "VJ Decompressed"); return VJ_OK; -} +} /* * For VJ compressed packet: @@ -615,7 +615,7 @@ vjc_tvb_setup(tvbuff_t *src_tvb, * dissect the relevant fields; * update the decompressor state on the first pass. */ -static gint +static gint vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, slcompress *comp) { @@ -707,7 +707,7 @@ vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, offset++; if(comp != NULL) comp->recv_current = conn_index; - } + } if(!pinfo->fd->flags.visited) { /* @@ -838,7 +838,7 @@ vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, } return VJ_OK; -} +} /* * Get an unsigned delta for a field, and put it into the protocol tree if @@ -889,7 +889,7 @@ get_signed_delta(tvbuff_t *tvb, int *offsetp, int hf, proto_tree *tree) } /* Wrapper for in_cksum function */ -static guint16 +static guint16 ip_csum(const guint8 * ptr, guint32 len) { vec_t cksum_vec[1]; diff --git a/packet-vlan.c b/packet-vlan.c index 992bd27bd9..433cde5659 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,22 +1,22 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.40 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vlan.c,v 1.41 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,7 +49,7 @@ capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld ) { guint16 encap_proto; if ( !BYTES_ARE_IN_FRAME(offset,len,5) ) { ld->other++; - return; + return; } encap_proto = pntohs( &pd[offset+2] ); if ( encap_proto <= IEEE_802_3_MAX_LEN) { @@ -127,17 +127,17 @@ void proto_register_vlan(void) { static hf_register_info hf[] = { - { &hf_vlan_priority, { - "Priority", "vlan.priority", FT_UINT16, BASE_BIN, + { &hf_vlan_priority, { + "Priority", "vlan.priority", FT_UINT16, BASE_BIN, 0, 0xE000, "Priority", HFILL }}, - { &hf_vlan_cfi, { - "CFI", "vlan.cfi", FT_UINT16, BASE_BIN, + { &hf_vlan_cfi, { + "CFI", "vlan.cfi", FT_UINT16, BASE_BIN, 0, 0x1000, "CFI", HFILL }}, /* XXX - Boolean? */ - { &hf_vlan_id, { - "ID", "vlan.id", FT_UINT16, BASE_BIN, + { &hf_vlan_id, { + "ID", "vlan.id", FT_UINT16, BASE_BIN, 0, 0x0FFF, "ID", HFILL }}, - { &hf_vlan_etype, { - "Type", "vlan.etype", FT_UINT16, BASE_HEX, + { &hf_vlan_etype, { + "Type", "vlan.etype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, "Type", HFILL }}, { &hf_vlan_len, { "Length", "vlan.len", FT_UINT16, BASE_DEC, diff --git a/packet-vlan.h b/packet-vlan.h index df41bb6ae7..ea74dcb770 100644 --- a/packet-vlan.h +++ b/packet-vlan.h @@ -1,21 +1,21 @@ /* packet-vlan.h * - * $Id: packet-vlan.h,v 1.5 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vlan.h,v 1.6 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-vrrp.c b/packet-vrrp.c index 1b500dca04..5e4ee49413 100644 --- a/packet-vrrp.c +++ b/packet-vrrp.c @@ -4,22 +4,22 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-vrrp.c,v 1.24 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vrrp.c,v 1.25 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -95,7 +95,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VRRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - + ver_type = tvb_get_guint8(tvb, 0); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s (v%u)", @@ -123,7 +123,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(ver_type_tree, hf_vrrp_type, tvb, offset, 1, ver_type); offset++; - + proto_tree_add_item(vrrp_tree, hf_vrrp_virt_rtr_id, tvb, offset, 1, FALSE); offset++; diff --git a/packet-vtp.c b/packet-vtp.c index 45e8811595..42ca6ea1e6 100644 --- a/packet-vtp.c +++ b/packet-vtp.c @@ -1,27 +1,27 @@ /* packet-vtp.c * Routines for the disassembly of Cisco's Virtual Trunking Protocol * - * $Id: packet-vtp.c,v 1.20 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-vtp.c,v 1.21 2002/08/28 21:00:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include "config.h" #include <stdlib.h> @@ -85,11 +85,11 @@ static const value_string type_vals[] = { { ADVERT_REQUEST, "Advert-Request" }, { 0, NULL }, }; - -static void + +static void dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *ti; + proto_item *ti; proto_tree *vtp_tree = NULL; int offset = 0; guint8 code; @@ -100,7 +100,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "VTP"); if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Virtual Trunking Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Virtual Trunking Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_vtp, tvb, offset, -1, @@ -115,7 +115,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(vtp_tree, hf_vtp_code, tvb, offset, 1, code); offset += 1; - + switch (code) { case SUMMARY_ADVERT: @@ -171,7 +171,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; while (tvb_reported_length_remaining(tvb, offset) > 0) { - vlan_info_len = + vlan_info_len = dissect_vlan_info(tvb, offset, vtp_tree); if (vlan_info_len < 0) break; @@ -257,7 +257,7 @@ static const value_string vlan_tlv_type_vals[] = { static int dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_item *ti; + proto_item *ti; proto_tree *vlan_info_tree; proto_tree *status_tree; guint8 vlan_info_len; diff --git a/packet-wap.c b/packet-wap.c index 76b524d5d4..79ffdbea71 100644 --- a/packet-wap.c +++ b/packet-wap.c @@ -2,8 +2,8 @@ * * Utility routines for WAP dissectors * - * $Id: packet-wap.c,v 1.6 2002/08/02 23:36:04 jmayer Exp $ - * + * $Id: packet-wap.c,v 1.7 2002/08/28 21:00:37 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs @@ -16,12 +16,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,7 +35,7 @@ #include <epan/packet.h> #include "packet-wap.h" -/* +/* * Accessor to retrieve variable length int as used in WAP protocol. * The value is encoded in the lower 7 bits. If the top bit is set, then the * value continues into the next byte. @@ -49,7 +49,7 @@ tvb_get_guintvar (tvbuff_t *tvb, guint offset, guint *octetCount) guint octet; guint counter = 0; char cont = 1; - + if (octetCount != NULL) { #ifdef DEBUG diff --git a/packet-wap.h b/packet-wap.h index 57ef6a7dbe..0b5cf2e5e7 100644 --- a/packet-wap.h +++ b/packet-wap.h @@ -2,7 +2,7 @@ * * Declarations for WAP packet disassembly * - * $Id: packet-wap.h,v 1.7 2002/01/21 07:36:44 guy Exp $ + * $Id: packet-wap.h,v 1.8 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,17 +11,17 @@ * WAP dissector based on original work by Ben Fowler * Updated by Neil Hunter <neil.hunter@energis-squared.com> * WTLS support by Alexandre P. Ferreira (Splice IP) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -94,7 +94,7 @@ extern const value_string vals_character_sets[]; * Check CONNECT/CONNECT REPLY headers * Check add_headers code * Check Content-Length code - * + * */ #endif /* packet-wap.h */ diff --git a/packet-wccp.c b/packet-wccp.c index bed94a3f22..4250c0fee4 100644 --- a/packet-wccp.c +++ b/packet-wccp.c @@ -2,22 +2,22 @@ * Routines for Web Cache Coordination Protocol dissection * Jerry Talkington <jerryt@netapp.com> * - * $Id: packet-wccp.c,v 1.32 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-wccp.c,v 1.33 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,7 +42,7 @@ static int hf_wccp_message_type = -1; /* the message type */ static int hf_wccp_version = -1; /* protocol version */ static int hf_hash_revision = -1; /* the version of the hash */ static int hf_change_num = -1; /* change number */ -static int hf_recvd_id = -1; +static int hf_recvd_id = -1; static int hf_cache_ip = -1; static gint ett_wccp = -1; @@ -187,7 +187,7 @@ static void dissect_32_bit_capability_flags(tvbuff_t *tvb, int curr_offset, guint16 capability_val_len, gint ett, const capability_flag *flags, proto_tree *element_tree); -static void +static void dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0; @@ -597,7 +597,7 @@ dissect_wccp2_service_info(tvbuff_t *tvb, int offset, int length, "Service Type: Well-known service"); proto_tree_add_text(info_tree, tvb, offset+1, 1, "Service ID: %s", - val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals, + val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals, "Unknown (0x%02X)")); break; @@ -607,7 +607,7 @@ dissect_wccp2_service_info(tvbuff_t *tvb, int offset, int length, "Service Type: Dynamic service"); proto_tree_add_text(info_tree, tvb, offset+1, 1, "Service ID: %s", - val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals, + val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals, "Unknown (0x%02X)")); proto_tree_add_text(info_tree, tvb, offset+2, 1, "Priority: %u", tvb_get_guint8(tvb, offset+2)); @@ -951,7 +951,7 @@ dissect_wccp2_wc_view_info(tvbuff_t *tvb, int offset, int length, ip_to_str(tvb_get_ptr(tvb, offset, 4))); offset += 4; } - + return TRUE; } @@ -1104,7 +1104,7 @@ static const capability_flag forwarding_method_flags[] = { "IP-GRE", "GRE-encapsulated" }, { WCCP2_FORWARDING_METHOD_L2, "L2", "L2 rewrite" }, - { 0, + { 0, NULL, NULL } }; @@ -1125,7 +1125,7 @@ static const capability_flag packet_return_method_flags[] = { "IP-GRE", "GRE-encapsulated" }, { WCCP2_PACKET_RETURN_METHOD_L2, "L2", "L2 rewrite" }, - { 0, + { 0, NULL, NULL } }; @@ -1260,7 +1260,7 @@ proto_register_wccp(void) { "WCCP Message Type", "wccp.message", FT_UINT32, BASE_DEC, VALS(wccp_type_vals), 0x0, "The WCCP message that was sent", HFILL } }, - { &hf_wccp_version, + { &hf_wccp_version, { "WCCP Version", "wccp.version", FT_UINT32, BASE_HEX, VALS(wccp_version_val), 0x0, "The WCCP version", HFILL } }, diff --git a/packet-wccp.h b/packet-wccp.h index bc7ed2ab05..4d0714db2a 100644 --- a/packet-wccp.h +++ b/packet-wccp.h @@ -1,28 +1,28 @@ /* packet-wccp.h * Declarations for Cisco Web Cache Coordination Protocol * - * $Id: packet-wccp.h,v 1.3 2000/11/29 06:17:34 guy Exp $ + * $Id: packet-wccp.h,v 1.4 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs - * - * + * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + /* * Maps service ID values to service names. */ diff --git a/packet-wcp.c b/packet-wcp.c index 8527b2b293..ad077f4f9c 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,22 +2,22 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.27 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-wcp.c,v 1.28 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -40,14 +40,14 @@ /* * Wellfleet compression is a variation on LZSS encoding. * - * Compression is done by keeping a sliding window of previous - * data transmited. The sender will use a pattern match to + * Compression is done by keeping a sliding window of previous + * data transmited. The sender will use a pattern match to * encode repeated data as a data pointer field. Then a stream * of pointers and actual data bytes. The pointer values include * an offset to previous data in the stream and the length of the * matching data. * - * The data pattern matching is done on the octects. + * The data pattern matching is done on the octects. * * The data is encoded as 8 field blocks with a compression flag * byte at the beginning. If the bit is set in the compression @@ -57,7 +57,7 @@ * The compression field is either 2 or 3 bytes long. The length * is determined by the length of the matching data, for short * matches the match length is encoded in the high nibble of the - * first byte. Otherwise the third byte of the field contains + * first byte. Otherwise the third byte of the field contains * the match length. * * First byte - @@ -65,13 +65,13 @@ * High order nibble of the offset * * upper 4 bits: - * 1 = length is in 3rd byte + * 1 = length is in 3rd byte * 2-F = length of matching data - 1 - * - * Second byte - + * + * Second byte - * Lower byte of the source offset. * - * Third byte - + * Third byte - * Length of match - 1 if First byte upper nibble = 1, otherwise * this byte isn't added to data stream. * @@ -83,7 +83,7 @@ * Flag bits: 0x20 (third field is compressed) * Data: 11 22 20 00 33 44 55 * / / / / - * raw data ------+--+ / / + * raw data ------+--+ / / * (Comp length - 1)<<4+ / * Data offset ----------+ * @@ -275,18 +275,18 @@ dissect_wcp_reset( tvbuff_t *tvb, int offset, proto_tree *tree){ static void wcp_save_data( tvbuff_t *tvb, packet_info *pinfo){ wcp_window_t *buf_ptr = 0; - int len; + int len; /* discard first 2 bytes, header and last byte (check byte) */ len = tvb_reported_length( tvb)-3; - buf_ptr = get_wcp_window_ptr( pinfo); + buf_ptr = get_wcp_window_ptr( pinfo); if (( buf_ptr->buf_cur + len) <= (buf_ptr->buffer + MAX_WIN_BUF_LEN)){ tvb_memcpy( tvb, buf_ptr->buf_cur, 2, len); buf_ptr->buf_cur = buf_ptr->buf_cur + len; - + } else { - guint8 *buf_end = buf_ptr->buffer + MAX_WIN_BUF_LEN; + guint8 *buf_end = buf_ptr->buffer + MAX_WIN_BUF_LEN; tvb_memcpy( tvb, buf_ptr->buf_cur, 2, buf_end - buf_ptr->buf_cur); tvb_memcpy( tvb, buf_ptr->buffer, buf_end - buf_ptr->buf_cur-2, len - (int)(buf_end - buf_ptr->buf_cur)); @@ -309,14 +309,14 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - temp =tvb_get_ntohs(tvb, 0); + temp =tvb_get_ntohs(tvb, 0); cmd = (temp & 0xf000) >> 12; ext_cmd = (temp & 0x0f00) >> 8; if ( cmd == 0xf) wcp_header_len= 1; - else + else wcp_header_len= 2; seq = temp & 0x0fff; @@ -328,7 +328,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ( cmd == 0xf) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(ext_cmd, ext_cmd_string, "Unknown")); - } + } if (tree) { ti = proto_tree_add_item(tree, proto_wcp, tvb, 0, wcp_header_len, FALSE); @@ -358,7 +358,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: break; } - }else { + }else { proto_tree_add_uint(wcp_tree, hf_wcp_seq, tvb, 0, 2, seq); } } @@ -368,7 +368,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* exit if done */ - if ( cmd != 1 && cmd != 0 && !(cmd == 0xf && ext_cmd == 0)) + if ( cmd != 1 && cmd != 0 && !(cmd == 0xf && ext_cmd == 0)) return; if ( cmd == 1) { /* uncompressed data */ @@ -416,9 +416,9 @@ static guint8 *decompressed_entry( guint8 *src, guint8 *dst, int *len, guint8 * }else { /* one byte count */ data_cnt = tmp >> 4; data_cnt++; - } + } + - src = (dst - 1 - data_offset); if ( src < buf_start) src += MAX_WIN_BUF_LEN; @@ -443,7 +443,7 @@ static guint8 *decompressed_entry( guint8 *src, guint8 *dst, int *len, guint8 * } -static +static wcp_window_t *get_wcp_window_ptr( packet_info *pinfo){ /* find the conversation for this side of the DLCI, create one if needed */ @@ -452,12 +452,12 @@ wcp_window_t *get_wcp_window_ptr( packet_info *pinfo){ conversation_t *conv; wcp_window_t *wcp_win_data; - conv = find_conversation( &pinfo->dl_src, &pinfo->dl_src, PT_NONE, - ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), + conv = find_conversation( &pinfo->dl_src, &pinfo->dl_src, PT_NONE, + ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), 0); if ( !conv){ - conv = conversation_new( &pinfo->dl_src, &pinfo->dl_src, PT_NONE, - ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), + conv = conversation_new( &pinfo->dl_src, &pinfo->dl_src, PT_NONE, + ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), ((pinfo->pseudo_header->x25.flags & FROM_DCE)? 1:0), 0); } @@ -488,7 +488,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin wcp_window_t *buf_ptr = 0; wcp_pdata_t *volatile pdata_ptr; - buf_ptr = get_wcp_window_ptr( pinfo); + buf_ptr = get_wcp_window_ptr( pinfo); buf_start = buf_ptr->buffer; buf_end = buf_start + MAX_WIN_BUF_LEN; @@ -562,7 +562,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin if (tree) proto_tree_add_uint( tree, hf_wcp_comp_bits, src_tvb, offset-1, 1, comp_flag_bits); - + i = 8; } } @@ -573,7 +573,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin if ( !pdata_ptr) /* exit if no data */ return NULL; - len = pdata_ptr->len; + len = pdata_ptr->len; } else { /* save the new data as per packet data */ @@ -581,7 +581,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin memcpy( &pdata_ptr->buffer, buf_ptr->buf_cur, len); pdata_ptr->len = len; - p_add_proto_data( pinfo->fd, proto_wcp, (void*)pdata_ptr); + p_add_proto_data( pinfo->fd, proto_wcp, (void*)pdata_ptr); buf_ptr->buf_cur = dst; } @@ -600,7 +600,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin g_free(buf); return NULL; } - ENDTRY; + ENDTRY; /* link new tvbuff into tvbuff chain so cleanup is done later */ tvb_set_child_real_data_tvbuff( src_tvb, tvb); @@ -639,13 +639,13 @@ proto_register_wcp(void) { static hf_register_info hf[] = { { &hf_wcp_cmd, - { "Command", "wcp.cmd", FT_UINT8, BASE_HEX, VALS(cmd_string), WCP_CMD, + { "Command", "wcp.cmd", FT_UINT8, BASE_HEX, VALS(cmd_string), WCP_CMD, "Compression Command", HFILL }}, { &hf_wcp_ext_cmd, - { "Extended Command", "wcp.ext_cmd", FT_UINT8, BASE_HEX, VALS(ext_cmd_string), WCP_EXT_CMD, + { "Extended Command", "wcp.ext_cmd", FT_UINT8, BASE_HEX, VALS(ext_cmd_string), WCP_EXT_CMD, "Extended Compression Command", HFILL }}, { &hf_wcp_seq, - { "SEQ", "wcp.seq", FT_UINT16, BASE_HEX, NULL, WCP_SEQ, + { "SEQ", "wcp.seq", FT_UINT16, BASE_HEX, NULL, WCP_SEQ, "Sequence Number", HFILL }}, { &hf_wcp_chksum, { "Checksum", "wcp.checksum", FT_UINT8, BASE_DEC, NULL, 0, diff --git a/packet-who.c b/packet-who.c index 66d76b7398..628fbc7c45 100644 --- a/packet-who.c +++ b/packet-who.c @@ -2,22 +2,22 @@ * Routines for who protocol (see man rwhod) * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-who.c,v 1.24 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-who.c,v 1.25 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,9 +41,9 @@ RWHOD(8) UNIX System Manager's Manual RWHOD(8) The messages sent and received, are of the form: struct outmp { -0 char out_line[8]; tty name -8 char out_name[8]; user id -16 long out_time; time on +0 char out_line[8]; tty name +8 char out_name[8]; user id +16 long out_time; time on }; struct whod { @@ -188,8 +188,8 @@ dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree *whoent_tree = NULL; proto_item *whoent_ti = NULL; int line_offset = offset; - gchar out_line[9]; - gchar out_name[9]; + gchar out_line[9]; + gchar out_name[9]; nstime_t ts; int whoent_num = 0; guint32 idle_secs; /* say that out loud... */ diff --git a/packet-wsp.c b/packet-wsp.c index 68290f787c..9f4e76010e 100644 --- a/packet-wsp.c +++ b/packet-wsp.c @@ -1,8 +1,8 @@ /* packet-wsp.c * * Routines to dissect WSP component of WAP traffic. - * - * $Id: packet-wsp.c,v 1.61 2002/08/07 08:34:55 guy Exp $ + * + * $Id: packet-wsp.c,v 1.62 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -17,12 +17,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -435,7 +435,7 @@ static const value_string vals_openwave_field_names[] = { { FN_OPENWAVE_PROXY_BOOKMARK, "x-up-proxy-bookmark" }, { FN_OPENWAVE_DEVCAP_GUI, "x-up-devcap-gui" }, { 0, NULL } -}; +}; static const value_string vals_field_names[] = { @@ -512,7 +512,7 @@ static const value_string vals_field_names[] = { { FN_X_WAP_SECURITY, "X-WAP-Security" }, { FN_CACHE_CONTROL14, "Cache-Control (encoding 1.4)" }, { 0, NULL } -}; +}; /* * Bearer types (from the WDP specification). @@ -862,7 +862,7 @@ static const value_string vals_transfer_encoding[] = { #define PORT_NUMBER_INCLUDED 0x40 #define ADDRESS_LEN 0x3f -static const true_false_string yes_no_truth = { +static const true_false_string yes_no_truth = { "Yes" , "No" }; @@ -1174,11 +1174,11 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; proto_tree *wsp_tree = NULL; /* proto_tree *wsp_header_fixed; */ - + /* 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. */ - + /* Connection-less mode has a TID first */ if (is_connectionless) { @@ -1219,7 +1219,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item( wsp_tree, /* tree */ hf_wsp_header_pdu_type, /* id */ - tvb, + tvb, offset, /* start of high light */ 1, /* length of high light */ bo_little_endian /* value */ @@ -1627,7 +1627,7 @@ add_well_known_header (proto_tree *tree, tvbuff_t *tvb, int offset, * Get the value type and length (or, if the type is VALUE_IN_LEN, * meaning the value is a Short-integer, get the value type * and the value itself). - */ + */ valueType = get_value_type_len (tvb, offset, &valueLen, &valueStart, &offset); headerLen = offset - headerStart; @@ -1711,7 +1711,7 @@ add_well_known_header (proto_tree *tree, tvbuff_t *tvb, int offset, add_cache_control_header (tree, header_buff, headerLen, value_buff, valueType, valueLen); break; - + case FN_CONNECTION: /* Connection */ add_connection_header (tree, header_buff, headerLen, value_buff, valueType, valueLen); @@ -1723,7 +1723,7 @@ add_well_known_header (proto_tree *tree, tvbuff_t *tvb, int offset, hf_wsp_header_content_length, headerType); break; - + case FN_DATE: /* Date */ add_date_value_header (tree, header_buff, headerLen, value_buff, valueType, valueLen, @@ -1747,7 +1747,7 @@ add_well_known_header (proto_tree *tree, tvbuff_t *tvb, int offset, value_buff, valueType, valueLen, hf_wsp_header_if_modified_since, headerType); break; - + case FN_LOCATION: /* Location */ add_string_value_header (tree, header_buff, headerLen, value_buff, valueType, valueLen, @@ -1759,12 +1759,12 @@ add_well_known_header (proto_tree *tree, tvbuff_t *tvb, int offset, value_buff, valueType, valueLen, hf_wsp_header_last_modified, headerType); break; - + case FN_PRAGMA: /* Pragma */ add_pragma_header (tree, header_buff, headerLen, value_buff, valueType, valueLen); break; - + case FN_SERVER: /* Server */ add_string_value_header (tree, header_buff, headerLen, value_buff, valueType, valueLen, @@ -1857,7 +1857,7 @@ add_well_known_openwave_header (proto_tree *tree, tvbuff_t *tvb, int offset, * Get the value type and length (or, if the type is VALUE_IN_LEN, * meaning the value is a Short-integer, get the value type * and the value itself). - */ + */ valueType = get_value_type_len (tvb, offset, &valueLen, &valueStart, &offset); headerLen = offset - headerStart; @@ -2092,7 +2092,7 @@ add_openwave_push_address_header (proto_tree *tree, tvbuff_t *header_buff, { ??? - + } ********* */ @@ -2120,7 +2120,7 @@ add_unknown_header (proto_tree *tree, tvbuff_t *tvb, int offset, * Get the value type and length (or, if the type is VALUE_IN_LEN, * meaning the value is a Short-integer, get the value type * and the value itself). - */ + */ valueType = get_value_type_len (tvb, valueStart, &valueLen, &valueOffset, &offset); headerLen = offset - headerStart; @@ -2264,7 +2264,7 @@ add_accept_xxx_header (proto_tree *tree, tvbuff_t *header_buff, * Accept-{charset,language}-general-form; Value-length, followed * by Well-known-{charset,language} or {Token-text,Text-string}, * possibly followed by a Q-value. - * + * * Get Value-length. */ valueType = get_value_type_len (value_buff, 0, &subvalueLen, @@ -2463,7 +2463,7 @@ add_cache_control_header (proto_tree *tree, tvbuff_t *header_buff, "Invalid Cache-Control %s Delta-second-value", match_strval (value, vals_cache_control)); } - else + else { proto_tree_add_uint_format (tree, hf_wsp_header_cache_control, @@ -2505,7 +2505,7 @@ add_cache_control_field_name (proto_tree *tree, tvbuff_t *value_buff, /* * Token-text. */ - proto_tree_add_item (tree, + proto_tree_add_item (tree, hf_wsp_header_cache_control_field_name_str, value_buff, startOffset, offset - startOffset, bo_little_endian); @@ -2529,7 +2529,7 @@ add_cache_control_field_name (proto_tree *tree, tvbuff_t *value_buff, value_buff, startOffset, offset - startOffset, "Invalid Cache-Control %s Field-name", match_strval (cache_control_value, vals_cache_control)); - } + } return offset; } @@ -2622,7 +2622,7 @@ add_pragma_header (proto_tree *tree, tvbuff_t *header_buff, /* * Value-length, followed by Parameter. - * + * * Get Value-length. */ valueType = get_value_type_len (value_buff, 0, &subvalueLen, @@ -2709,7 +2709,7 @@ add_warning_header (proto_tree *tree, tvbuff_t *header_buff, ti = proto_tree_add_item (tree, hf_wsp_header_warning, header_buff, 0, headerLen, bo_little_endian); warning_tree = proto_item_add_subtree(ti, ett_header_warning); - + if (valueType == VALUE_IN_LEN) { /* @@ -2941,7 +2941,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type) value = get_uintvar (tvb, offset, length+capabilitiesStart+1); proto_tree_add_uint (wsp_capabilities, hf_wsp_capabilities_server_SDU, tvb, capabilitiesStart, length+1, value); break; - case 0x02 : /* Protocol Options */ + case 0x02 : /* Protocol Options */ value = get_uintvar (tvb, offset, length+capabilitiesStart+1); i = 0; valString[0]=0; @@ -3012,16 +3012,16 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type) add_string: proto_tree_add_string(wsp_capabilities, hf_wsp_capabilities_protocol_opt, tvb, capabilitiesStart, length+1, valString); break; - case 0x03 : /* Method-MOR */ + case 0x03 : /* Method-MOR */ value = tvb_get_guint8(tvb, offset); proto_tree_add_uint (wsp_capabilities, hf_wsp_capabilities_method_MOR, tvb, capabilitiesStart, length+1, value); break; - case 0x04 : /* Push-MOR */ + case 0x04 : /* Push-MOR */ value = tvb_get_guint8(tvb, offset); proto_tree_add_uint (wsp_capabilities, hf_wsp_capabilities_push_MOR, tvb, capabilitiesStart, length+1, value); break; break; - case 0x05 : /* Extended Methods */ + case 0x05 : /* Extended Methods */ offsetStr = offset; offset++; add_capability_vals(tvb, (type == CONNECT), @@ -3029,7 +3029,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type) valString, sizeof valString); proto_tree_add_string(wsp_capabilities, hf_wsp_capabilities_extended_methods, tvb, capabilitiesStart, length+1, valString); break; - case 0x06 : /* Header Code Pages */ + case 0x06 : /* Header Code Pages */ offsetStr = offset; offset++; add_capability_vals(tvb, (type == CONNECT), @@ -3326,7 +3326,7 @@ add_content_type (proto_tree *tree, tvbuff_t *tvb, guint offset, * Get the value type and length (or, if the type is VALUE_IN_LEN, * meaning the value is a Short-integer, get the value type * and the value itself). - */ + */ valueType = get_value_type_len (tvb, valueStart, &valueLen, &valueOffset, &offset); valueTypeLen = offset - valueStart; @@ -3797,7 +3797,7 @@ add_post_data (proto_tree *tree, tvbuff_t *tvb, guint contentType, guint8 peek = 0; proto_item *ti; proto_tree *sub_tree; - + /* VERIFY ti = proto_tree_add_item (tree, hf_wsp_post_data,tvb,offset,-1,bo_little_endian); */ ti = proto_tree_add_item (tree, hf_wsp_post_data,tvb,offset,-1,bo_little_endian); sub_tree = proto_item_add_subtree(ti, ett_post); @@ -3981,124 +3981,124 @@ get_integer (tvbuff_t *tvb, guint offset, guint valueLength, /* Register the protocol with Ethereal */ void proto_register_wsp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_wsp_header_tid, - { "Transmission ID", + { "Transmission ID", "wsp.TID", FT_UINT8, BASE_HEX, NULL, 0x00, "Transmission ID", HFILL } }, { &hf_wsp_header_pdu_type, - { "PDU Type", + { "PDU Type", "wsp.pdu_type", FT_UINT8, BASE_HEX, VALS( vals_pdu_type ), 0x00, "PDU Type", HFILL } }, { &hf_wsp_version_major, - { "Version (Major)", + { "Version (Major)", "wsp.version.major", FT_UINT8, BASE_DEC, NULL, 0xF0, "Version (Major)", HFILL } }, { &hf_wsp_version_minor, - { "Version (Minor)", + { "Version (Minor)", "wsp.version.minor", FT_UINT8, BASE_DEC, NULL, 0x0F, "Version (Minor)", HFILL } }, { &hf_wsp_capability_length, - { "Capability Length", + { "Capability Length", "wsp.capability.length", FT_UINT32, BASE_DEC, NULL, 0x00, "Capability Length", HFILL } }, { &hf_wsp_header_length, - { "Headers Length", + { "Headers Length", "wsp.headers_length", FT_UINT32, BASE_DEC, NULL, 0x00, "Headers Length", HFILL } }, { &hf_wsp_capabilities_section, - { "Capabilities", + { "Capabilities", "wsp.capabilities", FT_NONE, BASE_DEC, NULL, 0x00, "Capabilities", HFILL } }, { &hf_wsp_headers_section, - { "Headers", + { "Headers", "wsp.headers", FT_NONE, BASE_DEC, NULL, 0x00, "Headers", HFILL } }, { &hf_wsp_header, - { "Header", + { "Header", "wsp.headers.header", FT_NONE, BASE_DEC, NULL, 0x00, "Header", HFILL } }, { &hf_wsp_header_uri_len, - { "URI Length", + { "URI Length", "wsp.uri_length", FT_UINT32, BASE_DEC, NULL, 0x00, "URI Length", HFILL } }, { &hf_wsp_header_uri, - { "URI", + { "URI", "wsp.uri", FT_STRING, BASE_NONE, NULL, 0x00, "URI", HFILL } }, { &hf_wsp_server_session_id, - { "Server Session ID", + { "Server Session ID", "wsp.server.session_id", FT_UINT32, BASE_DEC, NULL, 0x00, "Server Session ID", HFILL } }, { &hf_wsp_header_status, - { "Status", + { "Status", "wsp.reply.status", FT_UINT8, BASE_HEX, VALS( vals_status ), 0x00, "Status", HFILL } }, { &hf_wsp_content_type, - { "Content Type", + { "Content Type", "wsp.content_type.type", FT_UINT8, BASE_HEX, VALS ( vals_content_types ), 0x00, "Content Type", HFILL } }, { &hf_wsp_content_type_str, - { "Content Type", + { "Content Type", "wsp.content_type.type.string", FT_STRING, BASE_NONE, NULL, 0x00, "Content Type", HFILL } }, { &hf_wsp_parameter_well_known_charset, - { "Charset", + { "Charset", "wsp.content_type.parameter.charset", FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00, "Charset", HFILL } }, { &hf_wsp_parameter_type, - { "Type", + { "Type", "wsp.content_type.parameter.type", FT_UINT32, BASE_DEC, NULL, 0x00, "Type", HFILL @@ -4168,14 +4168,14 @@ proto_register_wsp(void) } }, { &hf_wsp_reply_data, - { "Data", + { "Data", "wsp.reply.data", FT_NONE, BASE_NONE, NULL, 0x00, "Data", HFILL } }, { &hf_wsp_header_shift_code, - { "Shift code", + { "Shift code", "wsp.header.shift", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_UINT8, BASE_HEX, NULL, 0x00, @@ -4183,7 +4183,7 @@ proto_register_wsp(void) } }, { &hf_wsp_header_accept, - { "Accept", + { "Accept", "wsp.header.accept", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_UINT8, BASE_HEX, VALS ( vals_content_types ), 0x00, @@ -4191,14 +4191,14 @@ proto_register_wsp(void) } }, { &hf_wsp_header_accept_str, - { "Accept", + { "Accept", "wsp.header.accept.string", FT_STRING, BASE_NONE, NULL, 0x00, "Accept", HFILL } }, { &hf_wsp_header_accept_application, - { "Accept-Application", + { "Accept-Application", "wsp.header.accept_application", FT_UINT32, BASE_HEX, NULL, 0x00, "Accept-Application", HFILL @@ -4212,49 +4212,49 @@ proto_register_wsp(void) } }, { &hf_wsp_header_accept_charset, - { "Accept-Charset", + { "Accept-Charset", "wsp.header.accept_charset", FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00, "Accept-Charset", HFILL } }, { &hf_wsp_header_accept_charset_str, - { "Accept-Charset", + { "Accept-Charset", "wsp.header.accept_charset.string", FT_STRING, BASE_NONE, NULL, 0x00, "Accept-Charset", HFILL } }, { &hf_wsp_header_accept_language, - { "Accept-Language", + { "Accept-Language", "wsp.header.accept_language", FT_UINT8, BASE_HEX, VALS ( vals_languages ), 0x00, "Accept-Language", HFILL } }, { &hf_wsp_header_accept_language_str, - { "Accept-Language", + { "Accept-Language", "wsp.header.accept_language.string", FT_STRING, BASE_NONE, NULL, 0x00, "Accept-Language", HFILL } }, { &hf_wsp_header_accept_ranges, - { "Accept-Ranges", + { "Accept-Ranges", "wsp.header.accept_ranges", FT_UINT8, BASE_HEX, VALS ( vals_accept_ranges ), 0x00, "Accept-Ranges", HFILL } }, { &hf_wsp_header_accept_ranges_str, - { "Accept-Ranges", + { "Accept-Ranges", "wsp.header.accept_ranges.string", FT_STRING, BASE_NONE, NULL, 0x00, "Accept-Ranges", HFILL } }, { &hf_wsp_header_age, - { "Age", + { "Age", "wsp.header.age", FT_UINT32, BASE_DEC, NULL, 0x00, "Age", HFILL @@ -4282,28 +4282,28 @@ proto_register_wsp(void) } }, { &hf_wsp_header_openwave_proxy_notify, - { "x-up-proxy-notify", + { "x-up-proxy-notify", "wsp.header.x-up-proxy-notify", FT_UINT8, BASE_DEC, NULL, 0x00, "Indicates to the handset that there are pending UPNOTIFY pushes waiting.", HFILL } }, { &hf_wsp_header_openwave_proxy_operator_domain, - { "x-up-proxy-operator-domain", + { "x-up-proxy-operator-domain", "wsp.header.x-up-proxy-operator-domain", FT_STRING, BASE_NONE, NULL, 0x00, "Indicates the Trusted Provisioning Domain.", HFILL } }, { &hf_wsp_header_openwave_proxy_home_page, - { "x-up-proxy-home-page", + { "x-up-proxy-home-page", "wsp.header.x-up-proxy-home-page", FT_STRING, BASE_NONE, NULL, 0x00, "Specifies the server-assigned home page URL.", HFILL } }, { &hf_wsp_header_openwave_devcap_has_color, - { "x-up-devcap-has-color", + { "x-up-devcap-has-color", "wsp.header.x-up-devcap-has-color", FT_UINT8, BASE_DEC, NULL, 0x00, "Indicates if the handset supports colour.", HFILL @@ -4482,21 +4482,21 @@ proto_register_wsp(void) * XXX - I'm assuming that the bearer indication is * just a bearer type. */ - { "Bearer-indication", + { "Bearer-indication", "wsp.header.bearer_indication", FT_UINT32, BASE_HEX, VALS(vals_bearer_types), 0x00, "Bearer-indication", HFILL } }, { &hf_wsp_header_cache_control, - { "Cache-Control", + { "Cache-Control", "wsp.header.cache_control", FT_UINT8, BASE_HEX, VALS ( vals_cache_control ), 0x00, "Cache-Control", HFILL } }, { &hf_wsp_header_cache_control_str, - { "Cache-Control", + { "Cache-Control", "wsp.header.cache_control.string", FT_STRING, BASE_NONE, NULL, 0x00, "Cache-Control", HFILL @@ -4517,35 +4517,35 @@ proto_register_wsp(void) } }, { &hf_wsp_header_connection, - { "Connection", + { "Connection", "wsp.header.connection", FT_UINT8, BASE_HEX, VALS ( vals_connection ), 0x00, "Connection", HFILL } }, { &hf_wsp_header_connection_str, - { "Connection", + { "Connection", "wsp.header.connection_str", FT_STRING, BASE_NONE, NULL, 0x00, "Connection", HFILL } }, { &hf_wsp_header_content_length, - { "Content-Length", + { "Content-Length", "wsp.header.content_length", FT_UINT32, BASE_DEC, NULL, 0x00, "Content-Length", HFILL } }, { &hf_wsp_header_date, - { "Date", + { "Date", "wsp.header.date", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Date", HFILL } }, { &hf_wsp_header_etag, - { "Etag", + { "Etag", "wsp.header.etag", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_STRING, BASE_NONE, NULL, 0x00, @@ -4553,35 +4553,35 @@ proto_register_wsp(void) } }, { &hf_wsp_header_expires, - { "Expires", + { "Expires", "wsp.header.expires", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Expires", HFILL } }, { &hf_wsp_header_last_modified, - { "Last-Modified", + { "Last-Modified", "wsp.header.last_modified", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "Last-Modified", HFILL } }, { &hf_wsp_header_location, - { "Location", + { "Location", "wsp.header.location", FT_STRING, BASE_NONE, NULL, 0x00, "Location", HFILL } }, { &hf_wsp_header_if_modified_since, - { "If-Modified-Since", + { "If-Modified-Since", "wsp.header.if_modified_since", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "If-Modified-Since", HFILL } }, { &hf_wsp_header_pragma, - { "Pragma", + { "Pragma", "wsp.header.pragma", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_STRING, BASE_NONE, NULL, 0x00, @@ -4589,7 +4589,7 @@ proto_register_wsp(void) } }, { &hf_wsp_header_profile, - { "Profile", + { "Profile", "wsp.header.profile", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_STRING, BASE_NONE, NULL, 0x00, @@ -4597,7 +4597,7 @@ proto_register_wsp(void) } }, { &hf_wsp_header_server, - { "Server", + { "Server", "wsp.header.server", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_STRING, BASE_NONE, NULL, 0x00, @@ -4605,7 +4605,7 @@ proto_register_wsp(void) } }, { &hf_wsp_header_transfer_encoding, - { "Transfer Encoding", + { "Transfer Encoding", "wsp.header.transfer_enc", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_UINT8, BASE_HEX, VALS ( vals_transfer_encoding ), 0x00, @@ -4613,14 +4613,14 @@ proto_register_wsp(void) } }, { &hf_wsp_header_transfer_encoding_str, - { "Transfer Encoding", + { "Transfer Encoding", "wsp.header.transfer_enc_str", FT_STRING, BASE_NONE, NULL, 0x00, "Transfer Encoding", HFILL } }, { &hf_wsp_header_user_agent, - { "User-Agent", + { "User-Agent", "wsp.header.user_agent", /*FT_NONE, BASE_DEC, NULL, 0x00,*/ FT_STRING, BASE_NONE, NULL, 0x00, @@ -4628,21 +4628,21 @@ proto_register_wsp(void) } }, { &hf_wsp_header_via, - { "Via", + { "Via", "wsp.header.via", FT_STRING, BASE_NONE, NULL, 0x00, "Via", HFILL } }, { &hf_wsp_header_wap_application_id, - { "X-Wap-Application-Id", + { "X-Wap-Application-Id", "wsp.header.wap_application_id", FT_UINT8, BASE_HEX, NULL, 0x00, "WAP application id", HFILL } }, { &hf_wsp_header_wap_application_id_str, - { "X-Wap-Application-Id", + { "X-Wap-Application-Id", "wsp.header.wap_application_id.string", FT_STRING, BASE_NONE, NULL, 0x00, "WAP application id", HFILL @@ -4677,28 +4677,28 @@ proto_register_wsp(void) } }, { &hf_wsp_header_application_header, - { "Application Header", + { "Application Header", "wsp.header.application_header", FT_STRING, BASE_NONE, NULL, 0x00, "Application Header", HFILL } }, { &hf_wsp_header_application_value, - { "Application Header Value", + { "Application Header Value", "wsp.header.application_header.value", FT_STRING, BASE_NONE, NULL, 0x00, "Application Header Value", HFILL } }, { &hf_wsp_header_content_ID, - { "Content-ID", + { "Content-ID", "wsp.header.content-id", FT_STRING, BASE_NONE, NULL, 0x00, "Content-ID", HFILL } }, { &hf_wsp_header_x_wap_tod, - { "X-WAP.TOD", + { "X-WAP.TOD", "wsp.header.x_wap_tod", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "X-WAP.TOD", HFILL @@ -4761,28 +4761,28 @@ proto_register_wsp(void) } }, { &hf_wsp_post_data, - { "Data (Post)", + { "Data (Post)", "wsp.post.data", FT_NONE, BASE_NONE, NULL, 0x00, "Post Data", HFILL } }, { &hf_wsp_push_data, - { "Push Data", + { "Push Data", "wsp.push.data", FT_NONE, BASE_NONE, NULL, 0x00, "Push Data", HFILL } }, { &hf_wsp_multipart_data, - { "Data in this part", + { "Data in this part", "wsp.multipart.data", FT_NONE, BASE_NONE, NULL, 0x00, "The data of 1 MIME-multipart part.", HFILL } }, { &hf_wsp_mpart, - { "Part", + { "Part", "wsp.multipart", FT_UINT32, BASE_DEC, NULL, 0x00, "MIME part of multipart data.", HFILL @@ -4873,7 +4873,7 @@ proto_register_wsp(void) } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wsp, @@ -4894,9 +4894,9 @@ proto_register_wsp(void) /* Register the protocol name and description */ proto_wsp = proto_register_protocol( - "Wireless Session Protocol", /* protocol name for use by ethereal */ + "Wireless Session Protocol", /* protocol name for use by ethereal */ "WSP", /* short version of name */ - "wap-wsp" /* Abbreviated protocol name, should Match IANA + "wap-wsp" /* Abbreviated protocol name, should Match IANA < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ > */ ); diff --git a/packet-wsp.h b/packet-wsp.h index 63f0ddac8a..d4b0f73e55 100644 --- a/packet-wsp.h +++ b/packet-wsp.h @@ -2,7 +2,7 @@ * * Declarations for disassembly of WSP component of WAP traffic. * - * $Id: packet-wsp.h,v 1.5 2002/08/07 08:34:55 guy Exp $ + * $Id: packet-wsp.h,v 1.6 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -11,17 +11,17 @@ * WAP dissector based on original work by Ben Fowler * Updated by Neil Hunter <neil.hunter@energis-squared.com> * WTLS support by Alexandre P. Ferreira (Splice IP) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-wtls.c b/packet-wtls.c index 7aa6f850aa..69ba6910c6 100644 --- a/packet-wtls.c +++ b/packet-wtls.c @@ -1,8 +1,8 @@ /* packet-wtls.c * * Routines to dissect WTLS component of WAP traffic. - * - * $Id: packet-wtls.c,v 1.21 2002/08/02 23:36:04 jmayer Exp $ + * + * $Id: packet-wtls.c,v 1.22 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -16,12 +16,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -64,7 +64,7 @@ static int hf_wtls_hands_cli_hello_session = HF_EMPTY; static int hf_wtls_hands_cli_hello_session_str = HF_EMPTY; static int hf_wtls_hands_cli_hello_cli_key_id = HF_EMPTY; static int hf_wtls_hands_cli_hello_cli_key_len = HF_EMPTY; -static int hf_wtls_hands_cli_hello_trust_key_id = HF_EMPTY; +static int hf_wtls_hands_cli_hello_trust_key_id = HF_EMPTY; static int hf_wtls_hands_cli_hello_key_exchange =HF_EMPTY; static int hf_wtls_hands_cli_hello_key_exchange_suite =HF_EMPTY; static int hf_wtls_hands_cli_hello_key_parameter_index =HF_EMPTY; @@ -333,7 +333,7 @@ dissect_wtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *wtls_rec_tree; proto_tree *wtls_msg_type_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { switch ( pinfo->match_port ) { @@ -479,7 +479,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun pdu_msg_type = tvb_get_guint8 (tvb, offset); ti = proto_tree_add_uint(tree, hf_wtls_hands, tvb, offset,count, pdu_msg_type); wtls_msg_type_tree = proto_item_add_subtree(ti, ett_wtls_msg_type); - + ti = proto_tree_add_item (wtls_msg_type_tree, hf_wtls_hands_type, tvb,offset,1,bo_big_endian); offset+=1; @@ -534,7 +534,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun /* process client_key_ids structure */ count = tvb_get_ntohs (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_cli_key_id, tvb, offset, count+2, bo_little_endian); wtls_msg_type_item_sub_tree = proto_item_add_subtree(ti, ett_wtls_msg_type_item_sub); @@ -549,11 +549,11 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun for (;count > 0;count-=client_size) { /* get encryption suite id (one byte) */ value = tvb_get_guint8 (tvb, offset); - cli_key_item = proto_tree_add_uint(wtls_msg_type_item_sub_tree, + cli_key_item = proto_tree_add_uint(wtls_msg_type_item_sub_tree, hf_wtls_hands_cli_hello_key_exchange, tvb, offset,1, value); client_size=1; - wtls_msg_type_item_sub_sub_tree = proto_item_add_subtree(cli_key_item, + wtls_msg_type_item_sub_sub_tree = proto_item_add_subtree(cli_key_item, ett_wtls_msg_type_item_sub_sub); ti = proto_tree_add_uint(wtls_msg_type_item_sub_sub_tree, hf_wtls_hands_cli_hello_key_exchange_suite, @@ -664,7 +664,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun /* process trusted_keys structure */ count = tvb_get_ntohs (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_trust_key_id, tvb, offset, count+2, bo_little_endian); wtls_msg_type_item_sub_tree = proto_item_add_subtree(ti, ett_wtls_msg_type_item_sub); @@ -678,11 +678,11 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun for (;count > 0;count-=client_size) { /* get encryption suite id (one byte) */ value = tvb_get_guint8 (tvb, offset); - cli_key_item = proto_tree_add_uint(wtls_msg_type_item_sub_tree, + cli_key_item = proto_tree_add_uint(wtls_msg_type_item_sub_tree, hf_wtls_hands_cli_hello_key_exchange, tvb, offset,1, value); client_size=1; - wtls_msg_type_item_sub_sub_tree = proto_item_add_subtree(cli_key_item, + wtls_msg_type_item_sub_sub_tree = proto_item_add_subtree(cli_key_item, ett_wtls_msg_type_item_sub_sub); ti = proto_tree_add_uint(wtls_msg_type_item_sub_sub_tree, hf_wtls_hands_cli_hello_key_exchange_suite, @@ -793,7 +793,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun /* process cipher_suites structure */ count = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_cipher_suite, tvb, offset, count+1, bo_little_endian); wtls_msg_type_item_sub_tree = proto_item_add_subtree(ti, ett_wtls_msg_type_item_sub); @@ -831,27 +831,27 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun client_size++; cli_key_item = proto_tree_add_string(wtls_msg_type_item_sub_tree, hf_wtls_hands_cli_hello_cipher_suite_item, tvb, offset-2,2, - valStr); + valStr); } count = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_compression_methods, tvb, offset, count+1, bo_little_endian); wtls_msg_type_item_sub_tree = proto_item_add_subtree(ti, ett_wtls_msg_type_item_sub); offset+=1; for (;count > 0;count-=client_size) { client_size=0; - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_cli_hello_compression, tvb, offset,1, bo_little_endian); offset++; client_size++; } - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_sequence_mode, tvb, offset, 1, bo_little_endian); offset++; - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_cli_hello_key_refresh, tvb, offset, 1, bo_little_endian); break; @@ -902,10 +902,10 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun hf_wtls_hands_serv_hello_cli_key_id, tvb,offset,1,bo_big_endian); offset++; - cli_key_item = proto_tree_add_item(wtls_msg_type_item_tree, + cli_key_item = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_serv_hello_cipher_suite_item, tvb, offset,2, bo_little_endian); - wtls_msg_type_item_sub_tree = proto_item_add_subtree(cli_key_item, + wtls_msg_type_item_sub_tree = proto_item_add_subtree(cli_key_item, ett_wtls_msg_type_item_sub); ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_serv_hello_cipher_bulk, @@ -916,15 +916,15 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun hf_wtls_hands_serv_hello_cipher_mac, tvb,offset,1,bo_big_endian); offset++; - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_serv_hello_compression, tvb, offset,1, bo_little_endian); offset++; - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_serv_hello_sequence_mode, tvb, offset, 1, bo_little_endian); offset++; - ti = proto_tree_add_item(wtls_msg_type_item_tree, + ti = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_serv_hello_key_refresh, tvb, offset, 1, bo_little_endian); offset++; @@ -936,36 +936,36 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun count = tvb_get_ntohs (tvb, offset); offset+=2; for (;count > 0;count-=client_size) { - cli_key_item = proto_tree_add_item(wtls_msg_type_item_tree, + cli_key_item = proto_tree_add_item(wtls_msg_type_item_tree, hf_wtls_hands_certificate, tvb, offset,1, bo_little_endian); client_size=0; - wtls_msg_type_item_sub_tree = proto_item_add_subtree(cli_key_item, + wtls_msg_type_item_sub_tree = proto_item_add_subtree(cli_key_item, ett_wtls_msg_type_item_sub); proto_item_set_len(cli_key_item, client_size); value = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_type, tvb, offset,1, bo_little_endian); offset++; client_size++; switch(value) { case CERTIFICATE_WTLS: - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_version, tvb, offset,1, bo_little_endian); offset++; client_size++; signature = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_signature_type, tvb, offset,1, bo_little_endian); offset++; client_size++; value = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_issuer_type, tvb, offset,1, bo_little_endian); @@ -992,20 +992,20 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun } timeValue.secs = tvb_get_ntohl (tvb, offset); timeValue.nsecs = 0; - ti = proto_tree_add_time (wtls_msg_type_item_sub_tree, + ti = proto_tree_add_time (wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_valid_not_before, tvb, offset, 4, &timeValue); offset+=4; client_size+=4; timeValue.secs = tvb_get_ntohl (tvb, offset); timeValue.nsecs = 0; - ti = proto_tree_add_time (wtls_msg_type_item_sub_tree, + ti = proto_tree_add_time (wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_valid_not_after, tvb, offset, 4, &timeValue); offset+=4; client_size+=4; value = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_subject_type, tvb, offset,1, bo_little_endian); @@ -1015,7 +1015,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun case IDENTIFIER_NULL : break; case IDENTIFIER_TEXT : - value = add_text_identifier(tvb, offset, + value = add_text_identifier(tvb, offset, hf_wtls_hands_certificate_wtls_subject_charset, hf_wtls_hands_certificate_wtls_subject_size, hf_wtls_hands_certificate_wtls_subject_name, @@ -1031,7 +1031,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun break; } public_key = tvb_get_guint8 (tvb, offset); - ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, + ti = proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_public_key_type, tvb, offset,1, bo_little_endian); @@ -1097,7 +1097,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun proto_item_set_len(cli_key_item, client_size); } break; - default: + default: offset+=count; break; } @@ -1106,320 +1106,320 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun /* Register the protocol with Ethereal */ void proto_register_wtls(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_wtls_record, - { "Record", + { "Record", "wsp.wtls.record", FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f, "Record", HFILL } }, { &hf_wtls_record_type, - { "Record Type", + { "Record Type", "wsp.wtls.rec_type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f, "Record Type", HFILL } }, { &hf_wtls_record_length, - { "Record Length", + { "Record Length", "wsp.wtls.rec_length", FT_UINT16, BASE_DEC, NULL, 0x00, "Record Length", HFILL } }, { &hf_wtls_record_sequence, - { "Record Sequence", + { "Record Sequence", "wsp.wtls.rec_seq", FT_UINT16, BASE_DEC, NULL, 0x00, "Record Sequence", HFILL } }, { &hf_wtls_record_ciphered, - { "Record Ciphered", + { "Record Ciphered", "wsp.wtls.rec_cipher", FT_NONE, BASE_NONE, NULL, 0x00, "Record Ciphered", HFILL } }, { &hf_wtls_hands, - { "Handshake", + { "Handshake", "wsp.wtls.handshake", FT_UINT8, BASE_DEC, VALS ( wtls_vals_handshake_type ), 0x00, "Handshake", HFILL } }, { &hf_wtls_hands_type, - { "Type", + { "Type", "wsp.wtls.handshake.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_handshake_type ), 0x00, "Type", HFILL } }, { &hf_wtls_hands_length, - { "Length", + { "Length", "wsp.wtls.handshake.length", FT_UINT16, BASE_DEC, NULL, 0x00, "Length", HFILL } }, { &hf_wtls_hands_cli_hello, - { "Client Hello", + { "Client Hello", "wsp.wtls.handshake.client_hello", FT_NONE, BASE_NONE, NULL, 0x00, "Client Hello", HFILL } }, { &hf_wtls_hands_cli_hello_version, - { "Version", + { "Version", "wsp.wtls.handshake.client_hello.version", FT_UINT8, BASE_DEC, NULL, 0x00, "Version", HFILL } }, { &hf_wtls_hands_cli_hello_gmt, - { "Time GMT", + { "Time GMT", "wsp.wtls.handshake.client_hello.gmt", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, "Time GMT", HFILL } }, { &hf_wtls_hands_cli_hello_random, - { "Random", + { "Random", "wsp.wtls.handshake.client_hello.random", FT_NONE, BASE_NONE, NULL, 0x00, "Random", HFILL } }, { &hf_wtls_hands_cli_hello_session, - { "Session ID", + { "Session ID", "wsp.wtls.handshake.client_hello.sessionid", FT_UINT32, BASE_DEC, NULL, 0x00, "Session ID", HFILL } }, { &hf_wtls_hands_cli_hello_session_str, - { "Session ID", + { "Session ID", "wsp.wtls.handshake.client_hello.session.str", FT_STRING, BASE_NONE, NULL, 0x00, "Session ID", HFILL } }, { &hf_wtls_hands_cli_hello_cli_key_id, - { "Client Keys", + { "Client Keys", "wsp.wtls.handshake.client_hello.client_keys_id", FT_NONE, BASE_NONE, NULL, 0x00, - "Client Keys" , HFILL + "Client Keys" , HFILL } }, { &hf_wtls_hands_cli_hello_cli_key_len, - { "Length", + { "Length", "wsp.wtls.handshake.client_hello.client_keys_len", FT_UINT16, BASE_DEC, NULL, 0x00, "Length" , HFILL } }, { &hf_wtls_hands_cli_hello_trust_key_id, - { "Trusted Keys", + { "Trusted Keys", "wsp.wtls.handshake.client_hello.trusted_keys_id", FT_NONE, BASE_NONE, NULL, 0x00, "Trusted Keys" , HFILL } }, { &hf_wtls_hands_cli_hello_key_exchange, - { "Key Exchange", + { "Key Exchange", "wsp.wtls.handshake.client_hello.key.key_exchange", FT_UINT8, BASE_DEC, VALS ( wtls_vals_key_exchange_suite ), 0x00, "Key Exchange", HFILL } }, { &hf_wtls_hands_cli_hello_key_exchange_suite, - { "Suite", + { "Suite", "wsp.wtls.handshake.client_hello.key.key_exchange.suite", FT_UINT8, BASE_DEC, VALS ( wtls_vals_key_exchange_suite ), 0x00, "Suite", HFILL } }, { &hf_wtls_hands_cli_hello_key_parameter_index, - { "Parameter Index", + { "Parameter Index", "wsp.wtls.handshake.client_hello.parameter_index", FT_UINT8, BASE_DEC, NULL, 0x00, "Parameter Index", HFILL } }, { &hf_wtls_hands_cli_hello_key_parameter_set, - { "Parameter Set", + { "Parameter Set", "wsp.wtls.handshake.client_hello.parameter", FT_STRING, BASE_NONE, NULL, 0x00, "Parameter Set", HFILL } }, { &hf_wtls_hands_cli_hello_key_identifier_type, - { "Identifier Type", + { "Identifier Type", "wsp.wtls.handshake.client_hello.ident_type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00, "Identifier Type", HFILL } }, { &hf_wtls_hands_cli_hello_key_identifier_charset, - { "Identifier CharSet", + { "Identifier CharSet", "wsp.wtls.handshake.client_hello.ident_charset", FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00, "Identifier CharSet", HFILL } }, { &hf_wtls_hands_cli_hello_key_identifier_size, - { "Identifier Size", + { "Identifier Size", "wsp.wtls.handshake.client_hello.ident_size", FT_UINT8, BASE_DEC, NULL, 0x00, "Identifier Size", HFILL } }, { &hf_wtls_hands_cli_hello_key_identifier, - { "Identifier", + { "Identifier", "wsp.wtls.handshake.client_hello.identifier", FT_NONE, BASE_NONE, NULL, 0x00, "Identifier", HFILL } }, { &hf_wtls_hands_cli_hello_key_identifier_str, - { "Identifier Name", + { "Identifier Name", "wsp.wtls.handshake.client_hello.ident_name", FT_STRING, BASE_NONE, NULL, 0x00, "Identifier Name", HFILL } }, { &hf_wtls_hands_cli_hello_cipher_suite, - { "Cipher Suites", + { "Cipher Suites", "wsp.wtls.handshake.client_hello.ciphers", FT_NONE, BASE_NONE, NULL, 0x00, "Cipher Suite", HFILL } }, { &hf_wtls_hands_cli_hello_cipher_suite_item, - { "Cipher", + { "Cipher", "wsp.wtls.handshake.client_hello.cipher", FT_STRING, BASE_NONE, NULL, 0x00, "Cipher", HFILL } }, { &hf_wtls_hands_cli_hello_compression_methods, - { "Compression Methods", + { "Compression Methods", "wsp.wtls.handshake.client_hello.comp_methods", FT_NONE, BASE_NONE, NULL, 0x00, "Compression Methods", HFILL } }, { &hf_wtls_hands_cli_hello_compression, - { "Compression", + { "Compression", "wsp.wtls.handshake.client_hello.compression", FT_UINT8, BASE_HEX, VALS ( wtls_vals_compression ), 0x00, "Compression", HFILL } }, { &hf_wtls_hands_cli_hello_sequence_mode, - { "Sequence Mode", + { "Sequence Mode", "wsp.wtls.handshake.client_hello.sequence_mode", FT_UINT8, BASE_DEC, VALS ( wtls_vals_sequence_mode ), 0x00, "Sequence Mode", HFILL } }, { &hf_wtls_hands_cli_hello_key_refresh, - { "Refresh", + { "Refresh", "wsp.wtls.handshake.client_hello.refresh", FT_UINT8, BASE_DEC, NULL, 0x00, "Refresh", HFILL } }, { &hf_wtls_hands_serv_hello, - { "Server Hello", + { "Server Hello", "wsp.wtls.handshake.server_hello", FT_NONE, BASE_NONE, NULL, 0x00, "Server Hello", HFILL } }, { &hf_wtls_hands_serv_hello_version, - { "Version", + { "Version", "wsp.wtls.handshake.server_hello.version", FT_UINT8, BASE_DEC, NULL, 0x00, "Version", HFILL } }, { &hf_wtls_hands_serv_hello_gmt, - { "Time GMT", + { "Time GMT", "wsp.wtls.handshake.server_hello.gmt", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, "Time GMT", HFILL } }, { &hf_wtls_hands_serv_hello_random, - { "Random", + { "Random", "wsp.wtls.handshake.server_hello.random", FT_NONE, BASE_NONE, NULL, 0x00, "Random", HFILL } }, { &hf_wtls_hands_serv_hello_session, - { "Session ID", + { "Session ID", "wsp.wtls.handshake.server_hello.sessionid", FT_UINT32, BASE_DEC, NULL, 0x00, "Session ID", HFILL } }, { &hf_wtls_hands_serv_hello_session_str, - { "Session ID", + { "Session ID", "wsp.wtls.handshake.server_hello.session.str", FT_STRING, BASE_NONE, NULL, 0x00, "Session ID", HFILL } }, { &hf_wtls_hands_serv_hello_cli_key_id, - { "Client Key ID", + { "Client Key ID", "wsp.wtls.handshake.server_hello.key", FT_UINT8, BASE_HEX, NULL, 0x00, "Client Key ID", HFILL } }, { &hf_wtls_hands_serv_hello_cipher_suite_item, - { "Cipher", + { "Cipher", "wsp.wtls.handshake.server_hello.cipher", FT_NONE, BASE_NONE, NULL, 0x00, "Cipher", HFILL } }, { &hf_wtls_hands_serv_hello_cipher_bulk, - { "Cipher Bulk", + { "Cipher Bulk", "wsp.wtls.handshake.server_hello.cipher.bulk", FT_UINT8, BASE_DEC, VALS ( wtls_vals_cipher_bulk ), 0x00, "Cipher Bulk", HFILL } }, { &hf_wtls_hands_serv_hello_cipher_mac, - { "Cipher MAC", + { "Cipher MAC", "wsp.wtls.handshake.server_hello.cipher.mac", FT_UINT8, BASE_DEC, VALS ( wtls_vals_cipher_mac ), 0x00, "Cipher MAC", HFILL } }, { &hf_wtls_hands_serv_hello_compression, - { "Compression", + { "Compression", "wsp.wtls.handshake.server_hello.compression", FT_UINT8, BASE_HEX, VALS ( wtls_vals_compression ), 0x00, "Compression", HFILL } }, { &hf_wtls_hands_serv_hello_sequence_mode, - { "Sequence Mode", + { "Sequence Mode", "wsp.wtls.handshake.server_hello.sequence_mode", FT_UINT8, BASE_DEC, VALS ( wtls_vals_sequence_mode ), 0x00, "Sequence Mode", HFILL } }, { &hf_wtls_hands_serv_hello_key_refresh, - { "Refresh", + { "Refresh", "wsp.wtls.handshake.server_hello.refresh", FT_UINT8, BASE_DEC, NULL, 0x00, "Refresh", HFILL @@ -1433,168 +1433,168 @@ proto_register_wtls(void) } }, { &hf_wtls_hands_certificate, - { "Certificate", + { "Certificate", "wsp.wtls.handshake.certificate", FT_NONE, BASE_NONE, NULL, 0x00, "Certificate", HFILL } }, { &hf_wtls_hands_certificate_type, - { "Type", + { "Type", "wsp.wtls.handshake.certificate.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_certificate_type ), 0x00, "Type", HFILL } }, { &hf_wtls_hands_certificate_wtls_version, - { "Version", + { "Version", "wsp.wtls.handshake.certificate.version", FT_UINT8, BASE_HEX, NULL, 0x00, "Version", HFILL } }, { &hf_wtls_hands_certificate_wtls_signature_type, - { "Signature Type", + { "Signature Type", "wsp.wtls.handshake.certificate.signature.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_certificate_signature ), 0x00, - "Signature Type", HFILL + "Signature Type", HFILL } }, { &hf_wtls_hands_certificate_wtls_signature, - { "Signature Size", + { "Signature Size", "wsp.wtls.handshake.certificate.signature.signature", FT_UINT32, BASE_DEC, NULL, 0x00, "Signature Size", HFILL } }, { &hf_wtls_hands_certificate_wtls_issuer_type, - { "Issuer", + { "Issuer", "wsp.wtls.handshake.certificate.issuer.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00, "Issuer", HFILL } }, { &hf_wtls_hands_certificate_wtls_issuer_charset, - { "Charset", + { "Charset", "wsp.wtls.handshake.certificate.issuer.charset", FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00, "Charset", HFILL } }, { &hf_wtls_hands_certificate_wtls_issuer_size, - { "Size", + { "Size", "wsp.wtls.handshake.certificate.issuer.size", FT_UINT8, BASE_DEC, NULL, 0x00, "Size", HFILL } }, { &hf_wtls_hands_certificate_wtls_issuer_name, - { "Name", + { "Name", "wsp.wtls.handshake.certificate.issuer.name", FT_STRING, BASE_NONE, NULL, 0x00, "Name", HFILL } }, { &hf_wtls_hands_certificate_wtls_valid_not_before, - { "Valid not before", + { "Valid not before", "wsp.wtls.handshake.certificate.before", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, "Valid not before", HFILL } }, { &hf_wtls_hands_certificate_wtls_valid_not_after, - { "Valid not after", + { "Valid not after", "wsp.wtls.handshake.certificate.after", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, "Valid not after", HFILL } }, { &hf_wtls_hands_certificate_wtls_subject_type, - { "Subject", + { "Subject", "wsp.wtls.handshake.certificate.subject.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00, "Subject", HFILL } }, { &hf_wtls_hands_certificate_wtls_subject_charset, - { "Charset", + { "Charset", "wsp.wtls.handshake.certificate.subject.charset", FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00, "Charset", HFILL } }, { &hf_wtls_hands_certificate_wtls_subject_size, - { "Size", + { "Size", "wsp.wtls.handshake.certificate.subject.size", FT_UINT8, BASE_DEC, NULL, 0x00, "Size", HFILL } }, { &hf_wtls_hands_certificate_wtls_subject_name, - { "Name", + { "Name", "wsp.wtls.handshake.certificate.subject.name", FT_STRING, BASE_NONE, NULL, 0x00, "Name", HFILL } }, { &hf_wtls_hands_certificate_wtls_public_key_type, - { "Public Key Type", + { "Public Key Type", "wsp.wtls.handshake.certificate.public.type", FT_UINT8, BASE_DEC, VALS ( wtls_vals_public_key_type ), 0x00, "Public Key Type", HFILL } }, { &hf_wtls_hands_certificate_wtls_key_parameter_index, - { "Parameter Index", + { "Parameter Index", "wsp.wtls.handshake.certificate.parameter_index", FT_UINT8, BASE_DEC, NULL, 0x00, "Parameter Index", HFILL } }, { &hf_wtls_hands_certificate_wtls_key_parameter_set, - { "Parameter Set", + { "Parameter Set", "wsp.wtls.handshake.certificate.parameter", FT_STRING, BASE_NONE, NULL, 0x00, "Parameter Set", HFILL } }, { &hf_wtls_hands_certificate_wtls_rsa_exponent, - { "RSA Exponent Size", + { "RSA Exponent Size", "wsp.wtls.handshake.certificate.rsa.exponent", FT_UINT32, BASE_DEC, NULL, 0x00, "RSA Exponent Size", HFILL } }, { &hf_wtls_hands_certificate_wtls_rsa_modules, - { "RSA Modulus Size", + { "RSA Modulus Size", "wsp.wtls.handshake.certificate.rsa.modules", FT_UINT32, BASE_DEC, NULL, 0x00, "RSA Modulus Size", HFILL } }, { &hf_wtls_alert, - { "Alert", + { "Alert", "wsp.wtls.alert", FT_NONE, BASE_NONE, NULL, 0x00, "Alert", HFILL } }, { &hf_wtls_alert_level, - { "Level", + { "Level", "wsp.wtls.alert.level", FT_UINT8, BASE_DEC, VALS ( wtls_vals_alert_level ), 0x00, "Level", HFILL } }, { &hf_wtls_alert_description, - { "Description", + { "Description", "wsp.wtls.alert.description", FT_UINT8, BASE_DEC, VALS ( wtls_vals_alert_description ), 0x00, "Description", HFILL } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wtls, @@ -1607,9 +1607,9 @@ proto_register_wtls(void) /* Register the protocol name and description */ proto_wtls = proto_register_protocol( - "Wireless Transport Layer Security", /* protocol name for use by ethereal */ + "Wireless Transport Layer Security", /* protocol name for use by ethereal */ "WTLS", /* short version of name */ - "wap-wtls" /* Abbreviated protocol name, should Match IANA + "wap-wtls" /* Abbreviated protocol name, should Match IANA < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ > */ ); @@ -1631,7 +1631,7 @@ proto_reg_handoff_wtls(void) wsp_handle = find_dissector("wsp-cl"); wtls_handle = create_dissector_handle(dissect_wtls, proto_wtls); - dissector_add("udp.port", UDP_PORT_WTLS_WSP, wtls_handle); + dissector_add("udp.port", UDP_PORT_WTLS_WSP, wtls_handle); dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, wtls_handle); dissector_add("udp.port", UDP_PORT_WTLS_WSP_PUSH,wtls_handle); } diff --git a/packet-wtls.h b/packet-wtls.h index 29a639f6a3..200d74d6cd 100644 --- a/packet-wtls.h +++ b/packet-wtls.h @@ -2,7 +2,7 @@ * * Declarations for disassembly of WTLS component of WAP traffic. * - * $Id: packet-wtls.h,v 1.1 2001/02/13 00:17:54 guy Exp $ + * $Id: packet-wtls.h,v 1.2 2002/08/28 21:00:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -11,17 +11,17 @@ * WAP dissector based on original work by Ben Fowler * Updated by Neil Hunter <neil.hunter@energis-squared.com> * WTLS support by Alexandre P. Ferreira (Splice IP) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-wtp.c b/packet-wtp.c index 388c927a7f..3ab9b816b7 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -1,8 +1,8 @@ /* packet-wtp.c * * Routines to dissect WTP component of WAP traffic. - * - * $Id: packet-wtp.c,v 1.38 2002/08/09 09:12:51 guy Exp $ + * + * $Id: packet-wtp.c,v 1.39 2002/08/28 21:00:39 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -16,12 +16,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -46,27 +46,27 @@ #include "packet-wtp.h" #include "packet-wsp.h" -static const true_false_string continue_truth = { +static const true_false_string continue_truth = { "TPI Present" , "No TPI" }; -static const true_false_string RID_truth = { +static const true_false_string RID_truth = { "Re-Transmission", "First transmission" }; -static const true_false_string TIDNew_truth = { +static const true_false_string TIDNew_truth = { "TID is new" , "TID is valid" }; -static const true_false_string tid_response_truth = { +static const true_false_string tid_response_truth = { "Response" , "Original" }; -static const true_false_string UP_truth = { +static const true_false_string UP_truth = { "User Acknowledgement required" , "User Acknowledgement optional" }; @@ -323,7 +323,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures we'll need to add the protocol subtree and manage it */ proto_item *ti; proto_tree *wtp_tree = NULL; - + char pdut; char clsTransaction = ' '; int cchInfo; @@ -441,14 +441,14 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } #ifdef DEBUG - fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader ); + fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader ); #endif /* Only update "Info" column when no data in this PDU will * be handed off to a subsequent dissector. */ if (check_col(pinfo->cinfo, COL_INFO) && - ((tvb_length_remaining(tvb, offCur + cbHeader + vHeader) <= 0) || + ((tvb_length_remaining(tvb, offCur + cbHeader + vHeader) <= 0) || (pdut == ACK) || (pdut==NEGATIVE_ACK) || (pdut==ABORT)) ) { #ifdef DEBUG fprintf(stderr, "dissect_wtp: (6) About to set info_col header to %s\n", szInfo); @@ -469,14 +469,14 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Code to process the packet goes here */ #ifdef DEBUG - fprintf(stderr, "dissect_wtp: cbHeader = %d\n", cbHeader); - fprintf(stderr, "dissect_wtp: offCur = %d\n", offCur); + fprintf(stderr, "dissect_wtp: cbHeader = %d\n", cbHeader); + fprintf(stderr, "dissect_wtp: offCur = %d\n", offCur); #endif /* Add common items: only CON and PDU Type */ proto_tree_add_item( wtp_tree, /* tree */ hf_wtp_header_flag_continue, /* id */ - tvb, + tvb, offCur, /* start of highlight */ 1, /* length of highlight*/ b0 /* value */ @@ -567,7 +567,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) unsigned char tByte; unsigned char tpiLen; tvbuff_t *tmp_tvb; - + vHeader = 0; /* Start scan all over */ do { @@ -588,14 +588,14 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* End of variable part of header */ } else { #ifdef DEBUG - fprintf(stderr, "dissect_wtp: (4) tree was %p\n", tree); + fprintf(stderr, "dissect_wtp: (4) tree was %p\n", tree); #endif } /* * Any remaining data ought to be WSP data (if not WTP ACK, NACK * or ABORT pdu), so hand off (defragmented) to the WSP dissector */ - if ((tvb_length_remaining(tvb, offCur + cbHeader + vHeader) > 0) && + if ((tvb_length_remaining(tvb, offCur + cbHeader + vHeader) > 0) && ! ((pdut==ACK) || (pdut==NEGATIVE_ACK) || (pdut==ABORT))) { int dataOffset = offCur + cbHeader + vHeader; @@ -678,110 +678,110 @@ dissect_wtp_fromwap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_wtp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_wtp_header_sub_pdu_size, - { "Sub PDU size", + { "Sub PDU size", "wtp.sub_pdu_size", FT_BYTES, BASE_HEX, NULL, 0x0, "Size of Sub-PDU", HFILL } }, { &hf_wtp_header_flag_continue, - { "Continue Flag", + { "Continue Flag", "wtp.continue_flag", - FT_BOOLEAN, 8, TFS( &continue_truth ), 0x80, + FT_BOOLEAN, 8, TFS( &continue_truth ), 0x80, "Continue Flag", HFILL } }, { &hf_wtp_header_pdu_type, - { "PDU Type", + { "PDU Type", "wtp.pdu_type", FT_UINT8, BASE_HEX, VALS( vals_pdu_type ), 0x78, "PDU Type", HFILL } }, { &hf_wtp_header_flag_Trailer, - { "Trailer Flags", + { "Trailer Flags", "wtp.trailer_flags", FT_UINT8, BASE_HEX, VALS( vals_transaction_trailer ), 0x06, "Trailer Flags", HFILL } }, { &hf_wtp_header_flag_RID, - { "Re-transmission Indicator", + { "Re-transmission Indicator", "wtp.RID", FT_BOOLEAN, 8, TFS( &RID_truth ), 0x01, "Re-transmission Indicator", HFILL } }, { &hf_wtp_header_flag_TID_response, - { "TID Response", + { "TID Response", "wtp.TID.response", FT_BOOLEAN, 16, TFS( &tid_response_truth ), 0x8000, "TID Response", HFILL } }, { &hf_wtp_header_flag_TID, - { "Transaction ID", + { "Transaction ID", "wtp.TID", FT_UINT16, BASE_HEX, NULL, 0x7FFF, "Transaction ID", HFILL } }, { &hf_wtp_header_Inv_version, - { "Version", + { "Version", "wtp.header.version", FT_UINT8, BASE_HEX, VALS( vals_version ), 0xC0, "Version", HFILL } }, { &hf_wtp_header_Inv_flag_TIDNew, - { "TIDNew", + { "TIDNew", "wtp.header.TIDNew", FT_BOOLEAN, 8, TFS( &TIDNew_truth ), 0x20, "TIDNew", HFILL } }, { &hf_wtp_header_Inv_flag_UP, - { "U/P flag", + { "U/P flag", "wtp.header.UP", FT_BOOLEAN, 8, TFS( &UP_truth ), 0x10, "U/P Flag", HFILL } }, { &hf_wtp_header_Inv_Reserved, - { "Reserved", + { "Reserved", "wtp.inv.reserved", FT_UINT8, BASE_HEX, NULL, 0x0C, "Reserved", HFILL } }, { &hf_wtp_header_Inv_TransactionClass, - { "Transaction Class", + { "Transaction Class", "wtp.inv.transaction_class", FT_UINT8, BASE_HEX, VALS( vals_transaction_classes ), 0x03, "Transaction Class", HFILL } }, { &hf_wtp_header_Ack_flag_TVETOK, - { "Tve/Tok flag", + { "Tve/Tok flag", "wtp.ack.tvetok", FT_BOOLEAN, 8, TFS( &TVETOK_truth ), 0x04, "Tve/Tok flag", HFILL } }, { &hf_wtp_header_Abort_type, - { "Abort Type", + { "Abort Type", "wtp.abort.type", FT_UINT8, BASE_HEX, VALS ( vals_abort_type ), 0x07, "Abort Type", HFILL } }, { &hf_wtp_header_Abort_reason_provider, - { "Abort Reason", + { "Abort Reason", "wtp.abort.reason.provider", FT_UINT8, BASE_HEX, VALS ( vals_abort_reason_provider ), 0x00, "Abort Reason", HFILL @@ -789,70 +789,70 @@ proto_register_wtp(void) }, /* Assume WSP is the user and use its reason codes */ { &hf_wtp_header_Abort_reason_user, - { "Abort Reason", + { "Abort Reason", "wtp.abort.reason.user", FT_UINT8, BASE_HEX, VALS ( vals_wsp_reason_codes ), 0x00, "Abort Reason", HFILL } }, { &hf_wtp_header_sequence_number, - { "Packet Sequence Number", + { "Packet Sequence Number", "wtp.header.sequence", FT_UINT8, BASE_HEX, NULL, 0x00, "Packet Sequence Number", HFILL } }, { &hf_wtp_header_missing_packets, - { "Missing Packets", + { "Missing Packets", "wtp.header.missing_packets", FT_UINT8, BASE_HEX, NULL, 0x00, "Missing Packets", HFILL } }, { &hf_wtp_header_variable_part, - { "Header: Variable part", + { "Header: Variable part", "wtp.header_variable_part", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_HEX, NULL, 0x0, "Variable part of the header", HFILL } }, { &hf_wtp_data, - { "Data", + { "Data", "wtp.header_data", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_HEX, NULL, 0x0, "Data", HFILL } }, { &hf_wtp_tpi_type, - { "TPI", + { "TPI", "wtp.tpi", FT_UINT8, BASE_HEX, VALS(vals_tpi_type), 0x00, "Identification of the Transport Information Item", HFILL } }, { &hf_wtp_tpi_psn, - { "Packet sequence number", + { "Packet sequence number", "wtp.tpi.psn", FT_UINT8, BASE_DEC, NULL, 0x00, "Sequence number of this packet", HFILL } }, { &hf_wtp_tpi_opt, - { "Option", + { "Option", "wtp.tpi.opt", FT_UINT8, BASE_HEX, VALS(vals_tpi_opt), 0x00, "The given option for this TPI", HFILL } }, { &hf_wtp_tpi_optval, - { "Option Value", + { "Option Value", "wtp.tpi.opt.val", FT_NONE, BASE_NONE, NULL, 0x00, "The value that is supplied with this option", HFILL } }, { &hf_wtp_tpi_info, - { "Information", + { "Information", "wtp.tpi.info", FT_NONE, BASE_NONE, NULL, 0x00, "The information being send by this TPI", HFILL @@ -910,7 +910,7 @@ proto_register_wtp(void) } }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wtp, @@ -922,9 +922,9 @@ proto_register_wtp(void) /* Register the protocol name and description */ proto_wtp = proto_register_protocol( - "Wireless Transaction Protocol", /* protocol name for use by ethereal */ + "Wireless Transaction Protocol", /* protocol name for use by ethereal */ "WTP", /* short version of name */ - "wap-wsp-wtp" /* Abbreviated protocol name, should Match IANA + "wap-wsp-wtp" /* Abbreviated protocol name, should Match IANA < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ > */ ); diff --git a/packet-wtp.h b/packet-wtp.h index 86f1db5121..796bd06572 100644 --- a/packet-wtp.h +++ b/packet-wtp.h @@ -2,7 +2,7 @@ * * Declarations for disassembly of WTP component of WAP traffic. * - * $Id: packet-wtp.h,v 1.3 2001/02/13 00:17:54 guy Exp $ + * $Id: packet-wtp.h,v 1.4 2002/08/28 21:00:39 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -11,17 +11,17 @@ * WAP dissector based on original work by Ben Fowler * Updated by Neil Hunter <neil.hunter@energis-squared.com> * WTLS support by Alexandre P. Ferreira (Splice IP) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-x11-keysym.h b/packet-x11-keysym.h index 119442aeb9..f47cfe7e97 100644 --- a/packet-x11-keysym.h +++ b/packet-x11-keysym.h @@ -1,6 +1,6 @@ /* packet-x11-keysym.h * - * $Id: packet-x11-keysym.h,v 1.5 2001/10/04 08:52:38 guy Exp $ + * $Id: packet-x11-keysym.h,v 1.6 2002/08/28 21:00:40 jmayer Exp $ * * Put there so as to make packet-x11.c lighter. See packet-x11.c */ @@ -46,18 +46,18 @@ static const value_string keysym_vals_source[] = { { 0x0c8, "\x0c8" }, { 0x0c9, "\x0c9" }, { 0x0ca, "\x0ca" }, { 0x0cb, "\x0cb" }, { 0x0cc, "\x0cc" }, { 0x0cd, "\x0cd" }, { 0x0ce, "\x0ce" }, { 0x0cf, "\x0cf" }, - { 0x0d0, "\x0d0" }, { 0x0d1, "\x0d1" }, { 0x0d2, "\x0d2" }, { 0x0d3, "\x0d3" }, - { 0x0d4, "\x0d4" }, { 0x0d5, "\x0d5" }, { 0x0d6, "\x0d6" }, { 0x0d7, "\x0d7" }, - { 0x0d8, "\x0d8" }, { 0x0d9, "\x0d9" }, { 0x0da, "\x0da" }, { 0x0db, "\x0db" }, - { 0x0dc, "\x0dc" }, { 0x0dd, "\x0dd" }, { 0x0de, "\x0de" }, { 0x0df, "\x0df" }, - { 0x0e0, "\x0e0" }, { 0x0e1, "\x0e1" }, { 0x0e2, "\x0e2" }, { 0x0e3, "\x0e3" }, - { 0x0e4, "\x0e4" }, { 0x0e5, "\x0e5" }, { 0x0e6, "\x0e6" }, { 0x0e7, "\x0e7" }, - { 0x0e8, "\x0e8" }, { 0x0e9, "\x0e9" }, { 0x0ea, "\x0ea" }, { 0x0eb, "\x0eb" }, - { 0x0ec, "\x0ec" }, { 0x0ed, "\x0ed" }, { 0x0ee, "\x0ee" }, { 0x0ef, "\x0ef" }, - { 0x0f0, "\x0f0" }, { 0x0f1, "\x0f1" }, { 0x0f2, "\x0f2" }, { 0x0f3, "\x0f3" }, - { 0x0f4, "\x0f4" }, { 0x0f5, "\x0f5" }, { 0x0f6, "\x0f6" }, { 0x0f7, "\x0f7" }, - { 0x0f8, "\x0f8" }, { 0x0f9, "\x0f9" }, { 0x0fa, "\x0fa" }, { 0x0fb, "\x0fb" }, - { 0x0fc, "\x0fc" }, { 0x0fd, "\x0fd" }, { 0x0fe, "\x0fe" }, { 0x0ff, "\x0ff" }, + { 0x0d0, "\x0d0" }, { 0x0d1, "\x0d1" }, { 0x0d2, "\x0d2" }, { 0x0d3, "\x0d3" }, + { 0x0d4, "\x0d4" }, { 0x0d5, "\x0d5" }, { 0x0d6, "\x0d6" }, { 0x0d7, "\x0d7" }, + { 0x0d8, "\x0d8" }, { 0x0d9, "\x0d9" }, { 0x0da, "\x0da" }, { 0x0db, "\x0db" }, + { 0x0dc, "\x0dc" }, { 0x0dd, "\x0dd" }, { 0x0de, "\x0de" }, { 0x0df, "\x0df" }, + { 0x0e0, "\x0e0" }, { 0x0e1, "\x0e1" }, { 0x0e2, "\x0e2" }, { 0x0e3, "\x0e3" }, + { 0x0e4, "\x0e4" }, { 0x0e5, "\x0e5" }, { 0x0e6, "\x0e6" }, { 0x0e7, "\x0e7" }, + { 0x0e8, "\x0e8" }, { 0x0e9, "\x0e9" }, { 0x0ea, "\x0ea" }, { 0x0eb, "\x0eb" }, + { 0x0ec, "\x0ec" }, { 0x0ed, "\x0ed" }, { 0x0ee, "\x0ee" }, { 0x0ef, "\x0ef" }, + { 0x0f0, "\x0f0" }, { 0x0f1, "\x0f1" }, { 0x0f2, "\x0f2" }, { 0x0f3, "\x0f3" }, + { 0x0f4, "\x0f4" }, { 0x0f5, "\x0f5" }, { 0x0f6, "\x0f6" }, { 0x0f7, "\x0f7" }, + { 0x0f8, "\x0f8" }, { 0x0f9, "\x0f9" }, { 0x0fa, "\x0fa" }, { 0x0fb, "\x0fb" }, + { 0x0fc, "\x0fc" }, { 0x0fd, "\x0fd" }, { 0x0fe, "\x0fe" }, { 0x0ff, "\x0ff" }, { 0x13bc, "OE" }, { 0x13bd, "oe" }, { 0x13be, "Ydiaeresis" }, { 0x1a1, "Aogonek" }, { 0x1a2, "breve" }, { 0x1a3, "Lstroke" }, { 0x1a5, "Lcaron" }, { 0x1a6, "Sacute" }, { 0x1a9, "Scaron" }, { 0x1aa, "Scedilla" }, { 0x1ab, "Tcaron" }, diff --git a/packet-x11.c b/packet-x11.c index f4503eaba3..5b838bbbd1 100644 --- a/packet-x11.c +++ b/packet-x11.c @@ -2,24 +2,24 @@ * Routines for X11 dissection * Copyright 2000, Christophe Tronche <ch.tronche@computer.org> * - * $Id: packet-x11.c,v 1.45 2002/08/02 23:36:04 jmayer Exp $ + * $Id: packet-x11.c,v 1.46 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from README.developer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,7 +30,7 @@ * - keep track of Atom creation by server to be able to display * non-predefined atoms * - Idem for keysym <-> keycode ??? - * - Idem for fonts + * - Idem for fonts * - Subtree the request ids (that is x11.create-window.window and * x11.change-window.window should be distinct), and add hidden fields * (so we still have x11.window). @@ -243,7 +243,7 @@ static const value_string auto_repeat_mode_vals[] = { { 0, NULL } }; -static const value_string background_pixmap_vals[] = { +static const value_string background_pixmap_vals[] = { { 0, "None" }, { 1, "ParentRelative" }, { 0, NULL } @@ -256,7 +256,7 @@ static const value_string backing_store_vals[] = { { 0, NULL } }; -static const value_string border_pixmap_vals[] = { +static const value_string border_pixmap_vals[] = { { 0, "CopyFromParent" }, { 0, NULL } }; @@ -294,7 +294,7 @@ static const value_string coordinate_mode_vals[] = { { 0, NULL } }; -static const value_string direction_vals[] = { +static const value_string direction_vals[] = { { 0, "RaiseLowest" }, { 1, "LowerHighest" }, { 0, NULL } @@ -347,7 +347,7 @@ static const value_string function_vals[] = { { 12, "CopyInverted" }, { 13, "OrInverted" }, { 14, "Nand" }, - { 15, "Set" }, + { 15, "Set" }, { 0, NULL } }; @@ -415,7 +415,7 @@ static const value_string on_off_vals[] = { static const value_string opcode_vals[] = { { 1, "CreateWindow" }, { 2, "ChangeWindowAttributes" }, - { 3, "GetWindowAttributes" }, + { 3, "GetWindowAttributes" }, { 4, "DestroyWindow" }, { 5, "DestroySubwindows" }, { 6, "ChangeSaveSet" }, @@ -749,7 +749,7 @@ static void atom(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, interpretation = match_strval(v, cVALS(hfi -> strings)); } if (!interpretation) interpretation = "error in Xlib client program ?"; - proto_tree_add_uint_format(t, hf, tvb, *offsetp, 4, v, "%s: %u (%s)", + proto_tree_add_uint_format(t, hf, tvb, *offsetp, 4, v, "%s: %u (%s)", proto_registrar_get_nth(hf) -> name, v, interpretation); *offsetp += 4; } @@ -767,7 +767,7 @@ static void colorFlags(tvbuff_t *tvb, int *offsetp, proto_tree *t) unsigned do_red_green_blue = VALUE8(tvb, *offsetp); proto_item *ti; proto_tree *tt; - + if (do_red_green_blue) { int sep = FALSE; char buffer[512]; @@ -799,16 +799,16 @@ static void colorFlags(tvbuff_t *tvb, int *offsetp, proto_tree *t) "%s", buffer); tt = proto_item_add_subtree(ti, ett_x11_color_flags); if (do_red_green_blue & 0x1) - proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_red, tvb, *offsetp, 1, + proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_red, tvb, *offsetp, 1, do_red_green_blue & 0x1); if (do_red_green_blue & 0x2) - proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_green, tvb, *offsetp, 1, + proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_green, tvb, *offsetp, 1, do_red_green_blue & 0x2); if (do_red_green_blue & 0x4) - proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_blue, tvb, *offsetp, 1, + proto_tree_add_boolean(tt, hf_x11_coloritem_flags_do_blue, tvb, *offsetp, 1, do_red_green_blue & 0x4); if (do_red_green_blue & 0xf8) - proto_tree_add_boolean(tt, hf_x11_coloritem_flags_unused, tvb, *offsetp, 1, + proto_tree_add_boolean(tt, hf_x11_coloritem_flags_unused, tvb, *offsetp, 1, do_red_green_blue & 0xf8); } else proto_tree_add_uint_format(t, hf_x11_coloritem_flags, tvb, *offsetp, 1, do_red_green_blue, @@ -843,7 +843,7 @@ static void listOfArc(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, gint16 angle1 = VALUE16(tvb, *offsetp + 8); gint16 angle2 = VALUE16(tvb, *offsetp + 10); - proto_item *tti = proto_tree_add_none_format(tt, hf_x11_arc, tvb, *offsetp, 12, + proto_item *tti = proto_tree_add_none_format(tt, hf_x11_arc, tvb, *offsetp, 12, "arc: %dx%d+%d+%d, angle %d -> %d (%f degrees -> %f degrees)", width, height, x, y, angle1, angle2, angle1 / 64.0, angle2 / 64.0); @@ -1049,7 +1049,7 @@ static void listOfRectangle(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, width = VALUE16(tvb, *offsetp + 4); height = VALUE16(tvb, *offsetp + 6); - tti = proto_tree_add_none_format(tt, hf_x11_rectangle, tvb, *offsetp, 8, + tti = proto_tree_add_none_format(tt, hf_x11_rectangle, tvb, *offsetp, 8, "rectangle: %dx%d+%d+%d", width, height, x, y); ttt = proto_item_add_subtree(tti, ett_x11_rectangle); proto_tree_add_int(ttt, hf_x11_rectangle_x, tvb, *offsetp, 2, x); @@ -1078,7 +1078,7 @@ static void listOfSegment(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, x2 = VALUE16(tvb, *offsetp + 4); y2 = VALUE16(tvb, *offsetp + 6); - tti = proto_tree_add_none_format(tt, hf_x11_segment, tvb, *offsetp, 8, + tti = proto_tree_add_none_format(tt, hf_x11_segment, tvb, *offsetp, 8, "segment: (%d,%d)-(%d,%d)", x1, y1, x2, y2); ttt = proto_item_add_subtree(tti, ett_x11_segment); proto_tree_add_item(ttt, hf_x11_segment_x1, tvb, *offsetp, 2, little_endian); @@ -1115,7 +1115,7 @@ static void listOfString8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, int i; /* Compute total length */ - + int scanning_offset = *offsetp; /* Scanning pointer */ int l; for(i = length; i; i--) { @@ -1202,7 +1202,7 @@ static void string16_with_buffer_preallocated(tvbuff_t *tvb, proto_tree *t, if (truncated) { *dp++ = '.'; *dp++ = '.'; *dp++ = '.'; } *dp++ = '\0'; - proto_tree_add_string_format(t, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), "%s: %s", + proto_tree_add_string_format(t, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), "%s: %s", proto_registrar_get_nth(hf) -> name, *s); } else proto_tree_add_item(t, hf_bytes, tvb, offset, length, little_endian); @@ -1219,7 +1219,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, guint32 fid; /* Compute total length */ - + int scanning_offset = *offsetp; /* Scanning pointer */ int l; /* Length of an individual item */ int n = 0; /* Number of items */ @@ -1265,13 +1265,13 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, ttt = proto_item_add_subtree(tti, ett_x11_text_item); proto_tree_add_item(ttt, hf_x11_textitem_string_delta, tvb, *offsetp + 1, 1, little_endian); if (sizeIs16) - string16_with_buffer_preallocated(tvb, ttt, hf_x11_textitem_string_string16, + string16_with_buffer_preallocated(tvb, ttt, hf_x11_textitem_string_string16, hf_x11_textitem_string_string16_bytes, *offsetp + 2, l, &s, &allocated, little_endian); else - proto_tree_add_string_format(ttt, hf_x11_textitem_string_string8, tvb, + proto_tree_add_string_format(ttt, hf_x11_textitem_string_string8, tvb, *offsetp + 2, l, s, "\"%s\"", s); *offsetp += l + 2; } @@ -1326,7 +1326,7 @@ static guint32 field32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, hfi -> display == BASE_DEC ? "%s: %u (%s)" : "%s: 0x%08x (%s)", nameAsChar, v, enumValue); else - proto_tree_add_uint_format(t, hf, tvb, *offsetp, 4, v, + proto_tree_add_uint_format(t, hf, tvb, *offsetp, 4, v, hfi -> display == BASE_DEC ? "%s: %u" : "%s: 0x%08x", nameAsChar, v); *offsetp += 4; @@ -1470,7 +1470,7 @@ static void setOfKeyMask(tvbuff_t *tvb, int *offsetp, proto_tree *t, proto_tree_add_uint_format(t, hf_x11_modifiers_mask_AnyModifier, tvb, *offsetp, 2, 0x8000, "modifiers-masks: 0x8000 (AnyModifier)"); else { - ti = proto_tree_add_uint(t, hf_x11_modifiers_mask, tvb, *offsetp, 2, + ti = proto_tree_add_uint(t, hf_x11_modifiers_mask, tvb, *offsetp, 2, bitmask_value); bitmask_tree = proto_item_add_subtree(ti, ett_x11_set_of_key_mask); FLAG(modifiers, Shift); @@ -1483,7 +1483,7 @@ static void setOfKeyMask(tvbuff_t *tvb, int *offsetp, proto_tree *t, FLAG(modifiers, Mod5); FLAG_IF_NONZERO(modifiers, erroneous_bits); } - *offsetp += 2; + *offsetp += 2; } static void setOfPointerEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t, @@ -1892,7 +1892,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint case 118: /* SetModifierMapping */ return length == 1 + tvb_get_guint8(tvb, 1) * 2; - + case 127: /* NoOperation */ return length >= 1; @@ -1969,9 +1969,9 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo, */ state_info->byte_order = decision ? BYTE_ORDER_LE : BYTE_ORDER_BE; } - + /* - fprintf(stderr, "packet %d\tle %d\tbe %d\tlittle_endian %d\tcache %d\n", + fprintf(stderr, "packet %d\tle %d\tbe %d\tlittle_endian %d\tcache %d\n", pinfo->fd -> num, le, be, decision, decisionToCache); */ return decision; @@ -2058,7 +2058,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, OPCODE(); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", sep, val_to_str(opcode, opcode_vals, "Unknown (%u)")); @@ -2178,7 +2178,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, REQUEST_LENGTH(); WINDOW(window); BITMASK16(configure_window); - UNUSED(2); + UNUSED(2); BITFIELD(INT16, configure_window_mask, x); BITFIELD(INT16, configure_window_mask, y); BITFIELD(CARD16, configure_window_mask, width); @@ -2829,7 +2829,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, COLOR_FLAGS(color); REQUEST_LENGTH(); COLORMAP(cmap); - CARD32(pixel); + CARD32(pixel); v16 = FIELD16(name_length); UNUSED(2); STRING8(name, v16); @@ -3071,7 +3071,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, UNUSED(1); REQUEST_LENGTH(); break; - + case 127: /* NoOperation */ UNUSED(1); REQUEST_LENGTH(); @@ -3315,14 +3315,14 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, * Set the column appropriately. */ if (is_initial_creq) { - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Initial connection request"); } else { if (sep == NULL) { /* * We haven't set the column yet; set it. */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, "Requests"); /* @@ -3376,11 +3376,11 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures we will need to add the protocol subtree and manage it */ proto_item *ti; proto_tree *x11_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. */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Replies/events"); /* In the interest of speed, if "tree" is NULL, don't do any work not @@ -3404,9 +3404,9 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11"); - + if (pinfo->match_port == pinfo->destport) dissect_x11_requests(tvb, pinfo, tree); else @@ -3415,14 +3415,14 @@ dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register the protocol with Ethereal */ void proto_register_x11(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { /* { &hf_x11_FIELDABBREV, { "FIELDNAME", "x11.FIELDABBREV", - FIELDTYPE, FIELDBASE, FIELDCONVERT, BITMASK, + FIELDTYPE, FIELDBASE, FIELDCONVERT, BITMASK, "FIELDDESCR", HFILL } }, */ diff --git a/packet-x25.c b/packet-x25.c index f2171016dc..3086ea8701 100644 --- a/packet-x25.c +++ b/packet-x25.c @@ -2,22 +2,22 @@ * Routines for x25 packet disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-x25.c,v 1.68 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-x25.c,v 1.69 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1859,7 +1859,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else if (is_x_264 == 0) { /* It doesn't look like a UN TPDU, so compare the first octet of the CALL REQUEST packet with various X.263/ - ISO 9577 NLPIDs, as per Annex A of X.263/ISO 9577. */ + ISO 9577 NLPIDs, as per Annex A of X.263/ISO 9577. */ if (userdata_tree) { proto_tree_add_text(userdata_tree, tvb, localoffset, 1, @@ -1867,7 +1867,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str(spi, nlpid_vals, "Unknown (0x%02x)")); } localoffset++; - + /* * What's the dissector handle for this SPI? */ diff --git a/packet-xdmcp.c b/packet-xdmcp.c index 9b21daa59f..9192d1d823 100644 --- a/packet-xdmcp.c +++ b/packet-xdmcp.c @@ -2,22 +2,22 @@ * Routines for XDMCP message dissection * Copyright 2002, Pasi Eronen <pasi.eronen@nixu.com> * - * $Id: packet-xdmcp.c,v 1.2 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-xdmcp.c,v 1.3 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -113,13 +113,13 @@ static gint xdmcp_add_string(proto_tree *tree, gint hf, { char *str; guint len; - + len = tvb_get_ntohs(tvb, offset); str = g_malloc(len+1); stringCopy(str, tvb_get_ptr(tvb, offset+2, len), len); proto_tree_add_string(tree, hf, tvb, offset, len+2, str); g_free(str); - + return len+2; } @@ -163,7 +163,7 @@ static gint xdmcp_add_authorization_names(proto_tree *tree, anames_len); anames_tree = proto_item_add_subtree(anames_ti, ett_xdmcp_authorization_names); - + anames_len = tvb_get_guint8(tvb, offset); offset++; while (anames_len > 0) { @@ -178,7 +178,7 @@ static gint xdmcp_add_authorization_names(proto_tree *tree, /* * I didn't find any documentation for the XDMCP protocol, so * this is reverse-engineered from XFree86 source files - * xc/programs/xdm/xdmcp.c and xc/programs/Xserver/os/xdmcp.c. + * xc/programs/xdm/xdmcp.c and xc/programs/Xserver/os/xdmcp.c. */ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -193,7 +193,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Only version 1 exists, so this probably is not XDMCP at all... */ return; } - + if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "XDMCP"); if (check_col(pinfo->cinfo, COL_INFO)) @@ -202,7 +202,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_xdmcp, tvb, offset, -1, FALSE); xdmcp_tree = proto_item_add_subtree(ti, ett_xdmcp); - + proto_tree_add_uint(xdmcp_tree, hf_xdmcp_version, tvb, offset, 2, version); } @@ -217,14 +217,14 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, opcode_vals, "Unknown (0x%04x)")); - + } - + if (tree) { proto_tree_add_item(xdmcp_tree, hf_xdmcp_length, tvb, offset, 2, FALSE); offset += 2; - + switch (opcode) { case XDMCP_FORWARD_QUERY: { @@ -235,22 +235,22 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * families. */ if (alen == 4) { proto_tree_add_text(xdmcp_tree, tvb, offset, alen+2, - "Client address: %s", + "Client address: %s", ip_to_str(tvb_get_ptr(tvb, offset+2, 4))); offset += 6; } else { offset += xdmcp_add_bytes(xdmcp_tree, "Client address", tvb, offset); } - + plen = tvb_get_ntohs(tvb, offset); if (plen == 2) { proto_tree_add_text(xdmcp_tree, tvb, offset, plen+2, - "Client port: %u", + "Client port: %u", tvb_get_ntohs(tvb, offset+2)); offset += 4; } else { offset += xdmcp_add_bytes(xdmcp_tree, "Client port", tvb, offset); - } + } } /* fall-through */ @@ -259,7 +259,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case XDMCP_INDIRECT_QUERY: offset += xdmcp_add_authorization_names(xdmcp_tree, tvb, offset); break; - + case XDMCP_WILLING: offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_authentication_name, tvb, offset); @@ -268,25 +268,25 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_status, tvb, offset); break; - + case XDMCP_UNWILLING: offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_hostname, tvb, offset); offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_status, tvb, offset); break; - + case XDMCP_REQUEST: { proto_tree *clist_tree; proto_item *clist_ti; gint ctypes_len, caddrs_len, n; gint ctypes_start_offset, caddrs_offset; - + proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, offset, 2, FALSE); offset += 2; - + ctypes_len = tvb_get_guint8(tvb, offset); ctypes_start_offset = offset; caddrs_offset = offset + 1 + 2*ctypes_len; @@ -296,43 +296,43 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Error: Connection type/address arrays don't match"); return; } - + clist_ti = proto_tree_add_text(xdmcp_tree, tvb, ctypes_start_offset, -1, "Connections (%d)", ctypes_len); clist_tree = proto_item_add_subtree(clist_ti, ett_xdmcp_connections); - + offset++; caddrs_offset++; - + n = 1; while (ctypes_len > 0) { proto_item *connection_ti; proto_tree *connection_tree; const char *ip_string; - + gint alen; gint ctype = tvb_get_ntohs(tvb, offset); offset += 2; alen = tvb_get_ntohs(tvb, caddrs_offset); caddrs_offset += 2; - + if ((ctype == 0) && (alen == 4)) { ip_string = ip_to_str(tvb_get_ptr(tvb, caddrs_offset, 4)); } else { ip_string = NULL; } - - connection_ti = proto_tree_add_text(clist_tree, NULL, 0, 0, + + connection_ti = proto_tree_add_text(clist_tree, NULL, 0, 0, "Connection %d%s%s", n, (ip_string ? ": " : ""), (ip_string ? ip_string : "")); connection_tree = proto_item_add_subtree(connection_ti, ett_xdmcp_connection); - + proto_tree_add_text(connection_tree, tvb, offset-2, 2, - "Type: %s", + "Type: %s", val_to_str(ctype, family_vals, "Unknown (0x%04x)")); if ((ctype == 0) && (alen == 4)) { @@ -349,19 +349,19 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset = caddrs_offset; proto_item_set_len(clist_ti, offset - ctypes_start_offset); - + offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_authentication_name, tvb, offset); offset += xdmcp_add_bytes(xdmcp_tree, "Authentication data", tvb, offset); - + offset += xdmcp_add_authorization_names(xdmcp_tree, tvb, offset); - + offset += xdmcp_add_text(xdmcp_tree, "Manufacturer display ID", tvb, offset); break; } - + case XDMCP_ACCEPT: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); @@ -375,7 +375,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += xdmcp_add_bytes(xdmcp_tree, "Authorization data", tvb, offset); break; - + case XDMCP_DECLINE: offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_status, tvb, offset); @@ -384,51 +384,51 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += xdmcp_add_bytes(xdmcp_tree, "Authentication data", tvb, offset); break; - + case XDMCP_MANAGE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); offset += 4; - + proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, offset, 2, FALSE); offset += 2; - + offset += xdmcp_add_text(xdmcp_tree, "Display class", tvb, offset); break; - + case XDMCP_REFUSE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); offset += 4; break; - + case XDMCP_FAILED: proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); offset += 4; - + offset += xdmcp_add_string(xdmcp_tree, hf_xdmcp_status, tvb, offset); break; - + case XDMCP_KEEPALIVE: proto_tree_add_item(xdmcp_tree, hf_xdmcp_display_number, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); offset += 4; break; - + case XDMCP_ALIVE: - proto_tree_add_text(xdmcp_tree, tvb, offset, 1, + proto_tree_add_text(xdmcp_tree, tvb, offset, 1, "Session running: %s", (tvb_get_guint8(tvb, offset) ? "Yes" : "No")); offset++; - + proto_tree_add_item(xdmcp_tree, hf_xdmcp_session_id, tvb, offset, 4, FALSE); offset += 4; @@ -436,15 +436,15 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } } - + /* Register the protocol with Ethereal */ void proto_register_xdmcp(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_xdmcp_version, { "Version", "xdmcp.version", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Protocol version", HFILL } }, { &hf_xdmcp_opcode, diff --git a/packet-xot.c b/packet-xot.c index 17b3451528..5d2b97841a 100644 --- a/packet-xot.c +++ b/packet-xot.c @@ -3,22 +3,22 @@ * * Copyright 2000, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-xot.c,v 1.10 2002/04/09 08:15:02 guy Exp $ + * $Id: packet-xot.c,v 1.11 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -60,7 +60,7 @@ static void dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int length; proto_item *ti; proto_tree *xot_tree; - tvbuff_t *next_tvb; + tvbuff_t *next_tvb; while (tvb_reported_length_remaining(tvb, offset) != 0) { length_remaining = tvb_length_remaining(tvb, offset); @@ -125,7 +125,7 @@ static void dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TRY { if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "XOT"); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "XOT Version = %u, size = %u", version,plen ); @@ -133,7 +133,7 @@ static void dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_protocol_format(tree, proto_xot, tvb, offset, 4, "X.25 over TCP"); xot_tree = proto_item_add_subtree(ti, ett_xot); - + proto_tree_add_uint(xot_tree, hf_xot_version, tvb, offset, 2, version); proto_tree_add_uint(xot_tree, hf_xot_length, tvb, offset + 2, 2, plen); } @@ -174,7 +174,7 @@ static void dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Register the protocol with Ethereal */ -void +void proto_register_xot(void) { static hf_register_info hf[] = { diff --git a/packet-xyplex.c b/packet-xyplex.c index 9cad1ed70a..b83c19987e 100644 --- a/packet-xyplex.c +++ b/packet-xyplex.c @@ -3,24 +3,24 @@ * * Copyright 2002 Randy McEoin <rmceoin@pe.com> * - * $Id: packet-xyplex.c,v 1.1 2002/08/09 20:55:17 guy Exp $ + * $Id: packet-xyplex.c,v 1.2 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-yhoo.c b/packet-yhoo.c index dd405ac7dc..53a580b4d7 100644 --- a/packet-yhoo.c +++ b/packet-yhoo.c @@ -2,24 +2,24 @@ * Routines for yahoo messenger packet dissection * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-yhoo.c,v 1.24 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-yhoo.c,v 1.25 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * Copied from packet-tftp.c - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -126,8 +126,8 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "%s: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, + "%s: %s", ( strncmp(tvb_get_ptr(tvb, offset + 0, 4), "YPNS", 4) == 0 ) ? "Request" : "Response", val_to_str(tvb_get_letohl(tvb, offset + 12), yhoo_service_vals, "Unknown Service: %u") @@ -139,39 +139,39 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FALSE); yhoo_tree = proto_item_add_subtree(ti, ett_yhoo); - proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb, offset, 8, TRUE); offset += 8; - proto_tree_add_item(yhoo_tree, hf_yhoo_len, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_len, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_service, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_service, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_connection_id, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_connection_id, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_magic_id, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_magic_id, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_unknown1, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_unknown1, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_msgtype, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_msgtype, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(yhoo_tree, hf_yhoo_nick1, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_nick1, tvb, offset, 36, TRUE); offset += 36; - proto_tree_add_item(yhoo_tree, hf_yhoo_nick2, tvb, + proto_tree_add_item(yhoo_tree, hf_yhoo_nick2, tvb, offset, 36, TRUE); offset += 36; @@ -186,34 +186,34 @@ void proto_register_yhoo(void) { static hf_register_info hf[] = { - { &hf_yhoo_service, { + { &hf_yhoo_service, { "Service Type", "yhoo.service", FT_UINT32, BASE_DEC, VALS(yhoo_service_vals), 0, "Service Type", HFILL }}, - { &hf_yhoo_msgtype, { + { &hf_yhoo_msgtype, { "Message Type", "yhoo.msgtype", FT_UINT32, BASE_DEC, VALS(yhoo_msgtype_vals), 0, "Message Type Flags", HFILL }}, - { &hf_yhoo_connection_id, { + { &hf_yhoo_connection_id, { "Connection ID", "yhoo.connection_id", FT_UINT32, BASE_HEX, NULL, 0, "Connection ID", HFILL }}, - { &hf_yhoo_magic_id, { + { &hf_yhoo_magic_id, { "Magic ID", "yhoo.magic_id", FT_UINT32, BASE_HEX, NULL, 0, "Magic ID", HFILL }}, - { &hf_yhoo_unknown1, { + { &hf_yhoo_unknown1, { "Unknown 1", "yhoo.unknown1", FT_UINT32, BASE_HEX, NULL, 0, "Unknown 1", HFILL }}, - { &hf_yhoo_len, { + { &hf_yhoo_len, { "Packet Length", "yhoo.len", FT_UINT32, BASE_DEC, NULL, 0, "Packet Length", HFILL }}, - { &hf_yhoo_nick1, { + { &hf_yhoo_nick1, { "Real Nick (nick1)", "yhoo.nick1", FT_STRING, 0, NULL, 0, "Real Nick (nick1)", HFILL }}, - { &hf_yhoo_nick2, { + { &hf_yhoo_nick2, { "Active Nick (nick2)", "yhoo.nick2", FT_STRING, 0, NULL, 0, "Active Nick (nick2)", HFILL }}, - { &hf_yhoo_content, { + { &hf_yhoo_content, { "Content", "yhoo.content", FT_STRING, 0, NULL, 0, "Data portion of the packet", HFILL }}, - { &hf_yhoo_version, { + { &hf_yhoo_version, { "Version", "yhoo.version", FT_STRING, 0, NULL, 0, "Packet version identifier", HFILL }}, }; diff --git a/packet-yhoo.h b/packet-yhoo.h index d168565faf..3d1546088d 100644 --- a/packet-yhoo.h +++ b/packet-yhoo.h @@ -1,23 +1,23 @@ /* packet-yhoo.h * Definitions for packet disassembly structures and routines * - * $Id: packet-yhoo.h,v 1.7 2001/04/17 00:46:04 guy Exp $ + * $Id: packet-yhoo.h,v 1.8 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ypbind.c b/packet-ypbind.c index 9feecfa1a8..cd69505ed6 100644 --- a/packet-ypbind.c +++ b/packet-ypbind.c @@ -1,7 +1,7 @@ /* packet-ypbind.c * Routines for ypbind dissection * - * $Id: packet-ypbind.c,v 1.12 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-ypbind.c,v 1.13 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -50,7 +50,7 @@ static int dissect_ypbind_domain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { /* domain */ - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_ypbind_domain, offset, NULL); return offset; @@ -86,18 +86,18 @@ dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ switch(type){ case YPBIND_RESP_TYPE_SUCC_VAL: /* ip address */ - proto_tree_add_item(tree, hf_ypbind_addr, + proto_tree_add_item(tree, hf_ypbind_addr, tvb, offset, 4, FALSE); offset += 4; /* port */ - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_ypbind_port, offset); - + break; case YPBIND_RESP_TYPE_FAIL_VAL: /* error */ - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_ypbind_resp_type, offset); break; } @@ -109,22 +109,22 @@ static int dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { /* domain */ - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_ypbind_domain, offset, NULL); /* ip address */ - proto_tree_add_item(tree, hf_ypbind_addr, + proto_tree_add_item(tree, hf_ypbind_addr, tvb, offset, 4, FALSE); offset += 4; /* port */ - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_ypbind_port, offset); - + /* version */ - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_ypbind_setdom_version, offset); - + return offset; } @@ -142,7 +142,7 @@ static const vsff ypbind1_proc[] = { static const vsff ypbind2_proc[] = { { YPBINDPROC_NULL, "NULL", NULL, NULL }, - { YPBINDPROC_DOMAIN, "DOMAIN", + { YPBINDPROC_DOMAIN, "DOMAIN", dissect_ypbind_domain_v2_request, dissect_ypbind_domain_v2_reply}, { YPBINDPROC_SETDOM, "SETDOMAIN", dissect_ypbind_setdomain_v2_request, NULL}, diff --git a/packet-ypbind.h b/packet-ypbind.h index fca819e06d..1368b00c66 100644 --- a/packet-ypbind.h +++ b/packet-ypbind.h @@ -1,22 +1,22 @@ /* packet-ypbind.h * - * $Id: packet-ypbind.h,v 1.2 2000/08/11 13:33:53 deniel Exp $ + * $Id: packet-ypbind.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-yppasswd.c b/packet-yppasswd.c index 064d5b1f97..975c87e286 100644 --- a/packet-yppasswd.c +++ b/packet-yppasswd.c @@ -1,7 +1,7 @@ /* packet-yppasswd.c * Routines for yppasswd dissection * - * $Id: packet-yppasswd.c,v 1.7 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-yppasswd.c,v 1.8 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -52,7 +52,7 @@ dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t proto_item *lock_item = NULL; proto_tree *lock_tree = NULL; - offset = dissect_rpc_string(tvb, tree, hf_yppasswd_oldpass, + offset = dissect_rpc_string(tvb, tree, hf_yppasswd_oldpass, offset, NULL); lock_item = proto_tree_add_item(tree, hf_yppasswd_newpw, tvb, @@ -60,19 +60,19 @@ dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t lock_tree = proto_item_add_subtree(lock_item, ett_yppasswd_newpw); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_yppasswd_newpw_name, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_yppasswd_newpw_passwd, offset, NULL); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_yppasswd_newpw_uid, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_yppasswd_newpw_gid, offset); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_yppasswd_newpw_gecos, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_yppasswd_newpw_dir, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_yppasswd_newpw_shell, offset, NULL); return offset; diff --git a/packet-yppasswd.h b/packet-yppasswd.h index 5339cd2efa..ce8b26332c 100644 --- a/packet-yppasswd.h +++ b/packet-yppasswd.h @@ -1,21 +1,21 @@ /* packet-yppasswd.h * - * $Id: packet-yppasswd.h,v 1.2 2001/06/12 06:32:39 guy Exp $ + * $Id: packet-yppasswd.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ypserv.c b/packet-ypserv.c index a3b0261c13..275cf4e46d 100644 --- a/packet-ypserv.c +++ b/packet-ypserv.c @@ -1,7 +1,7 @@ /* packet-ypserv.c * Routines for ypserv dissection * - * $Id: packet-ypserv.c,v 1.23 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-ypserv.c,v 1.24 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -99,7 +99,7 @@ dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre { offset = dissect_rpc_string(tvb,tree,hf_ypserv_domain,offset,NULL); } - + return offset; } @@ -112,7 +112,7 @@ dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr offset, 4, tvb_get_ntohl(tvb,offset)); } - offset += 4; + offset += 4; return offset; } @@ -125,7 +125,7 @@ dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL); offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL); } - + return offset; } @@ -138,7 +138,7 @@ dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre offset = dissect_rpc_string(tvb, tree, hf_ypserv_value,offset, NULL); } - + return offset; } @@ -163,13 +163,13 @@ dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * had a "ypreq_nokey" as the argument, I'm assuming that "yp.x" * is buggy. */ - + if ( tree ) { offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL); offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL); } - + return offset; } @@ -184,7 +184,7 @@ dissect_firstnext_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto offset = dissect_rpc_string(tvb, tree, hf_ypserv_value, offset, NULL); offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL); } - + return offset; } @@ -198,7 +198,7 @@ dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL); offset = dissect_rpc_string(tvb, tree, hf_ypserv_key, offset, NULL); } - + return offset; } @@ -217,7 +217,7 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * } offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_domain, offset, NULL); - + offset = dissect_rpc_string(tvb, sub_tree, hf_ypserv_map, offset, NULL); offset = dissect_rpc_uint32(tvb, sub_tree, hf_ypserv_ordernum, offset); @@ -252,7 +252,7 @@ dissect_ypreq_nokey(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre { offset = dissect_rpc_string(tvb, tree, hf_ypserv_domain, offset, NULL); - + offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, NULL); return offset; @@ -325,23 +325,23 @@ static const vsff ypserv1_proc[] = { NULL, NULL }, { YPPROC_DOMAIN_NONACK, "DOMAIN_NONACK", NULL, NULL }, - { YPPROC_MATCH, "MATCH", + { YPPROC_MATCH, "MATCH", NULL, NULL }, - { YPPROC_FIRST, "FIRST", + { YPPROC_FIRST, "FIRST", NULL, NULL }, - { YPPROC_NEXT, "NEXT", + { YPPROC_NEXT, "NEXT", NULL, NULL }, - { YPPROC_XFR, "XFR", + { YPPROC_XFR, "XFR", NULL, NULL }, - { YPPROC_CLEAR, "CLEAR", + { YPPROC_CLEAR, "CLEAR", NULL, NULL }, - { YPPROC_ALL, "ALL", + { YPPROC_ALL, "ALL", NULL, NULL }, - { YPPROC_MASTER, "MASTER", + { YPPROC_MASTER, "MASTER", NULL, NULL }, - { YPPROC_ORDER, "ORDER", + { YPPROC_ORDER, "ORDER", NULL, NULL }, - { YPPROC_MAPLIST, "MAPLIST", + { YPPROC_MAPLIST, "MAPLIST", NULL, NULL }, { 0, NULL, NULL, NULL } }; @@ -353,23 +353,23 @@ static const vsff ypserv2_proc[] = { dissect_domain_call, dissect_domain_reply }, { YPPROC_DOMAIN_NONACK, "DOMAIN_NONACK", dissect_domain_call, dissect_domain_reply }, - { YPPROC_MATCH, "MATCH", + { YPPROC_MATCH, "MATCH", dissect_match_call, dissect_match_reply }, - { YPPROC_FIRST, "FIRST", + { YPPROC_FIRST, "FIRST", dissect_first_call, dissect_firstnext_reply }, - { YPPROC_NEXT, "NEXT", + { YPPROC_NEXT, "NEXT", dissect_next_call, dissect_firstnext_reply }, - { YPPROC_XFR, "XFR", + { YPPROC_XFR, "XFR", dissect_xfr_call, dissect_xfr_reply }, - { YPPROC_CLEAR, "CLEAR", + { YPPROC_CLEAR, "CLEAR", NULL, NULL }, - { YPPROC_ALL, "ALL", + { YPPROC_ALL, "ALL", dissect_ypreq_nokey, dissect_ypresp_all }, - { YPPROC_MASTER, "MASTER", + { YPPROC_MASTER, "MASTER", dissect_ypreq_nokey, dissect_ypresp_master }, - { YPPROC_ORDER, "ORDER", + { YPPROC_ORDER, "ORDER", dissect_ypreq_nokey, dissect_ypresp_order }, - { YPPROC_MAPLIST, "MAPLIST", + { YPPROC_MAPLIST, "MAPLIST", dissect_domain_call, dissect_ypresp_maplist }, { 0, NULL, NULL, NULL } }; @@ -381,7 +381,7 @@ proto_register_ypserv(void) { /*static struct true_false_string okfailed = { "Ok", "Failed" };*/ static struct true_false_string yesno = { "Yes", "No" }; - + static hf_register_info hf[] = { { &hf_ypserv_domain, { "Domain", "ypserv.domain", FT_STRING, BASE_DEC, diff --git a/packet-ypserv.h b/packet-ypserv.h index 5bcebc8ff0..a6d2c14a6c 100644 --- a/packet-ypserv.h +++ b/packet-ypserv.h @@ -1,22 +1,22 @@ /* packet-ypserv.h * - * $Id: packet-ypserv.h,v 1.2 2000/08/11 13:33:53 deniel Exp $ + * $Id: packet-ypserv.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-ypxfr.h b/packet-ypxfr.h index 2fb2470f26..e7e6a53c31 100644 --- a/packet-ypxfr.h +++ b/packet-ypxfr.h @@ -1,22 +1,22 @@ /* packet-ypxfr.h * - * $Id: packet-ypxfr.h,v 1.2 2000/08/11 13:33:52 deniel Exp $ + * $Id: packet-ypxfr.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/packet-zebra.c b/packet-zebra.c index c53d769365..6737b702b6 100644 --- a/packet-zebra.c +++ b/packet-zebra.c @@ -3,22 +3,22 @@ * * Jochen Friedrich <jochen@scram.de> * - * $Id: packet-zebra.c,v 1.22 2002/08/02 23:36:05 jmayer Exp $ + * $Id: packet-zebra.c,v 1.23 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -206,7 +206,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, if (request) break; /* Request just subscribes to messages */ - proto_tree_add_item(tree, hf_zebra_interface, + proto_tree_add_item(tree, hf_zebra_interface, tvb, offset, INTERFACE_NAMSIZ, FALSE); offset += INTERFACE_NAMSIZ; @@ -217,7 +217,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, proto_tree_add_item(tree, hf_zebra_intflags, tvb, offset, 4, FALSE); offset += 4; - + proto_tree_add_item(tree, hf_zebra_metric, tvb, offset, 4, FALSE); offset += 4; @@ -455,7 +455,7 @@ dissect_zebra_request(proto_tree *tree, gboolean request, tvbuff_t *tvb, break; } } - + static void dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -472,7 +472,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, request? "ZEBRA Request" : "ZEBRA Reply"); } if (tree) { @@ -486,7 +486,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 command; guint16 len; proto_tree *zebra_request_tree; - + if (left < 3) break; len = tvb_get_ntohs(tvb, offset); diff --git a/pcap-util.c b/pcap-util.c index d2a04cf3a5..4f44078060 100644 --- a/pcap-util.c +++ b/pcap-util.c @@ -1,22 +1,22 @@ /* pcap-util.c * Utility routines for packet capture * - * $Id: pcap-util.c,v 1.9 2002/08/02 23:36:05 jmayer Exp $ + * $Id: pcap-util.c,v 1.10 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -392,10 +392,10 @@ GList * get_interface_list(int *err, char *err_str) { GList *il = NULL; wchar_t *names; - char *win95names; + char *win95names; char newname[MAX_WIN_IF_NAME_LEN + 1]; int i, j, done; - + /* On Windows pcap_lookupdev is implemented by calling * PacketGetAdapterNames. According to the documentation I can find * (http://winpcap.polito.it/docs/dll.htm#PacketGetAdapterNames) @@ -412,8 +412,8 @@ get_interface_list(int *err, char *err_str) { * of the adapters, in ASCII format, separated by a single ASCII * "\0" . The string is terminated by a double ASCII "\0". * - * We prepend the device name with a description to make it easier - * for users to choose the interface they want. This requires that + * We prepend the device name with a description to make it easier + * for users to choose the interface they want. This requires that * we split out the device name later on in tethereal.c and gtk/main.c. * It might be useful to have separate structures for raw names and * descriptions at some point. @@ -426,7 +426,7 @@ get_interface_list(int *err, char *err_str) { char* desc = 0; int desc_pos = 0; - if (names[0]<256) { + if (names[0]<256) { /* If names[0] is less than 256 it means the first byte is 0 This implies that we are using unicode characters */ while(*(names+desc_pos) || *(names+desc_pos-1)) @@ -434,61 +434,61 @@ get_interface_list(int *err, char *err_str) { desc_pos++; /* Step over the extra '\0' */ desc = (char*)(names + desc_pos); /* cast *after* addition */ - do - { + do + { j = 0; while (*desc) { if (j < MAX_WIN_IF_NAME_LEN) - newname[j++] = *desc++; + newname[j++] = *desc++; } *desc++; if (j < MAX_WIN_IF_NAME_LEN - 1) { - newname[j++] = ':'; - newname[j++] = ' '; + newname[j++] = ':'; + newname[j++] = ' '; } while (names[i] != 0) { - if (j < MAX_WIN_IF_NAME_LEN) - newname[j++] = names[i++]; + if (j < MAX_WIN_IF_NAME_LEN) + newname[j++] = names[i++]; } - i++; - if (names[i] == 0) - done = 1; - newname[j] = 0; - il = g_list_append(il, g_strdup(newname)); - } while (!done); - } - else { + i++; + if (names[i] == 0) + done = 1; + newname[j] = 0; + il = g_list_append(il, g_strdup(newname)); + } while (!done); + } + else { /* Otherwise we are in Windows 95/98 and using ascii(8 bit) characters */ - win95names=(char *)names; + win95names=(char *)names; while(*(win95names+desc_pos) || *(win95names+desc_pos-1)) desc_pos++; desc_pos++; /* Step over the extra '\0' */ desc = win95names + desc_pos; - do - { + do + { j = 0; while (*desc) { if (j < MAX_WIN_IF_NAME_LEN) - newname[j++] = *desc++; + newname[j++] = *desc++; } *desc++; if (j < MAX_WIN_IF_NAME_LEN - 1) { - newname[j++] = ':'; - newname[j++] = ' '; + newname[j++] = ':'; + newname[j++] = ' '; } while (win95names[i] != 0) { - if (j < MAX_WIN_IF_NAME_LEN) - newname[j++] = win95names[i++]; + if (j < MAX_WIN_IF_NAME_LEN) + newname[j++] = win95names[i++]; } - i++; - if (win95names[i] == 0) - done = 1; - newname[j] = 0; - il = g_list_append(il, g_strdup(newname)); - } while (!done); - } + i++; + if (win95names[i] == 0) + done = 1; + newname[j] = 0; + il = g_list_append(il, g_strdup(newname)); + } while (!done); + } } return(il); } diff --git a/pcap-util.h b/pcap-util.h index 7b2f6ca206..64f99f32e3 100644 --- a/pcap-util.h +++ b/pcap-util.h @@ -1,22 +1,22 @@ /* pcap-util.h * Utility definitions for packet capture * - * $Id: pcap-util.h,v 1.1 2001/11/09 07:44:48 guy Exp $ + * $Id: pcap-util.h,v 1.2 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/ppptypes.h b/ppptypes.h index feb03c4803..318028f58a 100644 --- a/ppptypes.h +++ b/ppptypes.h @@ -1,23 +1,23 @@ /* ppptypes.h * Defines PPP packet types. * - * $Id: ppptypes.h,v 1.13 2002/08/18 15:30:38 gerald Exp $ + * $Id: ppptypes.h,v 1.14 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/prefs-int.h b/prefs-int.h index fd3136c0ec..15bc5d6b90 100644 --- a/prefs-int.h +++ b/prefs-int.h @@ -2,22 +2,22 @@ * Definitions for implementation of preference handling routines; * used by "friends" of the preferences type. * - * $Id: prefs-int.h,v 1.8 2002/06/16 00:58:37 guy Exp $ + * $Id: prefs-int.h,v 1.9 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,22 +1,22 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.88 2002/08/02 23:36:06 jmayer Exp $ + * $Id: prefs.c,v 1.89 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -342,7 +342,7 @@ gboolean prefs_is_registered_protocol(char *name) { module_t *m = find_module(name); - + return (m != NULL && !m->obsolete); } @@ -627,13 +627,13 @@ put_string_list(GList *sl) pref_str[cur_len - 2] = '\0'; return(pref_str); -} +} static void clear_string_list(GList *sl) { GList *l = sl; - + while (l) { g_free(l->data); l = g_list_remove_link(l, l); @@ -658,7 +658,7 @@ find_val_for_string(const char *needle, const enum_val_t *haystack, if (strcasecmp(needle, haystack[i].name) == 0) { return haystack[i].value; } - i++; + i++; } return default_value; } @@ -677,13 +677,13 @@ find_index_from_string_array(char *needle, char **haystack, int default_value) if (strcmp(needle, haystack[i]) == 0) { return i; } - i++; + i++; } return default_value; } /* Preferences file format: - * - Configuration directives start at the beginning of the line, and + * - Configuration directives start at the beginning of the line, and * are terminated with a colon. * - Directives can be continued on the next line by preceding them with * whitespace. @@ -865,7 +865,7 @@ read_prefs(int *gpf_errno_return, char **gpf_path_return, /* Construct the pathname of the user's preferences file. */ pf_path = get_persconffile_path(PF_NAME, FALSE); - + /* Read the user's preferences file, if it exists. */ *pf_path_return = NULL; if ((pf = fopen(pf_path, "r")) != NULL) { @@ -883,7 +883,7 @@ read_prefs(int *gpf_errno_return, char **gpf_path_return, *pf_path_return = pf_path; } } - + return &prefs; } @@ -921,7 +921,7 @@ read_prefs_file(const char *pf_path, FILE *pf) var_len = 0; continue; } - + switch (state) { case START: if (isalnum(got_c)) { @@ -1356,18 +1356,18 @@ set_pref(gchar *pref_name, gchar *value) } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_MAIN_HEIGHT) == 0) { prefs.gui_geometry_main_height = strtol(value, NULL, 10); -/* handle the capture options */ +/* handle the capture options */ } else if (strcmp(pref_name, PRS_CAP_DEVICE) == 0) { if (prefs.capture_device != NULL) g_free(prefs.capture_device); prefs.capture_device = g_strdup(value); } else if (strcmp(pref_name, PRS_CAP_PROM_MODE) == 0) { - prefs.capture_prom_mode = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); + prefs.capture_prom_mode = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); } else if (strcmp(pref_name, PRS_CAP_REAL_TIME) == 0) { - prefs.capture_real_time = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); + prefs.capture_real_time = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); } else if (strcmp(pref_name, PRS_CAP_AUTO_SCROLL) == 0) { - prefs.capture_auto_scroll = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); - + prefs.capture_auto_scroll = ((strcasecmp(value, "true") == 0)?TRUE:FALSE); + /* handle the global options */ } else if (strcmp(pref_name, PRS_NAME_RESOLVE) == 0 || strcmp(pref_name, PRS_CAP_NAME_RESOLVE) == 0) { @@ -1551,7 +1551,7 @@ set_pref(gchar *pref_name, gchar *value) return PREFS_SET_OBSOLETE; /* no such preference any more */ } } - + return PREFS_SET_OK; } @@ -1678,7 +1678,7 @@ write_prefs(char **pf_path_return) *pf_path_return = pf_path; return errno; } - + fputs("# Configuration file for Ethereal " VERSION ".\n" "#\n" "# This file is regenerated each time preferences are saved within\n" @@ -1,22 +1,22 @@ /* prefs.h * Definitions for preference handling routines * - * $Id: prefs.h,v 1.39 2002/08/01 03:15:25 jmayer Exp $ + * $Id: prefs.h,v 1.40 2002/08/28 21:00:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,24 +1,24 @@ /* print.c * Routines for printing packet analysis trees. * - * $Id: print.c,v 1.56 2002/08/02 23:36:06 jmayer Exp $ + * $Id: print.c,v 1.57 2002/08/28 21:00:40 jmayer Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -150,7 +150,7 @@ void proto_tree_print_node(GNode *node, gpointer data) label_ptr = label_str; proto_item_fill_label(fi, label_str); } - + print_line(pdata->fh, pdata->level, pdata->format, label_ptr); /* If it's uninterpreted data, dump it (unless our caller will @@ -1,24 +1,24 @@ /* print.h * Definitions for printing packet analysis trees. * - * $Id: print.h,v 1.28 2002/06/29 09:45:06 guy Exp $ + * $Id: print.h,v 1.29 2002/08/28 21:00:40 jmayer Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -43,9 +43,9 @@ typedef struct { FALSE if we should print only if not dissected. */ gboolean expand_all; /* TRUE if we should expand all levels; FALSE if we should expand as displayed. */ - gboolean suppress_unmarked; /* TRUE if we should suppress unmarked - frames FALSE if we should allow - both marked and unmarked frames to be + gboolean suppress_unmarked; /* TRUE if we should suppress unmarked + frames FALSE if we should allow + both marked and unmarked frames to be printed. */ } print_args_t; diff --git a/progress_dlg.h b/progress_dlg.h index 974a4ce807..33b26e0e45 100644 --- a/progress_dlg.h +++ b/progress_dlg.h @@ -1,22 +1,22 @@ /* progress_dlg.h * Definitions for progress dialog box routines * - * $Id: progress_dlg.h,v 1.3 2002/08/28 10:07:28 guy Exp $ + * $Id: progress_dlg.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -45,7 +45,7 @@ typedef struct progdlg progdlg_t; * The fourth argument is a pointer to a Boolean variable that will be * set to TRUE if the user hits that button. */ -progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, +progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, const gchar *stop_title, gboolean *stop_flag); /* Create a progress dialog, but only if it's not likely to disappear @@ -57,7 +57,7 @@ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, * current progress (0..1). */ progdlg_t * -delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, +delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, const gchar *stop_title, gboolean *stop_flag, GTimeVal *start_time, gfloat progress); diff --git a/proto_hier_stats.c b/proto_hier_stats.c index b95c3aa538..9ff7041c60 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -1,7 +1,7 @@ /* proto_hier_stats.c * Routines for calculating statistics based on protocol. * - * $Id: proto_hier_stats.c,v 1.15 2002/08/28 10:07:30 guy Exp $ + * $Id: proto_hier_stats.c,v 1.16 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -86,7 +86,7 @@ process_node(proto_item *ptree_node, GNode *parent_stat_node, ph_stats_t *ps, gu g_assert(finfo); stat_node = find_stat_node(parent_stat_node, finfo->hfinfo); - + /* Assert that the finfo is related to a protocol, not a field. */ g_assert(finfo->hfinfo->parent == -1); diff --git a/proto_hier_stats.h b/proto_hier_stats.h index f7c3f775fc..b5a61f94aa 100644 --- a/proto_hier_stats.h +++ b/proto_hier_stats.h @@ -1,21 +1,21 @@ /* proto_hier_stats.h * - * $Id: proto_hier_stats.h,v 1.3 2002/01/21 07:36:48 guy Exp $ + * $Id: proto_hier_stats.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -2,24 +2,24 @@ * Definitions for generating PostScript(R) packet output. * * - * $Id: ps.h,v 1.4 2001/11/13 23:55:30 gram Exp $ + * $Id: ps.h,v 1.5 2002/08/28 21:00:41 jmayer Exp $ * Gilbert Ramirez <gram@alumni.rice.edu> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/ptvcursor.c b/ptvcursor.c index 3d1cadbef0..9c482a3959 100644 --- a/ptvcursor.c +++ b/ptvcursor.c @@ -1,24 +1,24 @@ /* ptvcursor.c - * + * * Proto Tree TVBuff cursor * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: ptvcursor.c,v 1.6 2002/05/09 23:50:25 gram Exp $ + * $Id: ptvcursor.c,v 1.7 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/ptvcursor.h b/ptvcursor.h index 830c0f0027..fb1e1d95f6 100644 --- a/ptvcursor.h +++ b/ptvcursor.h @@ -1,24 +1,24 @@ /* ptvcursor.h - * + * * Proto Tree TVBuff cursor * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: ptvcursor.h,v 1.6 2002/05/09 23:50:25 gram Exp $ + * $Id: ptvcursor.h,v 1.7 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -4,20 +4,20 @@ * Creates random packet traces. Useful for debugging sniffers by testing * assumptions about the veracity of the data found in the packet. * - * $Id: randpkt.c,v 1.14 2002/05/18 14:58:00 gerald Exp $ + * $Id: randpkt.c,v 1.15 2002/08/28 21:00:41 jmayer Exp $ * * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,20 +1,20 @@ /* rdps.c * - * $Id: rdps.c,v 1.4 2002/06/29 09:45:06 guy Exp $ + * $Id: rdps.c,v 1.5 2002/08/28 21:00:41 jmayer Exp $ * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/reassemble.c b/reassemble.c index bcf7baf4f7..ea75d8bc15 100644 --- a/reassemble.c +++ b/reassemble.c @@ -1,22 +1,22 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c,v 1.22 2002/06/17 01:12:13 guy Exp $ + * $Id: reassemble.c,v 1.23 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -194,7 +194,7 @@ fragment_table_init(GHashTable **fragment_table) if (*fragment_table != NULL) { /* * The fragment hash table exists. - * + * * Remove all entries and free fragment data for * each entry. (The key and value data is freed * by "reassemble_init()".) @@ -217,7 +217,7 @@ reassembled_table_init(GHashTable **reassembled_table) if (*reassembled_table != NULL) { /* * The reassembled-packet hash table exists. - * + * * Remove all entries and free fragment data for * each entry. (The key and value data is freed * by "reassemble_init()".) @@ -254,14 +254,14 @@ reassemble_init(void) /* This function cleans up the stored state and removes the reassembly data and * (with one exception) all allocated memory for matching reassembly. - * + * * The exception is : - * If the PDU was already completely reassembled, then the buffer containing the + * If the PDU was already completely reassembled, then the buffer containing the * reassembled data WILL NOT be free()d, and the pointer to that buffer will be * returned. * Othervise the function will return NULL. * - * So, if you call fragment_delete and it returns non-NULL, YOU are responsible to + * So, if you call fragment_delete and it returns non-NULL, YOU are responsible to * g_free() that buffer. */ unsigned char * @@ -315,7 +315,7 @@ fragment_get(packet_info *pinfo, guint32 id, GHashTable *fragment_table) key.id = id; fd_head = g_hash_table_lookup(fragment_table, &key); - + return fd_head; } @@ -330,11 +330,11 @@ fragment_get(packet_info *pinfo, guint32 id, GHashTable *fragment_table) * using fragment_set_tot_len immediately after doing fragment_add for the first packet. * * note that for FD_BLOCKSEQUENCE tot_len is the index for the tail fragment. - * i.e. since the block numbers start at 0, if we specify tot_len==2, that + * i.e. since the block numbers start at 0, if we specify tot_len==2, that * actually means we want to defragment 3 blocks, block 0, 1 and 2. */ void -fragment_set_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table, +fragment_set_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table, guint32 tot_len) { fragment_data *fd_head; @@ -379,7 +379,7 @@ fragment_get_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table) When this function is called, the fh MUST already exist, i.e. the fh MUST be created by the initial call to fragment_add() before this function is called. - Also note that this function MUST be called to indicate a fh will be + Also note that this function MUST be called to indicate a fh will be extended (increase the already stored data) */ @@ -417,7 +417,7 @@ fragment_set_partial_reassembly(packet_info *pinfo, guint32 id, GHashTable *frag * * 01-2002 * Once the fh is defragmented (= FD_DEFRAGMENTED set), it can be - * extended using the FD_PARTIAL_REASSEMBLY flag. This flag should be set + * extended using the FD_PARTIAL_REASSEMBLY flag. This flag should be set * using fragment_set_partial_reassembly() before calling fragment_add * with the new fragment. FD_TOOLONGFRAGMENT and FD_MULTIPLETAILS flags * are lowered when a new extension process is started. @@ -506,7 +506,7 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, fd_head->datalen=0; } - if (!more_frags) { + if (!more_frags) { /* * This is the tail fragment in the sequence. */ @@ -585,7 +585,7 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, */ max = 0; for (fd_i=fd_head->next;fd_i;fd_i=fd_i->next) { - if ( ((fd_i->offset)<=max) && + if ( ((fd_i->offset)<=max) && ((fd_i->offset+fd_i->len)>max) ){ max = fd_i->offset+fd_i->len; } @@ -607,7 +607,7 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, /* we have received an entire packet, defragment it and - * free all fragments + * free all fragments */ /* store old data just in case */ old_data=fd_head->data; @@ -626,7 +626,7 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, fd_i->flags |= FD_OVERLAPCONFLICT; fd_head->flags |= FD_OVERLAPCONFLICT; } - } + } /* dfpos is always >= than fd_i->offset */ /* No gaps can exist here, max_loop(above) does this */ if( fd_i->offset+fd_i->len > dfpos ) @@ -682,7 +682,7 @@ fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, fd->len = frag_data_len; fd->data = NULL; - if (!more_frags) { + if (!more_frags) { /* * This is the tail fragment in the sequence. */ @@ -787,7 +787,7 @@ fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, /* we have received an entire packet, defragment it and - * free all fragments + * free all fragments */ size=0; last_fd=NULL; @@ -1110,7 +1110,7 @@ show_fragment(fragment_data *fd, int offset, fragment_items *fit, { if (fd->flags & (FD_OVERLAP|FD_OVERLAPCONFLICT |FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) { - /* this fragment has some flags set, create a subtree + /* this fragment has some flags set, create a subtree * for it and display the flags. */ proto_tree *fet=NULL; @@ -1123,7 +1123,7 @@ show_fragment(fragment_data *fd, int offset, fragment_items *fit, } else { hf = *(fit->hf_fragment); } - fei = proto_tree_add_none_format(ft, hf, + fei = proto_tree_add_none_format(ft, hf, tvb, offset, fd->len, "Frame:%u payload:%u-%u", fd->frame, @@ -1131,32 +1131,32 @@ show_fragment(fragment_data *fd, int offset, fragment_items *fit, offset+fd->len-1); fet = proto_item_add_subtree(fei, *(fit->ett_fragment)); if (fd->flags&FD_OVERLAP) { - proto_tree_add_boolean(fet, + proto_tree_add_boolean(fet, *(fit->hf_fragment_overlap), - tvb, 0, 0, + tvb, 0, 0, TRUE); } if (fd->flags&FD_OVERLAPCONFLICT) { - proto_tree_add_boolean(fet, - *(fit->hf_fragment_overlap_conflict), - tvb, 0, 0, + proto_tree_add_boolean(fet, + *(fit->hf_fragment_overlap_conflict), + tvb, 0, 0, TRUE); } if (fd->flags&FD_MULTIPLETAILS) { - proto_tree_add_boolean(fet, + proto_tree_add_boolean(fet, *(fit->hf_fragment_multiple_tails), - tvb, 0, 0, + tvb, 0, 0, TRUE); } if (fd->flags&FD_TOOLONGFRAGMENT) { - proto_tree_add_boolean(fet, - *(fit->hf_fragment_too_long_fragment), - tvb, 0, 0, + proto_tree_add_boolean(fet, + *(fit->hf_fragment_too_long_fragment), + tvb, 0, 0, TRUE); } } else { /* nothing of interest for this fragment */ - proto_tree_add_none_format(ft, *(fit->hf_fragment), + proto_tree_add_none_format(ft, *(fit->hf_fragment), tvb, offset, fd->len, "Frame:%u payload:%u-%u", fd->frame, @@ -1173,7 +1173,7 @@ show_fragment_errs_in_col(fragment_data *fd_head, fragment_items *fit, if (fd_head->flags & (FD_OVERLAPCONFLICT |FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) { if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "[Illegal %s]", fit->tag); return TRUE; } @@ -1184,7 +1184,7 @@ show_fragment_errs_in_col(fragment_data *fd_head, fragment_items *fit, /* This function will build the fragment subtree; it's for fragments reassembled with "fragment_add()". - + It will return TRUE if there were fragmentation errors or FALSE if fragmentation was ok. */ @@ -1199,18 +1199,18 @@ show_fragment_tree(fragment_data *fd_head, fragment_items *fit, /* It's not fragmented. */ pinfo->fragmented = FALSE; - fi = proto_tree_add_item(tree, *(fit->hf_fragments), + fi = proto_tree_add_item(tree, *(fit->hf_fragments), tvb, 0, -1, FALSE); ft = proto_item_add_subtree(fi, *(fit->ett_fragments)); for (fd=fd_head->next; fd; fd=fd->next) show_fragment(fd, fd->offset, fit, ft, tvb); return show_fragment_errs_in_col(fd_head, fit, pinfo); -} +} /* This function will build the fragment subtree; it's for fragments reassembled with "fragment_add_seq()" or "fragment_add_seq_check()". - + It will return TRUE if there were fragmentation errors or FALSE if fragmentation was ok. */ @@ -1226,7 +1226,7 @@ show_fragment_seq_tree(fragment_data *fd_head, fragment_items *fit, /* It's not fragmented. */ pinfo->fragmented = FALSE; - fi = proto_tree_add_item(tree, *(fit->hf_fragments), + fi = proto_tree_add_item(tree, *(fit->hf_fragments), tvb, 0, -1, FALSE); ft = proto_item_add_subtree(fi, *(fit->ett_fragments)); offset = 0; @@ -1236,4 +1236,4 @@ show_fragment_seq_tree(fragment_data *fd_head, fragment_items *fit, } return show_fragment_errs_in_col(fd_head, fit, pinfo); -} +} diff --git a/reassemble.h b/reassemble.h index dbe333c8e1..90d5db35d7 100644 --- a/reassemble.h +++ b/reassemble.h @@ -1,22 +1,22 @@ /* reassemble.h * Declarations of outines for {fragment,segment} reassembly * - * $Id: reassemble.h,v 1.9 2002/06/07 10:11:41 guy Exp $ + * $Id: reassemble.h,v 1.10 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -32,8 +32,8 @@ /* there are overlapping fragments */ #define FD_OVERLAP 0x0002 -/* overlapping fragments contain different data */ -#define FD_OVERLAPCONFLICT 0x0004 +/* overlapping fragments contain different data */ +#define FD_OVERLAPCONFLICT 0x0004 /* more than one fragment which indicates end-of data */ #define FD_MULTIPLETAILS 0x0008 @@ -129,15 +129,15 @@ fragment_add_seq_check(tvbuff_t *tvb, int offset, packet_info *pinfo, GHashTable *reassembled_table, guint32 frag_number, guint32 frag_data_len, gboolean more_frags); -/* to specify how much to reassemble, for fragmentation where last fragment can not be +/* to specify how much to reassemble, for fragmentation where last fragment can not be * identified by flags or such. * note that for FD_BLOCKSEQUENCE tot_len is the index for the tail fragment. - * i.e. since the block numbers start at 0, if we specify tot_len==2, that + * i.e. since the block numbers start at 0, if we specify tot_len==2, that * actually means we want to defragment 3 blocks, block 0, 1 and 2. * */ void -fragment_set_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table, +fragment_set_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table, guint32 tot_len); /* to resad whatever totlen previously set */ @@ -148,7 +148,7 @@ fragment_get_tot_len(packet_info *pinfo, guint32 id, GHashTable *fragment_table) * This function will set the partial reassembly flag(FD_PARTIAL_REASSEMBLY) for a fh. * When this function is called, the fh MUST already exist, i.e. * the fh MUST be created by the initial call to fragment_add() before - * this function is called. Also note that this function MUST be called to indicate + * this function is called. Also note that this function MUST be called to indicate * a fh will be extended (increase the already stored data). After calling this function, * and if FD_DEFRAGMENTED is set, the reassembly process will be continued. */ @@ -165,8 +165,8 @@ fragment_get(packet_info *pinfo, guint32 id, GHashTable *fragment_table); * Except if the PDU is completely reassembled, then it would NOT deallocate the * buffer holding the reassembled data but instead return the pointer to that * buffer. - * - * So, if you call fragment_delete and it returns non-NULL, YOU are responsible to + * + * So, if you call fragment_delete and it returns non-NULL, YOU are responsible to * g_free() that buffer. */ unsigned char * @@ -174,7 +174,7 @@ fragment_delete(packet_info *pinfo, guint32 id, GHashTable *fragment_table); typedef struct _fragment_items { - gint *ett_fragment; + gint *ett_fragment; gint *ett_fragments; int *hf_fragments; diff --git a/register.h b/register.h index 3e418876e3..1660839259 100644 --- a/register.h +++ b/register.h @@ -1,23 +1,23 @@ /* register.h * Definitions for protocol registration * - * $Id: register.h,v 1.2 2000/04/04 06:17:30 guy Exp $ + * $Id: register.h,v 1.3 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/ringbuffer.c b/ringbuffer.c index bfc34ee914..922d9b12ae 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -1,22 +1,22 @@ /* ringbuffer.c * Routines for packet capture windows * - * $Id: ringbuffer.c,v 1.4 2002/08/02 23:36:07 jmayer Exp $ + * $Id: ringbuffer.c,v 1.5 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -79,15 +79,15 @@ typedef struct _ringbuf_data { guint curr_file_num; /* Number of the current file */ gchar* fprefix; /* Filename prefix */ gchar* fsuffix; /* Filename suffix */ -} ringbuf_data; +} ringbuf_data; /* Create the ringbuffer data structure */ static ringbuf_data rb_data; -/* +/* * Initialize the ringbuffer data structure */ -int +int ringbuf_init(const char *capfile_name, guint num_files) { int save_file_fd; @@ -115,7 +115,7 @@ ringbuf_init(const char *capfile_name, guint num_files) /* open failed */ return -1; } - + /* allocate memory */ rb_data.files = (rb_file *)calloc(num_files, sizeof(rb_file)); if (rb_data.files == NULL) { @@ -175,17 +175,17 @@ ringbuf_init(const char *capfile_name, guint num_files) return -1; } } - + /* done */ rb_data.curr_file_num = 0; return rb_data.files[0].fd; } -/* +/* * Calls wtap_dump_fdopen() for all ringbuffer files */ -wtap_dumper* -ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, +wtap_dumper* +ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, int snaplen, int *err) { unsigned int i; @@ -229,7 +229,7 @@ ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, return rb_data.files[0].pdh; } -/* +/* * Switches to the next ringbuffer file */ gboolean @@ -249,7 +249,7 @@ ringbuf_switch_file(capture_file *cf, wtap_dumper **pdh, int *err) } return FALSE; } - + /* get the next file number */ next_file_num = (rb_data.curr_file_num + 1) % rb_data.num_files; /* prepare the file if it was already used */ @@ -285,7 +285,7 @@ ringbuf_switch_file(capture_file *cf, wtap_dumper **pdh, int *err) return TRUE; } -/* +/* * Calls wtap_dump_close() for all ringbuffer files */ gboolean @@ -349,9 +349,9 @@ ringbuf_wtap_dump_close(capture_file *cf, int *err) if (!rb_data.files[i].is_new) { /* rename the file */ snprintf(filenum,5+1,"%05d",rb_data.files[i].number); - strftime(timestr,14+1,"%Y%m%d%H%M%S", + strftime(timestr,14+1,"%Y%m%d%H%M%S", localtime(&(rb_data.files[i].creation_time))); - new_name = g_strconcat(rb_data.fprefix,"_", filenum, "_", timestr, + new_name = g_strconcat(rb_data.fprefix,"_", filenum, "_", timestr, rb_data.fsuffix, NULL); if (rename(rb_data.files[i].name, new_name) != 0) { /* save the latest error */ @@ -374,14 +374,14 @@ ringbuf_wtap_dump_close(capture_file *cf, int *err) return ret_val; } -/* +/* * Frees all memory allocated by the ringbuffer */ void ringbuf_free() -{ +{ unsigned int i; - + if (rb_data.files != NULL) { for (i=0; i < rb_data.num_files; i++) { g_free(rb_data.files[i].name); @@ -394,14 +394,14 @@ ringbuf_free() g_free(rb_data.fsuffix); } -/* +/* * Frees all memory allocated by the ringbuffer */ -void +void ringbuf_error_cleanup(void) { unsigned int i; - + if (rb_data.files == NULL) { ringbuf_free(); return; @@ -425,7 +425,7 @@ ringbuf_error_cleanup(void) unlink(rb_data.files[i].name); } } - /* free the memory */ + /* free the memory */ ringbuf_free(); } diff --git a/ringbuffer.h b/ringbuffer.h index c970d19117..b88828d88c 100644 --- a/ringbuffer.h +++ b/ringbuffer.h @@ -1,22 +1,22 @@ /* capture.h * Definitions for packet capture windows * - * $Id: ringbuffer.h,v 1.1 2001/12/04 08:45:04 guy Exp $ + * $Id: ringbuffer.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -31,12 +31,12 @@ #include "wiretap/wtap.h" /* minimum number of ringbuffer files */ -#define RINGBUFFER_MIN_NUM_FILES 2 +#define RINGBUFFER_MIN_NUM_FILES 2 /* maximum number of ringbuffer files */ -#define RINGBUFFER_MAX_NUM_FILES MIN(10,FOPEN_MAX) +#define RINGBUFFER_MAX_NUM_FILES MIN(10,FOPEN_MAX) int ringbuf_init(const char *capture_name, guint num_files); -wtap_dumper* ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, +wtap_dumper* ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, int snaplen, int *err); gboolean ringbuf_switch_file(capture_file *cf, wtap_dumper **pdh, int *err); gboolean ringbuf_wtap_dump_close(capture_file *cf, int *err); diff --git a/rpc_defrag.h b/rpc_defrag.h index 0f556f7504..f674876456 100644 --- a/rpc_defrag.h +++ b/rpc_defrag.h @@ -1,22 +1,22 @@ /* rpc-defrag.h * Declarations for RPC defragmentation * - * $Id: rpc_defrag.h,v 1.3 2002/06/05 11:32:14 sahlberg Exp $ + * $Id: rpc_defrag.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/simple_dialog.h b/simple_dialog.h index 2b248d2047..4346eaa973 100644 --- a/simple_dialog.h +++ b/simple_dialog.h @@ -2,23 +2,23 @@ * Definitions for dialog box routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: simple_dialog.h,v 1.3 2001/07/22 10:25:48 guy Exp $ + * $Id: simple_dialog.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -2,7 +2,7 @@ * Defines for smb packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: smb.h,v 1.43 2002/08/21 21:31:54 tpot Exp $ + * $Id: smb.h,v 1.44 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12,12 +12,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -124,7 +124,7 @@ #define SMBE_badformat 11 /* Invalid format */ #define SMBE_badaccess 12 /* Invalid open mode */ #define SMBE_baddata 13 /* Invalid data (only from ioctl call) */ -#define SMBE_res 14 +#define SMBE_res 14 #define SMBE_baddrive 15 /* Invalid drive */ #define SMBE_remcd 16 /* Attempt to delete current directory */ #define SMBE_diffdevice 17 /* rename/move across different filesystems */ @@ -181,9 +181,9 @@ #define SMBE_smbcmd 64 /* Unrecognised command */ #define SMBE_srverror 65 /* smb server internal error */ #define SMBE_filespecs 67 /* fid and pathname invalid combination */ -#define SMBE_badlink 68 +#define SMBE_badlink 68 #define SMBE_badpermits 69 /* Access specified for a file is not valid */ -#define SMBE_badpid 70 +#define SMBE_badpid 70 #define SMBE_setattrmode 71 /* attribute mode invalid */ #define SMBE_paused 81 /* Message server paused */ #define SMBE_msgoff 82 /* Not receiving messages */ @@ -196,7 +196,7 @@ #define SMBE_useMPX 250 /* temporarily unable to use raw mode, use MPX mode */ #define SMBE_useSTD 251 /* temporarily unable to use raw mode, use standard mode */ #define SMBE_contMPX 252 /* resume MPX mode */ -#define SMBE_badPW 253 /* Check this out ... */ +#define SMBE_badPW 253 /* Check this out ... */ #define SMBE_nosupport 0xFFFF #define SMBE_unknownsmb 22 /* from NT 3.5 response */ @@ -230,7 +230,7 @@ #define SMB_SIF_TID_IS_IPC 0x0001 typedef struct { guint32 frame_req, frame_res; - nstime_t req_time; + nstime_t req_time; guint16 flags; int cmd; void *extra_info; diff --git a/snprintf-imp.h b/snprintf-imp.h index 3a374bf539..4f3b0860e2 100644 --- a/snprintf-imp.h +++ b/snprintf-imp.h @@ -1,27 +1,27 @@ /* - * $Id: snprintf-imp.h,v 1.3 2000/08/11 22:03:03 guy Exp $ + * $Id: snprintf-imp.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $ */ /* Unix snprintf implementation. Version 1.2 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. It can be redistribute also under the terms of GNU Library General Public License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Revision History: 1.2: @@ -74,7 +74,7 @@ Alain Magloire: alainm@rcsm.ee.mcgill.ca */ -/* +/* * For the FLOATING POINT FORMAT : * the challenge was finding a way to * manipulate the Real numbers without having @@ -90,24 +90,24 @@ Alain Magloire: alainm@rcsm.ee.mcgill.ca fraction = b(1)*10^-1 + b(2)*10^-2 + ... where: - 0 <= a(i) => 9 - 0 <= b(i) => 9 - + 0 <= a(i) => 9 + 0 <= b(i) => 9 + from then it was simple math */ /* * size of the buffer for the integral part - * and the fraction part + * and the fraction part */ #define MAX_INT 99 + 1 /* 1 for the null */ #define MAX_FRACT 29 + 1 -/* +/* * numtoa() uses PRIVATE buffers to store the results, * So this function is not reentrant */ -#define itoa(n) numtoa(n, 10, 0, (char **)0) +#define itoa(n) numtoa(n, 10, 0, (char **)0) #define otoa(n) numtoa(n, 8, 0, (char **)0) #define htoa(n) numtoa(n, 16, 0, (char **)0) #define dtoa(n, p, f) numtoa(n, 10, p, f) @@ -207,7 +207,7 @@ struct DATA { if ((p)->space == FOUND && (d) > 0.) \ PUT_CHAR(' ', p) -/* pad right */ +/* pad right */ #define PAD_RIGHT(p) \ if ((p)->width > 0 && (p)->justify != LEFT) \ for (; (p)->width > 0; (p)->width--) \ diff --git a/snprintf.c b/snprintf.c index 233c0cd024..be45f15c25 100644 --- a/snprintf.c +++ b/snprintf.c @@ -1,27 +1,27 @@ /* - * $Id: snprintf.c,v 1.13 2001/07/12 07:06:25 guy Exp $ + * $Id: snprintf.c,v 1.14 2002/08/28 21:00:41 jmayer Exp $ */ /* Unix snprintf implementation. Version 1.2 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. It can be redistribute also under the terms of GNU Library General Public License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Revision History: 1.2: @@ -59,7 +59,7 @@ */ PRIVATE double pow_10(int n) -{ +{ int i; double P; @@ -71,7 +71,7 @@ pow_10(int n) } /* - * Find the integral part of the log in base 10 + * Find the integral part of the log in base 10 * Note: this not a real log10() I just need and approximation(integerpart) of x in: 10^x ~= r @@ -80,7 +80,7 @@ pow_10(int n) */ PRIVATE int log_10(double r) -{ +{ int i = 0; double result = 1.; @@ -105,7 +105,7 @@ log_10(double r) */ PRIVATE double integral(double real, double * ip) -{ +{ int j; double i, s, p; double real_integral = 0.; @@ -139,11 +139,11 @@ integral(double real, double * ip) } #define PRECISION 1.e-6 -/* +/* * return an ascii representation of the integral part of the number * and set fract to be an ascii representation of the fraction part * the container for the fraction and the integral part or staticly - * declare with fix size + * declare with fix size */ PRIVATE char * numtoa(double number, int base, int precision, char ** fract) @@ -158,7 +158,7 @@ numtoa(double number, int base, int precision, char ** fract) int ch; /* taking care of the obvious case: 0.0 */ - if (number == 0.) { + if (number == 0.) { integral_part[0] = '0'; integral_part[1] = '\0'; fraction_part[0] = '0'; @@ -170,7 +170,7 @@ numtoa(double number, int base, int precision, char ** fract) if ((sign = number) < 0.) { number = -number; digits--; /* sign consume one digit */ - } + } fraction = integral(number, &ip); number = ip; @@ -185,11 +185,11 @@ numtoa(double number, int base, int precision, char ** fract) ch = (int)((fp + PRECISION)*base); /* force to round */ integral_part[i] = (ch <= 9) ? ch + '0' : ch + 'a' - 10; if (! isxdigit((unsigned char)integral_part[i])) /* bail out overflow !! */ - break; + break; number = ip; } } - + /* Oh No !! out of bound, ho well fill it up ! */ if (number != 0.) for (i = 0; i < digits; ++i) @@ -203,7 +203,7 @@ numtoa(double number, int base, int precision, char ** fract) /* reverse every thing */ for ( i--, j = 0; j < i; j++, i--) - SWAP_INT(integral_part[i], integral_part[j]); + SWAP_INT(integral_part[i], integral_part[j]); /* the fractionnal part */ for (i=0, fp=fraction; precision > 0 && i < MAX_FRACT ; i++, precision-- ) { @@ -311,7 +311,7 @@ floating(struct DATA *p, double d) ((d > 0. && p->justify == RIGHT) ? 1:0) - ((p->space == FOUND) ? 1:0) - strlen(tmp) - p->precision - 1; - PAD_RIGHT(p); + PAD_RIGHT(p); PUT_PLUS(d, p); PUT_SPACE(d, p); while (*tmp) { /* the integral */ @@ -322,12 +322,12 @@ floating(struct DATA *p, double d) PUT_CHAR('.', p); /* put the '.' */ if (*p->pf == 'g' || *p->pf == 'G') /* smash the trailing zeros */ for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) - tmp2[i] = '\0'; + tmp2[i] = '\0'; for (; *tmp2; tmp2++) PUT_CHAR(*tmp2, p); /* the fraction */ - + PAD_LEFT(p); -} +} /* %e %E %g exponent representation */ PRIVATE void @@ -339,12 +339,12 @@ exponent(struct DATA *p, double d) DEF_PREC(p); j = log_10(d); d = d / pow_10(j); /* get the Mantissa */ - d = ROUND(d, p); + d = ROUND(d, p); tmp = dtoa(d, p->precision, &tmp2); /* 1 for unit, 1 for the '.', 1 for 'e|E', * 1 for '+|-', 3 for 'exp' */ /* calculate how much padding need */ - p->width = p->width - + p->width = p->width - ((d > 0. && p->justify == RIGHT) ? 1:0) - ((p->space == FOUND) ? 1:0) - p->precision - 7; PAD_RIGHT(p); @@ -358,7 +358,7 @@ exponent(struct DATA *p, double d) PUT_CHAR('.', p); /* the '.' */ if (*p->pf == 'g' || *p->pf == 'G') /* smash the trailing zeros */ for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) - tmp2[i] = '\0'; + tmp2[i] = '\0'; for (; *tmp2; tmp2++) PUT_CHAR(*tmp2, p); /* the fraction */ @@ -415,7 +415,7 @@ conv_flag(char * s, struct DATA * p) case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* gob all the digits */ - for (i = 0; isdigit((unsigned char)*s); i++, s++) + for (i = 0; isdigit((unsigned char)*s); i++, s++) if (i < MAX_FIELD/2 - 1) number[i] = *s; number[i] = '\0'; @@ -461,10 +461,10 @@ vsnprintf(char *string, size_t length, const char * format, va_list args) case 'f': /* float, double */ STAR_ARGS(&data); d = va_arg(args, double); - floating(&data, d); + floating(&data, d); state = 0; break; - case 'g': + case 'g': case 'G': STAR_ARGS(&data); DEF_PREC(&data); @@ -516,7 +516,7 @@ vsnprintf(char *string, size_t length, const char * format, va_list args) octal(&data, d); state = 0; break; - case 'x': + case 'x': case 'X': /* hexadecimal */ STAR_ARGS(&data); if (data.a_long == FOUND) @@ -550,11 +550,11 @@ vsnprintf(char *string, size_t length, const char * format, va_list args) state = 0; break; case '#': case ' ': case '+': case '*': - case '-': case '.': case '0': case '1': + case '-': case '.': case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* initialize width and precision */ - for (i = 0; isflag((unsigned char)*data.pf); i++, data.pf++) + for (i = 0; isflag((unsigned char)*data.pf); i++, data.pf++) if (i < MAX_FIELD - 1) conv_field[i] = *data.pf; conv_field[i] = '\0'; @@ -738,7 +738,7 @@ void main() printf("abc%n", &i); printf("%d\n", i); snprintf(holder, sizeof holder, "abc%n", &i); printf("%s", holder); printf("%d\n\n", i); - + printf("%%*.*s --> 10.10\n"); snprintf(holder, sizeof holder, "%*.*s\n", 10, 10, BLURB); printf("%*.*s\n", 10, 10, BLURB); @@ -751,7 +751,7 @@ void main() #define BIG "Hello this is a too big string for the buffer" /* printf("A buffer to small of 10, trying to put this:\n");*/ - printf("<%%>, %s\n", BIG); + printf("<%%>, %s\n", BIG); i = snprintf(holder, 10, "%s\n", BIG); printf("<%s>\n", BIG); printf("<%s>\n", holder); diff --git a/statusbar.h b/statusbar.h index a7b3b4903b..0695a6d66a 100644 --- a/statusbar.h +++ b/statusbar.h @@ -1,22 +1,22 @@ /* statusbar.h * Definitions for status bar UI routines * - * $Id: statusbar.h,v 1.1 2001/06/05 07:39:31 guy Exp $ + * $Id: statusbar.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/strerror.c b/strerror.c index 4f7a136ca9..1ad86bd1b0 100644 --- a/strerror.c +++ b/strerror.c @@ -1,6 +1,6 @@ /* strerror.c * - * $Id: strerror.c,v 1.1 1999/06/14 21:46:36 guy Exp $ + * $Id: strerror.c,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/strerror.h b/strerror.h index e584938e23..d625a1fb1a 100644 --- a/strerror.h +++ b/strerror.h @@ -1,6 +1,6 @@ /* strerror.h * - * $Id: strerror.h,v 1.2 2000/08/11 13:33:51 deniel Exp $ + * $Id: strerror.h,v 1.3 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/strptime.h b/strptime.h index 100dbcef68..5bb6162330 100644 --- a/strptime.h +++ b/strptime.h @@ -1,6 +1,6 @@ /* strptime.h * - * $Id: strptime.h,v 1.1 2001/06/02 06:21:13 guy Exp $ + * $Id: strptime.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -10,12 +10,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/tethereal.c b/tethereal.c index ba21ec9167..22d8a50de2 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.152 2002/08/20 20:49:29 jmayer Exp $ + * $Id: tethereal.c,v 1.153 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -183,7 +183,7 @@ static capture_options capture_opts = { }; #endif -static void +static void print_usage(gboolean print_ver) { int i; @@ -385,7 +385,7 @@ main(int argc, char *argv[]) /* Load Wpcap, if possible */ load_wpcap(); #endif - + /* Initialize the capture file struct */ cfile.plist = NULL; cfile.plist_end = NULL; @@ -451,7 +451,7 @@ main(int argc, char *argv[]) #else /* no SNMP library */ g_string_append(comp_info_str, ", without UCD SNMP"); #endif - + /* Now get our args */ while ((opt = getopt(argc, argv, "a:b:c:Df:F:hi:lnN:o:pqr:R:s:St:vw:Vx")) != -1) { switch (opt) { @@ -459,7 +459,7 @@ main(int argc, char *argv[]) #ifdef HAVE_LIBPCAP if (set_autostop_criterion(optarg) == FALSE) { fprintf(stderr, "ethereal: Invalid or unknown -a flag \"%s\"\n", optarg); - exit(1); + exit(1); } #else capture_option_specified = TRUE; @@ -650,7 +650,7 @@ main(int argc, char *argv[]) break; } } - + /* If no capture filter or read filter has been specified, and there are still command-line arguments, treat them as the tokens of a capture filter (if no "-r" flag was specified) or a read filter (if a "-r" @@ -694,16 +694,16 @@ main(int argc, char *argv[]) else { err = test_for_fifo(cfile.save_file); switch (err) { - + case ENOENT: /* it doesn't exist, so we'll be creating it, and it won't be a FIFO */ case 0: /* found it, but it's not a FIFO */ break; - + case ESPIPE: /* it is a FIFO */ ld.output_to_pipe = TRUE; break; - + default: /* couldn't stat it */ fprintf(stderr, "tethereal: Error testing whether capture file is a pipe: %s\n", @@ -773,7 +773,7 @@ main(int argc, char *argv[]) exit(1); } - /* Build the column format array */ + /* Build the column format array */ col_init(&cfile.cinfo, prefs->num_cols); for (i = 0; i < cfile.cinfo.num_cols; i++) { cfile.cinfo.col_fmt[i] = get_column_format(i); @@ -796,14 +796,14 @@ main(int argc, char *argv[]) capture_opts.snaplen = WTAP_MAX_PACKET_SIZE; else if (capture_opts.snaplen < MIN_PACKET_SIZE) capture_opts.snaplen = MIN_PACKET_SIZE; - + /* Check the value range of the ringbuffer_num_files parameter */ if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES) capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES; else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES) capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES; #endif - + if (rfilter != NULL) { if (!dfilter_compile(rfilter, &rfcode)) { fprintf(stderr, "tethereal: %s\n", dfilter_error_msg); @@ -981,7 +981,7 @@ capture(int out_file_type) * only for filters that check for broadcast IP addresses, so * we just warn the user, and punt and use 0. */ - fprintf(stderr, + fprintf(stderr, "Warning: Couldn't obtain netmask info (%s).\n", lookup_net_err_str); netmask = 0; } @@ -1051,7 +1051,7 @@ capture(int out_file_type) /* Let the user know what interface was chosen. */ fprintf(stderr, "Capturing on %s\n", cfile.iface); - /* initialize capture stop conditions */ + /* initialize capture stop conditions */ init_capture_stop_conditions(); /* create stop conditions */ if (capture_opts.has_autostop_filesize) @@ -1140,7 +1140,7 @@ capture(int out_file_type) in effect. */ ld.go = FALSE; } else if (cnd_stop_capturesize != NULL && - cnd_eval(cnd_stop_capturesize, + cnd_eval(cnd_stop_capturesize, (guint32)wtap_get_bytes_dumped(ld.pdh))) { /* We're saving the capture to a file, and the capture file reached its maximum size. */ @@ -1170,7 +1170,7 @@ capture(int out_file_type) } } /* inpkts > 0 */ } /* while (ld.go) */ - + /* delete stop conditions */ if (cnd_stop_capturesize != NULL) cnd_delete(cnd_stop_capturesize); @@ -1491,7 +1491,7 @@ fill_in_fdata(frame_data *fdata, capture_file *cf, cf->esec = fdata->rel_secs; cf->eusec = fdata->rel_usecs; } - + /* Get the time elapsed between the previous displayed packet and this packet. */ compute_timestamp_diff(&fdata->del_secs, &fdata->del_usecs, @@ -2017,7 +2017,7 @@ open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf) cf->progbar_nextstep = 0; firstsec = 0, firstusec = 0; prevsec = 0, prevusec = 0; - + return (0); fail: diff --git a/text2pcap.c b/text2pcap.c index 5c2fafe809..0c47f55019 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -6,22 +6,22 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.c,v 1.21 2002/08/02 23:36:07 jmayer Exp $ - * + * $Id: text2pcap.c,v 1.22 2002/08/28 21:00:41 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -115,7 +115,7 @@ /*--- Options --------------------------------------------------------------------*/ /* Debug level */ -static int debug = 0; +static int debug = 0; /* Be quiet */ static int quiet = FALSE; @@ -193,15 +193,15 @@ typedef enum { } parser_state_t; static parser_state_t state = INIT; -static const char *state_str[] = {"Init", - "Start-of-line", +static const char *state_str[] = {"Init", + "Start-of-line", "Offset", "Byte", "Text" }; static const char *token_str[] = {"", - "Byte", + "Byte", "Offset", "Directive", "Text", @@ -217,7 +217,7 @@ typedef struct { } hdr_ethernet_t; static hdr_ethernet_t HDR_ETHERNET = { - {0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, + {0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, {0x02, 0x02, 0x02, 0x02, 0x02, 0x02}, 0}; @@ -353,7 +353,7 @@ in_checksum (void *buf, unsigned long count) } /* Add left-over byte, if any */ - if( count > 0 ) + if( count > 0 ) sum += * (unsigned char *) addr; /* Fold 32-bit sum to 16 bits */ @@ -366,85 +366,85 @@ in_checksum (void *buf, unsigned long count) /* The CRC32C code is taken from draft-ietf-tsvwg-sctpcsum-01.txt. * That code is copyrighted by D. Otis and has been modified. */ - -#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF]) -static unsigned long crc_c[256] = -{ -0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, -0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, -0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL, -0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L, -0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, -0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, -0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, -0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL, -0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL, -0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, -0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, -0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, -0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L, -0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL, -0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, -0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, -0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, -0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L, -0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L, -0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, -0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, -0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, -0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L, -0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L, -0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, -0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, -0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, -0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L, -0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L, -0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, -0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, -0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, -0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL, -0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L, -0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, -0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, -0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, -0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL, -0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL, -0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, -0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, -0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, -0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL, -0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L, -0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, -0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, -0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, -0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL, -0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L, -0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, -0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, -0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, -0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL, -0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L, -0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, -0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, -0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, -0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L, -0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L, -0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, -0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, -0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, -0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL, -0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L, -}; - + +#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF]) +static unsigned long crc_c[256] = +{ +0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, +0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, +0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL, +0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L, +0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, +0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, +0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, +0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL, +0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL, +0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, +0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, +0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, +0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L, +0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL, +0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, +0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, +0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, +0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L, +0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L, +0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, +0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, +0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, +0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L, +0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L, +0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, +0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, +0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, +0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L, +0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L, +0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, +0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, +0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, +0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL, +0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L, +0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, +0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, +0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, +0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL, +0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL, +0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, +0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, +0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, +0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL, +0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L, +0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, +0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, +0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, +0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL, +0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L, +0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, +0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, +0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, +0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL, +0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L, +0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, +0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, +0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, +0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L, +0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L, +0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, +0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, +0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, +0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL, +0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L, +}; + static unsigned long crc32c(const unsigned char* buf, unsigned int len, unsigned long crc32_init) { - unsigned int i; - unsigned long crc32; - + unsigned int i; + unsigned long crc32; + crc32 = crc32_init; - for (i = 0; i < len; i++) - CRC32C(crc32, buf[i]); + for (i = 0; i < len; i++) + CRC32C(crc32, buf[i]); return ( crc32 ); } @@ -454,7 +454,7 @@ finalize_crc32c(unsigned long crc32) { unsigned long result; unsigned char byte0,byte1,byte2,byte3; - + result = ~crc32; byte0 = result & 0xff; byte1 = (result>>8) & 0xff; @@ -478,7 +478,7 @@ number_of_padding_bytes (unsigned long length) } /*---------------------------------------------------------------------- - * Write current packet out + * Write current packet out */ static void write_current_packet (void) @@ -514,7 +514,7 @@ write_current_packet (void) ph.incl_len = length; ph.orig_len = length; fwrite(&ph, sizeof(ph), 1, output_file); - + /* Write Ethernet header */ if (hdr_ethernet) { HDR_ETHERNET.l3pid = g_htons(hdr_ethernet_proto); @@ -535,10 +535,10 @@ write_current_packet (void) HDR_UDP.source_port = g_htons(hdr_udp_src); HDR_UDP.dest_port = g_htons(hdr_udp_dest); HDR_UDP.length = g_htons(udp_length); - + fwrite(&HDR_UDP, sizeof(HDR_UDP), 1, output_file); } - + /* Compute DATA chunk header and append padding */ if (hdr_data_chunk) { HDR_DATA_CHUNK.type = hdr_data_chunk_type; @@ -548,12 +548,12 @@ write_current_packet (void) HDR_DATA_CHUNK.sid = g_htons(hdr_data_chunk_sid); HDR_DATA_CHUNK.ssn = g_htons(hdr_data_chunk_ssn); HDR_DATA_CHUNK.ppid = g_htonl(hdr_data_chunk_ppid); - + padding_length = number_of_padding_bytes(curr_offset); for (i=0; i<padding_length; i++) write_byte("0"); } - + /* Write SCTP header */ if (hdr_sctp) { HDR_SCTP.src_port = g_htons(hdr_sctp_src); @@ -564,10 +564,10 @@ write_current_packet (void) if (hdr_data_chunk) HDR_SCTP.checksum = crc32c((unsigned char *)&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK), HDR_SCTP.checksum); HDR_SCTP.checksum = g_htonl(finalize_crc32c(crc32c(packet_buf, curr_offset, HDR_SCTP.checksum))); - + fwrite(&HDR_SCTP, sizeof(HDR_SCTP), 1, output_file); } - + /* Write DATA chunk header */ if (hdr_data_chunk) { fwrite(&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK), 1, output_file); @@ -589,7 +589,7 @@ write_current_packet (void) } /*---------------------------------------------------------------------- - * Write the PCap file header + * Write the PCap file header */ static void write_file_header (void) @@ -684,7 +684,7 @@ parse_preamble (void) ts_sec = -1; /* we failed to parse it */ /* This will ensure incorrectly parsed dates get set to zero */ - if ( -1L == (long)ts_sec ) + if ( -1L == (long)ts_sec ) { ts_sec = 0; ts_usec = 0; @@ -724,18 +724,18 @@ parse_preamble (void) /*printf("Format(%s), time(%u), subsecs(%u)\n\n", ts_fmt, ts_sec, ts_usec);*/ - + /* Clear Preamble */ packet_preamble_len = 0; } /*---------------------------------------------------------------------- - * Start a new packet + * Start a new packet */ static void start_new_packet (void) { - if (debug>=1) + if (debug>=1) fprintf(stderr, "Start new packet\n"); /* Write out the current packet, if required */ @@ -760,14 +760,14 @@ process_directive (char *str) /*---------------------------------------------------------------------- * Parse a single token (called from the scanner) */ -void +void parse_token (token_t token, char *str) { unsigned long num; - /* - * This is implemented as a simple state machine of five states. - * State transitions are caused by tokens being received from the + /* + * This is implemented as a simple state machine of five states. + * State transitions are caused by tokens being received from the * scanner. The code should be self_documenting. */ @@ -775,8 +775,8 @@ parse_token (token_t token, char *str) /* Sanitize - remove all '\r' */ char *c; if (str!=NULL) { while ((c = strchr(str, '\r')) != NULL) *c=' '; } - - fprintf(stderr, "(%s, %s \"%s\") -> (", + + fprintf(stderr, "(%s, %s \"%s\") -> (", state_str[state], token_str[token], str ? str : ""); } @@ -835,12 +835,12 @@ parse_token (token_t token, char *str) } else { /* Bad offset; switch to INIT state */ if (debug>=1) - fprintf(stderr, "Inconsistent offset. Expecting %0lX, got %0lX. Ignoring rest of packet\n", + fprintf(stderr, "Inconsistent offset. Expecting %0lX, got %0lX. Ignoring rest of packet\n", curr_offset, num); write_current_packet(); state = INIT; } - } else + } else state = READ_OFFSET; break; default: @@ -905,7 +905,7 @@ parse_token (token_t token, char *str) exit(-1); } - if (debug>=2) + if (debug>=2) fprintf(stderr, ", %s)\n", state_str[state]); } @@ -916,7 +916,7 @@ parse_token (token_t token, char *str) static void help (char *progname) { - fprintf(stderr, + fprintf(stderr, "\n" "Usage: %s [-h] [-d] [-q] [-o h|o] [-l typenum] [-e l3pid] [-i proto] \n" " [-u srcp,destp] [-s srcp,destp,tag] [-S srcp,destp,tag] [-t timefmt]\n" @@ -951,7 +951,7 @@ help (char *progname) " -S srcp,dstp,ppi: Prepend dummy SCTP header with specified dest/source ports\n" " and verification tag 0. It also prepends a dummy SCTP DATA\n" " chunk header with payload protocol identifier ppi.\n" - " Example: -S 30,40,34\n" + " Example: -S 30,40,34\n" " -t timefmt : Treats the text before the packet as a date/time code; the\n" " specified argument is a format string of the sort supported\n" " by strptime.\n" @@ -967,7 +967,7 @@ help (char *progname) } /*---------------------------------------------------------------------- - * Parse CLI options + * Parse CLI options */ static void parse_options (int argc, char *argv[]) @@ -983,7 +983,7 @@ parse_options (int argc, char *argv[]) case 'd': if (!quiet) debug++; break; case 'q': quiet = TRUE; debug = FALSE; break; case 'l': pcap_link_type = atoi(optarg); break; - case 'o': + case 'o': if (optarg[0]!='h' && optarg[0] != 'o') { fprintf(stderr, "Bad argument for '-e': %s\n", optarg); help(argv[0]); @@ -997,7 +997,7 @@ parse_options (int argc, char *argv[]) help(argv[0]); } break; - + case 'i': hdr_ip = TRUE; if (sscanf(optarg, "%ld", &hdr_ip_proto) < 1) { @@ -1007,7 +1007,7 @@ parse_options (int argc, char *argv[]) hdr_ethernet = TRUE; hdr_ethernet_proto = 0x800; break; - + case 's': hdr_sctp = TRUE; hdr_sctp_src = strtol(optarg, &p, 10); @@ -1025,7 +1025,7 @@ parse_options (int argc, char *argv[]) if (p == optarg || (*p != ',' && *p != '\0')) { fprintf(stderr, "Bad dest port for '-s'\n"); help(argv[0]); - } + } if (*p == '\0') { fprintf(stderr, "No tag specified for '-%c'\n", c); help(argv[0]); @@ -1082,7 +1082,7 @@ parse_options (int argc, char *argv[]) case 't': ts_fmt = optarg; break; - + case 'u': hdr_udp = TRUE; hdr_udp_src = strtol(optarg, &p, 10); @@ -1106,7 +1106,7 @@ parse_options (int argc, char *argv[]) hdr_ethernet = TRUE; hdr_ethernet_proto = 0x800; break; - + default: help(argv[0]); } @@ -1121,7 +1121,7 @@ parse_options (int argc, char *argv[]) input_filename = strdup(argv[optind]); input_file = fopen(input_filename, "rb"); if (!input_file) { - fprintf(stderr, "Cannot open file [%s] for reading: %s\n", + fprintf(stderr, "Cannot open file [%s] for reading: %s\n", input_filename, strerror(errno)); exit(-1); } @@ -1134,7 +1134,7 @@ parse_options (int argc, char *argv[]) output_filename = strdup(argv[optind+1]); output_file = fopen(output_filename, "wb"); if (!output_file) { - fprintf(stderr, "Cannot open file [%s] for writing: %s\n", + fprintf(stderr, "Cannot open file [%s] for writing: %s\n", output_filename, strerror(errno)); exit(-1); } @@ -1158,22 +1158,22 @@ parse_options (int argc, char *argv[]) output_file = stdout; output_filename = "Standard output"; } - + /* Display summary of our state */ if (!quiet) { fprintf(stderr, "Input from: %s\n", input_filename); fprintf(stderr, "Output to: %s\n", output_filename); - if (hdr_ethernet) fprintf(stderr, "Generate dummy Ethernet header: Protocol: 0x%0lX\n", - hdr_ethernet_proto); - if (hdr_ip) fprintf(stderr, "Generate dummy IP header: Protocol: %ld\n", - hdr_ip_proto); - if (hdr_udp) fprintf(stderr, "Generate dummy UDP header: Source port: %ld. Dest port: %ld\n", - hdr_udp_src, hdr_udp_dest); - if (hdr_sctp) fprintf(stderr, "Generate dummy SCTP header: Source port: %ld. Dest port: %ld. Tag: %ld\n", - hdr_sctp_src, hdr_sctp_dest, hdr_sctp_tag); - if (hdr_data_chunk) fprintf(stderr, "Generate dummy DATA chunk header: TSN: %lu. SID: %d. SSN: %d. PPID: %lu\n", - hdr_data_chunk_tsn, hdr_data_chunk_sid, hdr_data_chunk_ssn, hdr_data_chunk_ppid); + if (hdr_ethernet) fprintf(stderr, "Generate dummy Ethernet header: Protocol: 0x%0lX\n", + hdr_ethernet_proto); + if (hdr_ip) fprintf(stderr, "Generate dummy IP header: Protocol: %ld\n", + hdr_ip_proto); + if (hdr_udp) fprintf(stderr, "Generate dummy UDP header: Source port: %ld. Dest port: %ld\n", + hdr_udp_src, hdr_udp_dest); + if (hdr_sctp) fprintf(stderr, "Generate dummy SCTP header: Source port: %ld. Dest port: %ld. Tag: %ld\n", + hdr_sctp_src, hdr_sctp_dest, hdr_sctp_tag); + if (hdr_data_chunk) fprintf(stderr, "Generate dummy DATA chunk header: TSN: %lu. SID: %d. SSN: %d. PPID: %lu\n", + hdr_data_chunk_tsn, hdr_data_chunk_sid, hdr_data_chunk_ssn, hdr_data_chunk_ppid); } } @@ -1193,7 +1193,7 @@ int main(int argc, char *argv[]) if (debug) fprintf(stderr, "\n-------------------------\n"); if (!quiet) { - fprintf(stderr, "Read %ld potential packets, wrote %ld packets\n", + fprintf(stderr, "Read %ld potential packets, wrote %ld packets\n", num_packets_read, num_packets_written); } return 0; diff --git a/text2pcap.h b/text2pcap.h index ca6220a547..3bcb98a8a1 100644 --- a/text2pcap.h +++ b/text2pcap.h @@ -6,24 +6,24 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.h,v 1.2 2001/05/17 00:11:37 guy Exp $ - * + * $Id: text2pcap.h,v 1.3 2002/08/28 21:00:41 jmayer Exp $ + * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * - * - * + * + * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -34,12 +34,12 @@ #ifndef TEXT2PCAP_H #define TEXT2PCAP_H -typedef enum { - T_BYTE = 1, - T_OFFSET, - T_DIRECTIVE, - T_TEXT, - T_EOL +typedef enum { + T_BYTE = 1, + T_OFFSET, + T_DIRECTIVE, + T_TEXT, + T_EOL } token_t; void parse_token(token_t token, char *str); diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index f1cd86a734..a2755080af 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -15,7 +15,7 @@ ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. -** +** ** You should have received a copy of the GNU General Public ** License along with this library; if not, write to the ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -25,7 +25,7 @@ ** drh@acm.org ** http://www.hwaci.com/drh/ ** -** $Id: lemon.c,v 1.13 2002/05/04 10:16:12 guy Exp $ +** $Id: lemon.c,v 1.14 2002/08/28 21:04:11 jmayer Exp $ */ #include <stdio.h> #include <stdarg.h> @@ -435,7 +435,7 @@ void myassert(char *file, int line) */ /* Find a precedence symbol of every rule in the grammar. -** +** ** Those rules which have a precedence symbol coded in the input ** grammar using the "[symbol]" construct will already have the ** rp->precsym field filled. Other rules take as their precedence @@ -720,7 +720,7 @@ void FindFollowSets(struct lemon *lemp) cfp->status = INCOMPLETE; } } - + do{ progress = 0; for(i=0; i<lemp->nstate; i++){ @@ -751,7 +751,7 @@ void FindActions(struct lemon *lemp) struct symbol *sp; struct rule *rp; - /* Add all of the reduce actions + /* Add all of the reduce actions ** A reduce action is added for each element of the followset of ** a configuration which has its dot at the extreme right. */ @@ -1225,7 +1225,7 @@ int main(int argc _U_, char **argv) "Copyright 1991-1997 by D. Richard Hipp\n" "Freely distributable under the GNU Public License.\n" ); - exit(0); + exit(0); } if( optnargs()!=1 ){ fprintf(stderr,"Exactly one filename argument is required.\n"); @@ -1881,7 +1881,7 @@ to follow the previous rule."); case IN_RHS: if( x[0]=='.' ){ struct rule *rp; - rp = (struct rule *)malloc( sizeof(struct rule) + + rp = (struct rule *)malloc( sizeof(struct rule) + sizeof(struct symbol*)*psp->nrhs + sizeof(char*)*psp->nrhs ); if( rp==0 ){ ErrorMsg(psp->filename,psp->tokenlineno, @@ -2389,7 +2389,7 @@ PRIVATE FILE *file_open(struct lemon *lemp, char *suffix, char *mode) return fp; } -/* Duplicate the input file without comments and without actions +/* Duplicate the input file without comments and without actions ** on rules */ void Reprint(struct lemon *lemp) { @@ -2743,7 +2743,7 @@ int has_destructor(struct symbol *sp, struct lemon *lemp) return ret; } -/* +/* ** Generate code which executes when the rule "rp" is reduced. Write ** the code to "out". Make sure lineno stays up-to-date. */ @@ -3024,7 +3024,7 @@ void ReportTable( /* Generate the action table. ** - ** Each entry in the action table is an element of the following + ** Each entry in the action table is an element of the following ** structure: ** struct yyActionEntry { ** YYCODETYPE lookahead; @@ -3104,7 +3104,7 @@ void ReportTable( fprintf(out,"0 }, /* "); } PrintAction(table[j],out,22); - fprintf(out," */\n"); + fprintf(out," */\n"); } lineno++; } @@ -3146,7 +3146,7 @@ void ReportTable( tplt_xfer(lemp->name,in,out,&lineno); /* Generate code which executes every time a symbol is popped from - ** the stack while processing errors or while destroying the parser. + ** the stack while processing errors or while destroying the parser. ** (In other words, generate the %destructor actions) */ if( lemp->tokendest ){ for(i=0; i<lemp->nsymbol; i++){ @@ -3173,7 +3173,7 @@ void ReportTable( tplt_print(out,lemp,lemp->overflow,lemp->overflowln,&lineno); tplt_xfer(lemp->name,in,out,&lineno); - /* Generate the table of rule information + /* Generate the table of rule information ** ** Note: This code depends on the fact that rules are number ** sequentually beginning with 0. @@ -3242,7 +3242,7 @@ void ReportHeader(struct lemon *lemp) for(i=1; i<lemp->nterminal; i++){ fprintf(out,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); } - fclose(out); + fclose(out); } return; } @@ -3415,7 +3415,7 @@ void Strsafe_init(void){ if( x1a ){ x1a->size = 1024; x1a->count = 0; - x1a->tbl = (x1node*)malloc( + x1a->tbl = (x1node*)malloc( (sizeof(x1node) + sizeof(x1node*))*1024 ); if( x1a->tbl==0 ){ free(x1a); @@ -3576,7 +3576,7 @@ void Symbol_init(void){ if( x2a ){ x2a->size = 128; x2a->count = 0; - x2a->tbl = (x2node*)malloc( + x2a->tbl = (x2node*)malloc( (sizeof(x2node) + sizeof(x2node*))*128 ); if( x2a->tbl==0 ){ free(x2a); @@ -3774,7 +3774,7 @@ void State_init(void){ if( x3a ){ x3a->size = 128; x3a->count = 0; - x3a->tbl = (x3node*)malloc( + x3a->tbl = (x3node*)malloc( (sizeof(x3node) + sizeof(x3node*))*128 ); if( x3a->tbl==0 ){ free(x3a); @@ -3916,7 +3916,7 @@ void Configtable_init(void){ if( x4a ){ x4a->size = 64; x4a->count = 0; - x4a->tbl = (x4node*)malloc( + x4a->tbl = (x4node*)malloc( (sizeof(x4node) + sizeof(x4node*))*64 ); if( x4a->tbl==0 ){ free(x4a); diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c index 9c3b8e61ff..03e1722a17 100644 --- a/tools/lemon/lempar.c +++ b/tools/lemon/lempar.c @@ -5,12 +5,12 @@ ** modify it under the terms of the GNU Library General Public ** License as published by the Free Software Foundation; either ** version 2 of the License, or (at your option) any later version. -** +** ** This library is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** Library General Public License for more details. -** +** ** You should have received a copy of the GNU Library General Public ** License along with this library; if not, write to the ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -25,10 +25,10 @@ /* Next is all token values, in a form suitable for use by makeheaders. ** This section will be null unless lemon is run with the -m switch. */ -/* +/* ** These constants (all generated automatically by the parser generator) ** specify the various kinds of tokens (terminals) that the parser -** understands. +** understands. ** ** Each symbol here is a terminal symbol in the grammar. */ @@ -46,13 +46,13 @@ ** and nonterminals. "int" is used otherwise. ** YYNOCODE is a number of type YYCODETYPE which corresponds ** to no legal terminal or nonterminal number. This -** number is used to fill in empty slots of the hash +** number is used to fill in empty slots of the hash ** table. ** YYACTIONTYPE is the data type used for storing terminal ** and nonterminal numbers. "unsigned char" is ** used if there are fewer than 250 rules and ** states combined. "int" is used otherwise. -** ParseTOKENTYPE is the data type used for minor tokens given +** ParseTOKENTYPE is the data type used for minor tokens given ** directly to the parser from the tokenizer. ** YYMINORTYPE is the data type used for all minor tokens. ** This is typically a union of many types, one of @@ -107,7 +107,7 @@ static struct yyActionEntry yyActionTable[] = { ** + A pointer to the start of the action hash table in yyActionTable. ** ** + A mask used to hash the look-ahead token. The mask is an integer -** which is one less than the size of the hash table. +** which is one less than the size of the hash table. ** ** + The default action. This is the action to take if no entry for ** the given look-ahead is found in the action hash table. @@ -156,10 +156,10 @@ typedef struct yyParser yyParser; static FILE *yyTraceFILE = 0; static char *yyTracePrompt = 0; -/* +/* ** Turn parser tracing on by giving a stream to which to write the trace ** and a prompt to preface each trace message. Tracing is turned off -** by making either argument NULL +** by making either argument NULL ** ** Inputs: ** <ul> @@ -182,7 +182,7 @@ void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ -static char *yyTokenName[] = { +static char *yyTokenName[] = { %% }; #define YYTRACE(X) if( yyTraceFILE ) fprintf(yyTraceFILE,"%sReduce [%s].\n",yyTracePrompt,X); @@ -190,7 +190,7 @@ static char *yyTokenName[] = { #define YYTRACE(X) #endif -/* +/* ** This function allocates a new parser. ** The only argument is a pointer to a function which works like ** malloc. @@ -221,7 +221,7 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){ /* Here is inserted the actions which take place when a ** terminal or non-terminal is destroyed. This can happen ** when the symbol is popped from the stack during a - ** reduce or during error processing or when a parser is + ** reduce or during error processing or when a parser is ** being destroyed before it is finished parsing. ** ** Note: during a reduce, the only symbols destroyed are those @@ -259,7 +259,7 @@ static int yy_pop_parser_stack(yyParser *pParser){ return yymajor; } -/* +/* ** Deallocate and destroy a parser. Destructors are all called for ** all stack elements before shutting the parser down. ** @@ -294,7 +294,7 @@ static int yy_find_parser_action( ){ struct yyStateEntry *pState; /* Appropriate entry in the state table */ struct yyActionEntry *pAction; /* Action appropriate for the look-ahead */ - + /* if( pParser->idx<0 ) return YY_NO_ACTION; */ pState = &yyStateTable[pParser->top->stateno]; if( iLookAhead!=YYNOCODE ){ @@ -520,7 +520,7 @@ void Parse( #ifdef YYERRORSYMBOL /* A syntax error has occurred. ** The response to an error depends upon whether or not the - ** grammar defines an error token "ERROR". + ** grammar defines an error token "ERROR". ** ** This is what we do if the grammar does define ERROR: ** @@ -1,23 +1,23 @@ /* ui_util.h * Definitions for UI utility routines * - * $Id: ui_util.h,v 1.9 2001/03/24 02:23:07 guy Exp $ + * $Id: ui_util.h,v 1.10 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -1,22 +1,22 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.56 2002/08/02 23:36:07 jmayer Exp $ + * $Id: util.c,v 1.57 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -282,11 +282,11 @@ static guint8 EBCDIC_translate_ASCII [ 256 ] = { 0x2E, 0x2E, 0x2E, 0x2E, 0x5D, 0x2E, 0x2E, 0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, - 0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, + 0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x5C, 0x2E, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E }; @@ -1,22 +1,22 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.25 2001/11/09 07:44:48 guy Exp $ + * $Id: util.h,v 1.26 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/x264_prt_id.h b/x264_prt_id.h index e44b3a8e2a..b15b084c47 100644 --- a/x264_prt_id.h +++ b/x264_prt_id.h @@ -1,7 +1,7 @@ /* x264_prt_id.h * Definitions of X.264/ISO 11570 transport protocol IDs * - * $Id: x264_prt_id.h,v 1.1 2001/12/02 00:38:54 guy Exp $ + * $Id: x264_prt_id.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -11,12 +11,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -2,22 +2,22 @@ * Routines for use by various SDLC-derived protocols, such as HDLC * and its derivatives LAPB, IEEE 802.2 LLC, etc.. * - * $Id: xdlc.c,v 1.19 2002/08/02 23:36:07 jmayer Exp $ + * $Id: xdlc.c,v 1.20 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ #include <glib.h> #include <epan/packet.h> #include "xdlc.h" - + /* * N(S) and N(R) fields, in basic and extended operation. */ @@ -2,23 +2,23 @@ * Define *DLC frame types, and routine to dissect the control field of * a *DLC frame. * - * $Id: xdlc.h,v 1.16 2002/08/02 23:36:07 jmayer Exp $ + * $Id: xdlc.h,v 1.17 2002/08/28 21:00:41 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -3,7 +3,7 @@ * exists so that the library can be loaded on systems that * have it. * - * $Id: xmlstub.c,v 1.1 2001/11/01 21:52:44 guy Exp $ + * $Id: xmlstub.c,v 1.2 2002/08/28 21:00:41 jmayer Exp $ * * Copyright (c) 2001 by David Frascone <dave@frascone.com> * @@ -51,7 +51,7 @@ loadLibXML() if (XmlStubInitialized) { /* Did you ever get the feeling you've been here before? */ - /* + /* * This is not thread safe. With threads, we'd need to * synchronize all this so two threads can't initialize at once. */ @@ -71,8 +71,8 @@ loadLibXML() g_warning("XMLStub: Unable to open module " XML_LIBRARY); return (-1); } - - /* + + /* * Now that the library is open, copy all our relevant * function pointers and integer pointers into our structure. */ @@ -81,13 +81,13 @@ loadLibXML() error=TRUE; } XmlStub.xmlParseFile= (xmlDocPtr(*)(const char *))symbol; - + if (!g_module_symbol(handle, "xmlStrcmp", &symbol)) { g_warning("Unable to find \"xmlStrcmp\""); error=TRUE; } XmlStub.xmlStrcmp= (int (*)(const xmlChar *, const xmlChar *))symbol; - + if (!g_module_symbol(handle, "xmlCreatePushParserCtxt", &symbol)) { g_warning("Unable to find \"xmlCreatePushParserCtxt\""); error=TRUE; @@ -152,7 +152,7 @@ loadLibXML() /* * Return if any of the above functions set our error flag. - * A flag was used, instead of returning immediately, so + * A flag was used, instead of returning immediately, so * that *all* unresolved symbols would be printed. */ if (error) { @@ -450,7 +450,7 @@ struct _xmlNode { struct _xmlNode *prev; /* previous sibling link */ struct _xmlDoc *doc; /* the containing document */ xmlNs *ns; /* pointer to the associated namespace */ -#ifndef XML_USE_BUFFER_CONTENT +#ifndef XML_USE_BUFFER_CONTENT xmlChar *content; /* the content */ #else xmlBufferPtr content; /* the content in a buffer */ @@ -581,7 +581,7 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char* out, int *outlen, /* * Block defining the handlers for non UTF-8 encodings. - * If iconv is supported, there is two extra fields + * If iconv is supported, there is two extra fields */ typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler; @@ -607,9 +607,9 @@ struct _xmlParserInputBuffer { void* context; xmlInputReadCallback readcallback; xmlInputCloseCallback closecallback; - + xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */ - + xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 */ xmlBufferPtr raw; /* if encoder != NULL buffer for raw input */ }; @@ -632,9 +632,9 @@ struct _xmlOutputBuffer { void* context; xmlOutputWriteCallback writecallback; xmlOutputCloseCallback closecallback; - + xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */ - + xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 or ISOLatin */ xmlBufferPtr conv; /* if encoder != NULL buffer for output */ int written; /* total number of byte written */ @@ -675,7 +675,7 @@ struct _xmlParserInput { /** * the parser can be asked to collect Node informations, i.e. at what - * place in the file they were detected. + * place in the file they were detected. * NOTE: This is off by default and not very well tested. */ typedef struct _xmlParserNodeInfo xmlParserNodeInfo; @@ -862,7 +862,7 @@ struct _xmlParserCtxt { xmlValidCtxt vctxt; /* The validity context */ xmlParserInputState instate; /* current type of input */ - int token; /* next char look-ahead */ + int token; /* next char look-ahead */ char *directory; /* the data directory */ @@ -1088,10 +1088,10 @@ typedef struct { char *(*xmlGetProp)(xmlNodePtr, char *); int (*xmlKeepBlanksDefault)(int); int (*xmlSubstituteEntitiesDefault)(int); - + /* Variables */ int *xmlDoValidityCheckingDefaultValue; - + } XML_STUB; XML_EXTERN XML_STUB XmlStub; |