* 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.23 2002/01/21 07:36:38 guy Exp $
+ * $Id: packet-pptp.c,v 1.29 2003/08/12 02:05:41 gerald 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"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <stdio.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
#include <glib.h>
#include <epan/packet.h>
#define MAGIC_COOKIE 0x1A2B3C4D
static const value_string msgtype_vals[] = {
- { 1, "CONTROL-MESSAGE" },
- { 2, "MANAGEMENT-MESSAGE" },
+ { 1, "Control Message" },
+ { 2, "Management Message" },
{ 0, NULL }
};
#define NUM_FRAME_TYPES 4
#define frametype2str(t) \
- ((t < NUM_FRAME_TYPES) ? frametypestr[t] : "UNKNOWN-FRAMING-TYPE")
+ ((t < NUM_FRAME_TYPES) ? frametypestr[t] : "Unknown framing type")
static const char *frametypestr[NUM_FRAME_TYPES] = {
- "UNKNOWN-FRAMING-TYPE",
- "ASYNCHRONOUS",
- "SYNCHRONOUS",
- "EITHER"
+ "Unknown framing type",
+ "Asynchronous Framing supported",
+ "Synchronous Framing supported",
+ "Either Framing supported"
};
#define NUM_BEARER_TYPES 4
#define bearertype2str(t) \
- ((t < NUM_BEARER_TYPES) ? bearertypestr[t] : "UNKNOWN-BEARER-TYPE")
+ ((t < NUM_BEARER_TYPES) ? bearertypestr[t] : "Unknown bearer type")
static const char *bearertypestr[NUM_BEARER_TYPES] = {
- "UNKNOWN-BEARER-TYPE",
- "ANALOG",
- "DIGITAL",
- "EITHER"
+ "Unknown bearer type",
+ "Analog access supported",
+ "Digital access supported",
+ "Either access supported"
};
#define NUM_CNTRLRESULT_TYPES 6
#define cntrlresulttype2str(t) \
- ((t < NUM_CNTRLRESULT_TYPES) ? cntrlresulttypestr[t] : "UNKNOWN-CNTRLRESULT-TYPE")
+ ((t < NUM_CNTRLRESULT_TYPES) ? cntrlresulttypestr[t] : "Unknown Start-Control-connection-Reply result code")
static const char *cntrlresulttypestr[NUM_CNTRLRESULT_TYPES] = {
- "UNKNOWN-CNTRLRESULT-TYPE",
- "SUCCESS",
- "GENERAL-ERROR",
- "COMMAND-CHANNEL-EXISTS",
- "NOT-AUTHORIZED",
- "VERSION-NOT-SUPPORTED"
+ "Unknown Start-Control-connection-Reply result code",
+ "Successful channel establishment",
+ "General error",
+ "Command channel already exists",
+ "Requester not authorized",
+ "Protocol version not supported"
};
#define NUM_ERROR_TYPES 7
#define errortype2str(t) \
- ((t < NUM_ERROR_TYPES) ? errortypestr[t] : "UNKNOWN-ERROR-TYPE")
+ ((t < NUM_ERROR_TYPES) ? errortypestr[t] : "Unknown general error code")
static const char *errortypestr[NUM_ERROR_TYPES] = {
- "NONE",
- "NOT-CONNECTED",
- "BAD-FORMAT",
- "BAD-VALUE",
- "NO-RESOURCE",
- "BAD-CALL-ID",
- "PAC-ERROR"
+ "None",
+ "Not-Connected",
+ "Bad-Format",
+ "Bad-Value",
+ "No-Resource",
+ "Bad-Call ID",
+ "PAC-Error"
};
#define NUM_REASON_TYPES 4
#define reasontype2str(t) \
- ((t < NUM_REASON_TYPES) ? reasontypestr[t] : "UNKNOWN-REASON-TYPE")
+ ((t < NUM_REASON_TYPES) ? reasontypestr[t] : "Unknown Stop-Control-Connection-Request reason code")
static const char *reasontypestr[NUM_REASON_TYPES] = {
- "UNKNOWN-REASON-TYPE",
- "NONE",
- "STOP-PROTOCOL",
- "STOP-LOCAL-SHUTDOWN"
+ "Unknown Stop-Control-Connection-Request reason code",
+ "None",
+ "Stop-Protocol",
+ "Stop-Local-Shutdown"
};
#define NUM_STOPRESULT_TYPES 3
#define stopresulttype2str(t) \
- ((t < NUM_STOPRESULT_TYPES) ? stopresulttypestr[t] : "UNKNOWN-STOPRESULT-TYPE")
+ ((t < NUM_STOPRESULT_TYPES) ? stopresulttypestr[t] : "Unknown Stop-Control-Connection-Reply result code")
static const char *stopresulttypestr[NUM_STOPRESULT_TYPES] = {
- "UNKNOWN-STOPRESULT-TYPE",
- "SUCCESS",
- "GENERAL-ERROR"
+ "Unknown Stop-Control-Connection-Reply result code",
+ "OK",
+ "General error"
};
#define NUM_ECHORESULT_TYPES 3
#define echoresulttype2str(t) \
- ((t < NUM_ECHORESULT_TYPES) ? echoresulttypestr[t] : "UNKNOWN-ECHORESULT-TYPE")
+ ((t < NUM_ECHORESULT_TYPES) ? echoresulttypestr[t] : "Unknown Echo-Reply result code")
static const char *echoresulttypestr[NUM_ECHORESULT_TYPES] = {
- "UNKNOWN-ECHORESULT-TYPE",
- "SUCCESS",
- "GENERAL-ERROR"
+ "Unknown Echo-Reply result code",
+ "OK",
+ "General error"
};
#define NUM_OUTRESULT_TYPES 8
#define outresulttype2str(t) \
- ((t < NUM_OUTRESULT_TYPES) ? outresulttypestr[t] : "UNKNOWN-OUTRESULT-TYPE")
+ ((t < NUM_OUTRESULT_TYPES) ? outresulttypestr[t] : "Unknown Outgoing-Call-Reply result code")
static const char *outresulttypestr[NUM_OUTRESULT_TYPES] = {
- "UNKNOWN-OUTRESULT-TYPE",
- "CONNECTED",
- "GENERAL-ERROR",
- "NO-CARRIER",
- "BUSY",
- "NO-DIAL-TONE",
- "TIME-OUT",
- "DO-NOT-ACCEPT"
+ "Unknown Outgoing-Call-Reply result code",
+ "Connected",
+ "General Error",
+ "No Carrier",
+ "Busy",
+ "No Dial Tone",
+ "Time-out",
+ "Do Not Accept"
};
#define NUM_INRESULT_TYPES 4
#define inresulttype2str(t) \
- ((t < NUM_INRESULT_TYPES) ? inresulttypestr[t] : "UNKNOWN-INRESULT-TYPE")
+ ((t < NUM_INRESULT_TYPES) ? inresulttypestr[t] : "Unknown Incoming-Call-Reply result code")
static const char *inresulttypestr[NUM_INRESULT_TYPES] = {
- "UNKNOWN-INRESULT-TYPE",
- "CONNECT",
- "GENERAL-ERROR",
- "DO-NOT-ACCEPT"
+ "Unknown Incoming-Call-Reply result code",
+ "Connect",
+ "General Error",
+ "Do Not Accept"
};
#define NUM_DISCRESULT_TYPES 5
#define discresulttype2str(t) \
- ((t < NUM_DISCRESULT_TYPES) ? discresulttypestr[t] : "UNKNOWN-DISCRESULT-TYPE")
+ ((t < NUM_DISCRESULT_TYPES) ? discresulttypestr[t] : "Unknown Call-Disconnect-Notify result code")
static const char *discresulttypestr[NUM_DISCRESULT_TYPES] = {
- "UNKNOWN-DISCRESULT-TYPE",
- "LOST-CARRIER",
- "GENERAL-ERROR",
- "ADMIN-SHUTDOWN",
- "REQUEST"
+ "Unknown Call-Disconnect-Notify result code",
+ "Lost Carrier",
+ "General Error",
+ "Admin Shutdown",
+ "Request"
};
static void dissect_unknown(tvbuff_t *, int, packet_info *, proto_tree *);
const char * str;
void (*func)(tvbuff_t *, int, packet_info *, proto_tree *);
} strfuncs[NUM_CNTRL_TYPES] = {
- {"UNKNOWN-CONTROL-TYPE", dissect_unknown },
- {"START-CONTROL-REQUEST", dissect_cntrl_req },
- {"START-CONTROL-REPLY", dissect_cntrl_reply },
- {"STOP-CONTROL-REQUEST", dissect_stop_req },
- {"STOP-CONTROL-REPLY", dissect_stop_reply },
- {"ECHO-REQUEST", dissect_echo_req },
- {"ECHO-REPLY", dissect_echo_reply },
- {"OUTGOING-CALL-REQUEST", dissect_out_req },
- {"OUTGOING-CALL-REPLY", dissect_out_reply },
- {"INCOMING-CALL-REQUEST", dissect_in_req },
- {"INCOMING-CALL-REPLY", dissect_in_reply },
- {"INCOMING-CALL-CONNECTED", dissect_in_connected },
- {"CLEAR-CALL-REQUEST", dissect_clear_req },
- {"DISCONNECT-NOTIFY", dissect_disc_notify },
- {"ERROR-NOTIFY", dissect_error_notify },
- {"SET-LINK", dissect_set_link }
+ {"Unknown control type", dissect_unknown },
+ {"Start-Control-Connection-Request", dissect_cntrl_req },
+ {"Start-Control-Connection-Reply", dissect_cntrl_reply },
+ {"Stop-Control-Connection-Request", dissect_stop_req },
+ {"Stop-Control-Connection-Reply", dissect_stop_reply },
+ {"Echo-Request", dissect_echo_req },
+ {"Echo-Reply", dissect_echo_reply },
+ {"Outgoing-Call-Request", dissect_out_req },
+ {"Outgoing-Call-Reply", dissect_out_reply },
+ {"Incoming-Call-Request", dissect_in_req },
+ {"Incoming-Call-Reply", dissect_in_reply },
+ {"Incoming-Call-Connected", dissect_in_connected },
+ {"Call-Clear-Request", dissect_clear_req },
+ {"Call-Disconnect-Notify", dissect_disc_notify },
+ {"WAN-Error-Notify", dissect_error_notify },
+ {"Set-Link-Info", dissect_set_link }
};
/*
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);
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;
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;
if (cntrl_type < NUM_CNTRL_TYPES)
( *(strfuncs[cntrl_type].func))(tvb, offset, pinfo, pptp_tree);
else
- call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,tvb_reported_length_remaining(tvb,offset)), pinfo, pptp_tree);
+ call_dissector(data_handle,tvb_new_subset(tvb, offset, -1, -1), pinfo, pptp_tree);
}
}
dissect_unknown(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree)
{
- call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,tvb_reported_length_remaining(tvb,offset)), pinfo, tree);
+ call_dissector(data_handle,tvb_new_subset(tvb, offset, -1, -1), pinfo, tree);
}
static void
-dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 major_ver;
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;
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);
+
+ tvb_memcpy(tvb, host, offset, HOSTLEN);
+ host[HOSTLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, HOSTLEN,
"Hostname: %s", host);
offset += HOSTLEN;
-
- tvb_get_nstringz0(tvb, offset, VENDORLEN, vendor);
+
+ tvb_memcpy(tvb, vendor, offset, VENDORLEN);
+ vendor[VENDORLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, VENDORLEN,
"Vendor: %s", vendor);
}
static void
-dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 major_ver;
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;
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);
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);
+
+ tvb_memcpy(tvb, host, offset, HOSTLEN);
+ host[HOSTLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, HOSTLEN,
"Hostname: %s", host);
offset += HOSTLEN;
-
- tvb_get_nstringz0(tvb, offset, VENDORLEN, vendor);
+
+ tvb_memcpy(tvb, vendor, offset, VENDORLEN);
+ vendor[VENDORLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, VENDORLEN,
"Vendor: %s", vendor);
}
static void
-dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 reason;
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));
}
static void
-dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
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));
}
static void
-dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 4,
}
static void
-dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
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));
}
static void
-dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 bearer;
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);
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);
+
+ tvb_memcpy(tvb, phone, offset, PHONELEN);
+ phone[PHONELEN] = '\0';
proto_tree_add_text(tree, tvb, offset, PHONELEN,
"Phone number: %s", phone);
offset += PHONELEN;
- tvb_get_nstringz0(tvb, offset, SUBADDRLEN, subaddr);
+ tvb_memcpy(tvb, subaddr, offset, SUBADDRLEN);
+ subaddr[SUBADDRLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, SUBADDRLEN,
"Subaddress: %s", subaddr);
}
static void
-dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
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;
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);
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;
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));
}
static void
-dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 bearer;
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);
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);
+
+ tvb_memcpy(tvb, dialing, offset, PHONELEN);
+ dialed[PHONELEN] = '\0';
proto_tree_add_text(tree, tvb, offset, PHONELEN,
"Dialed number: %s", dialed);
offset += PHONELEN;
-
- tvb_get_nstringz0(tvb, offset, PHONELEN, dialing);
+
+ tvb_memcpy(tvb, dialing, offset, PHONELEN);
+ dialing[PHONELEN] = '\0';
proto_tree_add_text(tree, tvb, offset, PHONELEN,
"Dialing number: %s", dialing);
offset += PHONELEN;
-
- tvb_get_nstringz0(tvb, offset, SUBADDRLEN, subaddr);
+
+ tvb_memcpy(tvb, subaddr, offset, SUBADDRLEN);
+ subaddr[SUBADDRLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, SUBADDRLEN,
"Subaddress: %s", subaddr);
}
static void
-dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
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;
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);
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));
}
static void
-dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo,
+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;
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;
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);
}
static void
-dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
}
static void
-dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
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);
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;
- tvb_get_nstringz0(tvb, offset, STATSLEN, stats);
+ tvb_memcpy(tvb, stats, offset, STATSLEN);
+ stats[STATSLEN] = '\0';
proto_tree_add_text(tree, tvb, offset, STATSLEN,
"Call statistics: %s", stats);
}
static void
-dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
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));
}
static void
-dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
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));
}
git.samba.org / obnox / wireshark / wip.git / blobdiff