-/*
+ /*
* packet-iax2.c
*
* Routines for IAX2 packet disassembly
* Copyright 2003 Alastair Maw
*
* IAX2 is a VoIP protocol for the open source PBX Asterisk. Please see
- * http://www.asterisk.org for more information; see
- *
- * http://www.ietf.org/internet-drafts/draft-guy-iax-04.txt
- *
- * for the current Internet-Draft for IAX2.
- *
- * $Id$
+ * http://www.asterisk.org for more information; see RFC 5456 for the
+ * protocol.
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <string.h>
#include <epan/circuit.h>
#include <epan/packet.h>
+#include <epan/exceptions.h>
#include <epan/to_str.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/reassemble.h>
+#include <epan/expert.h>
#include <epan/aftypes.h>
#include <epan/tap.h>
#include <epan/tap-voip.h>
#include "packet-iax2.h"
#include <epan/iax2_codec_type.h>
+void proto_register_iax2(void);
+void proto_reg_handoff_iax2(void);
+
#define IAX2_PORT 4569
#define PROTO_TAG_IAX2 "IAX2"
static int hf_iax2_video_codec = -1;
static int hf_iax2_marker = -1;
static int hf_iax2_modem_csub = -1;
+static int hf_iax2_text_csub = -1;
+static int hf_iax2_text_text = -1;
+static int hf_iax2_html_csub = -1;
+static int hf_iax2_html_url = -1;
static int hf_iax2_trunk_metacmd = -1;
static int hf_iax2_trunk_cmddata = -1;
static int hf_iax2_trunk_cmddata_ts = -1;
static int hf_iax2_trunk_call_len = -1;
static int hf_iax2_trunk_call_scallno = -1;
static int hf_iax2_trunk_call_ts = -1;
+static int hf_iax2_trunk_call_data = -1;
static int hf_iax2_cap_g723_1 = -1;
static int hf_iax2_cap_gsm = -1;
static int hf_iax2_cap_ulaw = -1;
static int hf_iax2_cap_alaw = -1;
-static int hf_iax2_cap_g726 = -1;
+static int hf_iax2_cap_g726_aal2 = -1;
static int hf_iax2_cap_adpcm = -1;
static int hf_iax2_cap_slinear = -1;
static int hf_iax2_cap_lpc10 = -1;
static int hf_iax2_cap_g729a = -1;
static int hf_iax2_cap_speex = -1;
static int hf_iax2_cap_ilbc = -1;
+static int hf_iax2_cap_g726 = -1;
+static int hf_iax2_cap_g722 = -1;
+static int hf_iax2_cap_siren7 = -1;
+static int hf_iax2_cap_siren14 = -1;
+static int hf_iax2_cap_slinear16 = -1;
static int hf_iax2_cap_jpeg = -1;
static int hf_iax2_cap_png = -1;
static int hf_iax2_cap_h261 = -1;
static int hf_iax2_cap_h263 = -1;
+static int hf_iax2_cap_h263_plus = -1;
+static int hf_iax2_cap_h264 = -1;
+static int hf_iax2_cap_mpeg4 = -1;
static int hf_iax2_fragments = -1;
static int hf_iax2_fragment = -1;
static int hf_iax2_fragment_multiple_tails = -1;
static int hf_iax2_fragment_too_long_fragment = -1;
static int hf_iax2_fragment_error = -1;
+static int hf_iax2_fragment_count = -1;
static int hf_iax2_reassembled_in = -1;
static int hf_iax2_reassembled_length = -1;
/* hf_iax2_ies is an array of header fields, one per potential Information
* Element. It's done this way (rather than having separate variables for each
* IE) to make the dissection of information elements clearer and more
- * orthoganal.
+ * orthogonal.
*
* To add the ability to dissect a new information element, just add an
* appropriate entry to hf[] in proto_register_iax2(); dissect_ies() will then
* pick it up automatically.
*/
-static int hf_iax2_ies[256];
+#define NUM_HF_IAX2_IES 256
+static int hf_iax2_ies[NUM_HF_IAX2_IES];
static int hf_iax2_ie_datetime = -1;
static int hf_IAX_IE_APPARENTADDR_SINFAMILY = -1;
static int hf_IAX_IE_APPARENTADDR_SINPORT = -1;
/* These are the ids of the subtrees that we may be creating */
static gint ett_iax2 = -1;
static gint ett_iax2_full_mini_subtree = -1;
-static gint ett_iax2_type = -1; /* Frame-type specific subtree */
-static gint ett_iax2_ie = -1; /* single IE */
-static gint ett_iax2_codecs = -1; /* capabilities IE */
+static gint ett_iax2_type = -1; /* Frame-type specific subtree */
+static gint ett_iax2_ie = -1; /* single IE */
+static gint ett_iax2_codecs = -1; /* capabilities IE */
static gint ett_iax2_ies_apparent_addr = -1; /* apparent address IE */
static gint ett_iax2_fragment = -1;
static gint ett_iax2_fragments = -1;
static gint ett_iax2_trunk_cmddata = -1;
static gint ett_iax2_trunk_call = -1;
+static expert_field ei_iax_too_many_transfers = EI_INIT;
+static expert_field ei_iax_circuit_id_conflict = EI_INIT;
+static expert_field ei_iax_peer_address_unsupported = EI_INIT;
+
static const fragment_items iax2_fragment_items = {
&ett_iax2_fragment,
&ett_iax2_fragments,
&hf_iax2_fragment_multiple_tails,
&hf_iax2_fragment_too_long_fragment,
&hf_iax2_fragment_error,
+ &hf_iax2_fragment_count,
&hf_iax2_reassembled_in,
&hf_iax2_reassembled_length,
+ /* Reassembled data field */
+ NULL,
"iax2 fragments"
};
/* IAX2 Full-frame types */
static const value_string iax_frame_types[] = {
- {0, "(0?)"},
- {AST_FRAME_DTMF_END, "DTMF End"},
- {AST_FRAME_VOICE, "Voice"},
- {AST_FRAME_VIDEO, "Video"},
- {AST_FRAME_CONTROL, "Control"},
- {AST_FRAME_NULL, "NULL"},
- {AST_FRAME_IAX, "IAX"},
- {AST_FRAME_TEXT, "Text"},
- {AST_FRAME_IMAGE, "Image"},
- {AST_FRAME_HTML, "HTML"},
- {AST_FRAME_CNG, "Comfort Noise"},
- {AST_FRAME_MODEM, "Modem"},
+ {0, "(0?)"},
+ {AST_FRAME_DTMF_END, "DTMF End"},
+ {AST_FRAME_VOICE, "Voice"},
+ {AST_FRAME_VIDEO, "Video"},
+ {AST_FRAME_CONTROL, "Control"},
+ {AST_FRAME_NULL, "NULL"},
+ {AST_FRAME_IAX, "IAX"},
+ {AST_FRAME_TEXT, "Text"},
+ {AST_FRAME_IMAGE, "Image"},
+ {AST_FRAME_HTML, "HTML"},
+ {AST_FRAME_CNG, "Comfort Noise"},
+ {AST_FRAME_MODEM, "Modem"},
{AST_FRAME_DTMF_BEGIN, "DTMF Begin"},
- {0,NULL}
+ {0, NULL}
};
+static value_string_ext iax_frame_types_ext = VALUE_STRING_EXT_INIT(iax_frame_types);
/* Subclasses for IAX packets */
static const value_string iax_iax_subclasses[] = {
- {0, "(0?)"},
- {1, "NEW"},
- {2, "PING"},
- {3, "PONG"},
- {4, "ACK"},
- {5, "HANGUP"},
- {6, "REJECT"},
- {7, "ACCEPT"},
- {8, "AUTHREQ"},
- {9, "AUTHREP"},
+ { 0, "(0?)"},
+ { 1, "NEW"},
+ { 2, "PING"},
+ { 3, "PONG"},
+ { 4, "ACK"},
+ { 5, "HANGUP"},
+ { 6, "REJECT"},
+ { 7, "ACCEPT"},
+ { 8, "AUTHREQ"},
+ { 9, "AUTHREP"},
{10, "INVAL"},
{11, "LAGRQ"},
{12, "LAGRP"},
{35, "PROVISION"},
{36, "FWDOWNL"},
{37, "FWDATA"},
- {0,NULL}
+ {38, "TXMEDIA"},
+ {39, "RTKEY"},
+ {40, "CALLTOKEN"},
+ {0, NULL}
};
+static value_string_ext iax_iax_subclasses_ext = VALUE_STRING_EXT_INIT(iax_iax_subclasses);
-/* Subclassess for Control packets */
+/* Subclasses for Control packets */
static const value_string iax_cmd_subclasses[] = {
{0, "(0?)"},
{1, "HANGUP"},
{6, "TKOFFHK"},
{7, "OFFHOOK"},
{0xFF, "stop sounds"}, /* sent by app_dial, and not much else */
- {0,NULL}
+ {0, NULL}
};
+static value_string_ext iax_cmd_subclasses_ext = VALUE_STRING_EXT_INIT(iax_cmd_subclasses);
-/* IAX2 to tap-voip call state mapping */
+/* IAX2 to tap-voip call state mapping for command frames */
static const voip_call_state tap_cmd_voip_state[] = {
VOIP_NO_STATE,
VOIP_COMPLETED, /*HANGUP*/
VOIP_UNKNOWN, /*TKOFFHK*/
VOIP_UNKNOWN /*OFFHOOK*/
};
+#define NUM_TAP_CMD_VOIP_STATES array_length(tap_cmd_voip_state)
+/* IAX2 to tap-voip call state mapping for IAX frames */
+static const voip_call_state tap_iax_voip_state[] = {
+ VOIP_NO_STATE,
+ VOIP_CALL_SETUP, /*NEW*/
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_COMPLETED, /*HANGUP*/
+ VOIP_REJECTED, /*REJECT*/
+ VOIP_RINGING, /*ACCEPT*/
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_CALL_SETUP, /*DIAL*/
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE,
+ VOIP_NO_STATE
+};
+
+#define NUM_TAP_IAX_VOIP_STATES array_length(tap_iax_voip_state)
-/* Subclassess for Modem packets */
+/* Subclasses for Modem packets */
static const value_string iax_modem_subclasses[] = {
{0, "(0?)"},
{1, "T.38"},
{2, "V.150"},
- {0,NULL}
+ {0, NULL}
+};
+
+/* Subclasses for Text packets */
+static const value_string iax_text_subclasses[] = {
+ {0, "Text"},
+ {0, NULL}
+};
+
+/* Subclasses for HTML packets */
+static const value_string iax_html_subclasses[] = {
+ {0x01, "Sending a URL"},
+ {0x02, "Data frame"},
+ {0x04, "Beginning frame"},
+ {0x08, "End frame"},
+ {0x10, "Load is complete"},
+ {0x11, "Peer does not support HTML"},
+ {0x12, "Link URL"},
+ {0x13, "Unlink URL"},
+ {0x14, "Reject Link URL"},
+ {0, NULL}
};
+
/* Information elements */
static const value_string iax_ies_type[] = {
- {IAX_IE_CALLED_NUMBER, "Number/extension being called"},
- {IAX_IE_CALLING_NUMBER, "Calling number"},
- {IAX_IE_CALLING_ANI, "Calling number ANI for billing"},
- {IAX_IE_CALLING_NAME, "Name of caller"},
- {IAX_IE_CALLED_CONTEXT, "Context for number"},
- {IAX_IE_USERNAME, "Username (peer or user) for authentication"},
- {IAX_IE_PASSWORD, "Password for authentication"},
- {IAX_IE_CAPABILITY, "Actual codec capability"},
- {IAX_IE_FORMAT, "Desired codec format"},
- {IAX_IE_LANGUAGE, "Desired language"},
- {IAX_IE_VERSION, "Protocol version"},
- {IAX_IE_ADSICPE, "CPE ADSI capability"},
- {IAX_IE_DNID, "Originally dialed DNID"},
- {IAX_IE_AUTHMETHODS, "Authentication method(s)"},
- {IAX_IE_CHALLENGE, "Challenge data for MD5/RSA"},
- {IAX_IE_MD5_RESULT, "MD5 challenge result"},
- {IAX_IE_RSA_RESULT, "RSA challenge result"},
- {IAX_IE_APPARENT_ADDR, "Apparent address of peer"},
- {IAX_IE_REFRESH, "When to refresh registration"},
- {IAX_IE_DPSTATUS, "Dialplan status"},
- {IAX_IE_CALLNO, "Call number of peer"},
- {IAX_IE_CAUSE, "Cause"},
- {IAX_IE_IAX_UNKNOWN, "Unknown IAX command"},
- {IAX_IE_MSGCOUNT, "How many messages waiting"},
- {IAX_IE_AUTOANSWER, "Request auto-answering"},
- {IAX_IE_MUSICONHOLD, "Request musiconhold with QUELCH"},
- {IAX_IE_TRANSFERID, "Transfer Request Identifier"},
- {IAX_IE_RDNIS, "Referring DNIS"},
- {IAX_IE_PROVISIONING, "Provisioning info"},
- {IAX_IE_AESPROVISIONING, "AES Provisioning info"},
- {IAX_IE_DATETIME, "Date/Time"},
- {IAX_IE_DEVICETYPE, "Device type"},
- {IAX_IE_SERVICEIDENT, "Service Identifier"},
- {IAX_IE_FIRMWAREVER, "Firmware revision"},
- {IAX_IE_FWBLOCKDESC, "Firmware block description"},
- {IAX_IE_FWBLOCKDATA, "Firmware block of data"},
- {IAX_IE_PROVVER, "Provisioning version"},
- {IAX_IE_CALLINGPRES, "Calling presentation"},
- {IAX_IE_CALLINGTON, "Calling type of number"},
- {IAX_IE_CALLINGTNS, "Calling transit network select"},
- {IAX_IE_SAMPLINGRATE, "Supported sampling rates"},
- {IAX_IE_CAUSECODE, "Hangup cause"},
- {IAX_IE_ENCRYPTION, "Encryption format"},
- {IAX_IE_ENCKEY, "Raw encryption key"},
- {IAX_IE_CODEC_PREFS, "Codec preferences"},
- {IAX_IE_RR_JITTER, "Received jitter"},
- {IAX_IE_RR_LOSS, "Received loss"},
- {IAX_IE_RR_PKTS, "Received frames"},
- {IAX_IE_RR_DELAY, "Max playout delay in ms for received frames"},
- {IAX_IE_RR_DROPPED, "Dropped frames"},
- {IAX_IE_RR_OOO, "Frames received out of order"},
- {IAX_IE_DATAFORMAT, "Data call format"},
- {0,NULL}
+ {IAX_IE_CALLED_NUMBER, "Number/extension being called"},
+ {IAX_IE_CALLING_NUMBER, "Calling number"},
+ {IAX_IE_CALLING_ANI, "Calling number ANI for billing"},
+ {IAX_IE_CALLING_NAME, "Name of caller"},
+ {IAX_IE_CALLED_CONTEXT, "Context for number"},
+ {IAX_IE_USERNAME, "Username (peer or user) for authentication"},
+ {IAX_IE_PASSWORD, "Password for authentication"},
+ {IAX_IE_CAPABILITY, "Actual codec capability"},
+ {IAX_IE_FORMAT, "Desired codec format"},
+ {IAX_IE_LANGUAGE, "Desired language"},
+ {IAX_IE_VERSION, "Protocol version"},
+ {IAX_IE_ADSICPE, "CPE ADSI capability"},
+ {IAX_IE_DNID, "Originally dialed DNID"},
+ {IAX_IE_AUTHMETHODS, "Authentication method(s)"},
+ {IAX_IE_CHALLENGE, "Challenge data for MD5/RSA"},
+ {IAX_IE_MD5_RESULT, "MD5 challenge result"},
+ {IAX_IE_RSA_RESULT, "RSA challenge result"},
+ {IAX_IE_APPARENT_ADDR, "Apparent address of peer"},
+ {IAX_IE_REFRESH, "When to refresh registration"},
+ {IAX_IE_DPSTATUS, "Dialplan status"},
+ {IAX_IE_CALLNO, "Call number of peer"},
+ {IAX_IE_CAUSE, "Cause"},
+ {IAX_IE_IAX_UNKNOWN, "Unknown IAX command"},
+ {IAX_IE_MSGCOUNT, "How many messages waiting"},
+ {IAX_IE_AUTOANSWER, "Request auto-answering"},
+ {IAX_IE_MUSICONHOLD, "Request musiconhold with QUELCH"},
+ {IAX_IE_TRANSFERID, "Transfer Request Identifier"},
+ {IAX_IE_RDNIS, "Referring DNIS"},
+ {IAX_IE_PROVISIONING, "Provisioning info"},
+ {IAX_IE_AESPROVISIONING, "AES Provisioning info"},
+ {IAX_IE_DATETIME, "Date/Time"},
+ {IAX_IE_DEVICETYPE, "Device type"},
+ {IAX_IE_SERVICEIDENT, "Service Identifier"},
+ {IAX_IE_FIRMWAREVER, "Firmware revision"},
+ {IAX_IE_FWBLOCKDESC, "Firmware block description"},
+ {IAX_IE_FWBLOCKDATA, "Firmware block of data"},
+ {IAX_IE_PROVVER, "Provisioning version"},
+ {IAX_IE_CALLINGPRES, "Calling presentation"},
+ {IAX_IE_CALLINGTON, "Calling type of number"},
+ {IAX_IE_CALLINGTNS, "Calling transit network select"},
+ {IAX_IE_SAMPLINGRATE, "Supported sampling rates"},
+ {IAX_IE_CAUSECODE, "Hangup cause"},
+ {IAX_IE_ENCRYPTION, "Encryption format"},
+ {IAX_IE_ENCKEY, "Raw encryption key"},
+ {IAX_IE_CODEC_PREFS, "Codec preferences"},
+ {IAX_IE_RR_JITTER, "Received jitter"},
+ {IAX_IE_RR_LOSS, "Received loss"},
+ {IAX_IE_RR_PKTS, "Received frames"},
+ {IAX_IE_RR_DELAY, "Max playout delay in ms for received frames"},
+ {IAX_IE_RR_DROPPED, "Dropped frames"},
+ {IAX_IE_RR_OOO, "Frames received out of order"},
+ {IAX_IE_VARIABLE, "IAX2 variable"},
+ {IAX_IE_OSPTOKEN, "OSP Token"},
+ {IAX_IE_CALLTOKEN, "Call Token"},
+ {IAX_IE_CAPABILITY2, "64-bit codec capability"},
+ {IAX_IE_FORMAT2, "64-bit codec format"},
+ {IAX_IE_DATAFORMAT, "Data call format"},
+ {0, NULL}
};
+static value_string_ext iax_ies_type_ext = VALUE_STRING_EXT_INIT(iax_ies_type);
static const value_string codec_types[] = {
- {AST_FORMAT_G723_1, "G.723.1 compression"},
- {AST_FORMAT_GSM, "GSM compression"},
- {AST_FORMAT_ULAW, "Raw mu-law data (G.711)"},
- {AST_FORMAT_ALAW, "Raw A-law data (G.711)"},
- {AST_FORMAT_G726, "ADPCM (G.726, 32kbps)"},
- {AST_FORMAT_ADPCM, "ADPCM (IMA)"},
- {AST_FORMAT_SLINEAR, "Raw 16-bit Signed Linear (8000 Hz) PCM"},
- {AST_FORMAT_LPC10, "LPC10, 180 samples/frame"},
- {AST_FORMAT_G729A, "G.729a Audio"},
- {AST_FORMAT_SPEEX, "SpeeX Free Compression"},
- {AST_FORMAT_ILBC, "iLBC Free Compression"},
- {AST_FORMAT_JPEG, "JPEG Images"},
- {AST_FORMAT_PNG, "PNG Images"},
- {AST_FORMAT_H261, "H.261 Video"},
- {AST_FORMAT_H263, "H.263 Video"},
- {0,NULL}
+ {AST_FORMAT_G723_1, "G.723.1 compression"},
+ {AST_FORMAT_GSM, "GSM compression"},
+ {AST_FORMAT_ULAW, "Raw mu-law data (G.711)"},
+ {AST_FORMAT_ALAW, "Raw A-law data (G.711)"},
+ {AST_FORMAT_G726_AAL2, "ADPCM (G.726, 32kbps)"},
+ {AST_FORMAT_ADPCM, "ADPCM (IMA)"},
+ {AST_FORMAT_SLINEAR, "Raw 16-bit Signed Linear (8000 Hz) PCM"},
+ {AST_FORMAT_LPC10, "LPC10, 180 samples/frame"},
+ {AST_FORMAT_G729A, "G.729a Audio"},
+ {AST_FORMAT_SPEEX, "SpeeX Free Compression"},
+ {AST_FORMAT_ILBC, "iLBC Free Compression"},
+ {AST_FORMAT_G726, "G.726 compression"},
+ {AST_FORMAT_G722, "G.722 wideband"},
+ {AST_FORMAT_SIREN7, "G.722.1 32k wideband (aka Siren7)"},
+ {AST_FORMAT_SIREN14, "G.722.1 Annex C 48k wideband (aka Siren14)"},
+ {AST_FORMAT_SLINEAR16, "Raw 16kHz signed linear audio"},
+ {AST_FORMAT_JPEG, "JPEG Images"},
+ {AST_FORMAT_PNG, "PNG Images"},
+ {AST_FORMAT_H261, "H.261 Video"},
+ {AST_FORMAT_H263, "H.263 Video"},
+ {AST_FORMAT_H263_PLUS, "H.263+ Video"},
+ {AST_FORMAT_H264, "H.264 Video"},
+ {AST_FORMAT_MP4_VIDEO, "MPEG4 Video"},
+ {0, NULL}
};
+static value_string_ext codec_types_ext = VALUE_STRING_EXT_INIT(codec_types);
static const value_string iax_dataformats[] = {
- {AST_DATAFORMAT_NULL, "N/A (analogue call?)"},
- {AST_DATAFORMAT_V110, "ITU-T V.110 rate adaption"},
- {AST_DATAFORMAT_H223_H245,"ITU-T H.223/H.245"},
- {0,NULL}
+ {AST_DATAFORMAT_NULL, "N/A (analogue call?)"},
+ {AST_DATAFORMAT_V110, "ITU-T V.110 rate adaption"},
+ {AST_DATAFORMAT_H223_H245, "ITU-T H.223/H.245"},
+ {0, NULL}
};
{IAX2_MINI_VOICE_PACKET, "Mini voice packet"},
{IAX2_MINI_VIDEO_PACKET, "Mini video packet"},
{IAX2_TRUNK_PACKET, "Trunk packet"},
- {0,NULL}
+ {0, NULL}
};
static const value_string iax_causecodes[] = {
- {AST_CAUSE_UNALLOCATED, "Unallocated"},
- {AST_CAUSE_NO_ROUTE_TRANSIT_NET, "No route transit net"},
- {AST_CAUSE_NO_ROUTE_DESTINATION, "No route to destination"},
- {AST_CAUSE_CHANNEL_UNACCEPTABLE, "Channel unacceptable"},
- {AST_CAUSE_CALL_AWARDED_DELIVERED, "Call awarded delivered"},
- {AST_CAUSE_NORMAL_CLEARING, "Normal clearing"},
- {AST_CAUSE_USER_BUSY, "User busy"},
- {AST_CAUSE_NO_USER_RESPONSE, "No user response"},
- {AST_CAUSE_NO_ANSWER, "No answer"},
- {AST_CAUSE_CALL_REJECTED, "Call rejected"},
- {AST_CAUSE_NUMBER_CHANGED, "Number changed"},
- {AST_CAUSE_DESTINATION_OUT_OF_ORDER, "Destination out of order"},
- {AST_CAUSE_INVALID_NUMBER_FORMAT, "Invalid number format"},
- {AST_CAUSE_FACILITY_REJECTED, "Facility rejected"},
- {AST_CAUSE_RESPONSE_TO_STATUS_ENQUIRY, "Response to status inquiry"},
- {AST_CAUSE_NORMAL_UNSPECIFIED, "Normal unspecified"},
- {AST_CAUSE_NORMAL_CIRCUIT_CONGESTION, "Normal circuit congestion"},
- {AST_CAUSE_NETWORK_OUT_OF_ORDER, "Network out of order"},
- {AST_CAUSE_NORMAL_TEMPORARY_FAILURE, "Normal temporary failure"},
- {AST_CAUSE_SWITCH_CONGESTION, "Switch congestion"},
- {AST_CAUSE_ACCESS_INFO_DISCARDED, "Access info discarded"},
- {AST_CAUSE_REQUESTED_CHAN_UNAVAIL, "Requested channel unavailable"},
- {AST_CAUSE_PRE_EMPTED, "Preempted"},
- {AST_CAUSE_FACILITY_NOT_SUBSCRIBED, "Facility not subscribed"},
- {AST_CAUSE_OUTGOING_CALL_BARRED, "Outgoing call barred"},
- {AST_CAUSE_INCOMING_CALL_BARRED, "Incoming call barred"},
- {AST_CAUSE_BEARERCAPABILITY_NOTAUTH, "Bearer capability not authorized"},
- {AST_CAUSE_BEARERCAPABILITY_NOTAVAIL, "Bearer capability not available"},
- {AST_CAUSE_BEARERCAPABILITY_NOTIMPL, "Bearer capability not implemented"},
- {AST_CAUSE_CHAN_NOT_IMPLEMENTED, "Channel not implemented"},
- {AST_CAUSE_FACILITY_NOT_IMPLEMENTED, "Facility not implemented"},
- {AST_CAUSE_INVALID_CALL_REFERENCE, "Invalid call reference"},
- {AST_CAUSE_INCOMPATIBLE_DESTINATION, "Incompatible destination"},
- {AST_CAUSE_INVALID_MSG_UNSPECIFIED, "Invalid message unspecified"},
- {AST_CAUSE_MANDATORY_IE_MISSING, "Mandatory IE missing"},
- {AST_CAUSE_MESSAGE_TYPE_NONEXIST, "Message type nonexistent"},
- {AST_CAUSE_WRONG_MESSAGE, "Wrong message"},
- {AST_CAUSE_IE_NONEXIST, "IE nonexistent"},
- {AST_CAUSE_INVALID_IE_CONTENTS, "Invalid IE contents"},
- {AST_CAUSE_WRONG_CALL_STATE, "Wrong call state"},
- {AST_CAUSE_RECOVERY_ON_TIMER_EXPIRE, "Recovery on timer expire"},
- {AST_CAUSE_MANDATORY_IE_LENGTH_ERROR, "Mandatory IE length error"},
- {AST_CAUSE_PROTOCOL_ERROR, "Protocol error"},
- {AST_CAUSE_INTERWORKING, "Interworking"},
+ {AST_CAUSE_UNALLOCATED, "Unallocated"},
+ {AST_CAUSE_NO_ROUTE_TRANSIT_NET, "No route transit net"},
+ {AST_CAUSE_NO_ROUTE_DESTINATION, "No route to destination"},
+ {AST_CAUSE_MISDIALLED_TRUNK_PREFIX, "Misdialled trunk prefix"},
+ {AST_CAUSE_CHANNEL_UNACCEPTABLE, "Channel unacceptable"},
+ {AST_CAUSE_CALL_AWARDED_DELIVERED, "Call awarded delivered"},
+ {AST_CAUSE_PRE_EMPTED, "Preempted"},
+ {AST_CAUSE_NUMBER_PORTED_NOT_HERE, "Number ported not here"},
+ {AST_CAUSE_NORMAL_CLEARING, "Normal clearing"},
+ {AST_CAUSE_USER_BUSY, "User busy"},
+ {AST_CAUSE_NO_USER_RESPONSE, "No user response"},
+ {AST_CAUSE_NO_ANSWER, "No answer"},
+ {AST_CAUSE_SUBSCRIBER_ABSENT, "Subscriber absent"},
+ {AST_CAUSE_CALL_REJECTED, "Call rejected"},
+ {AST_CAUSE_NUMBER_CHANGED, "Number changed"},
+ {AST_CAUSE_REDIRECTED_TO_NEW_DESTINATION, "Redirected to new destination"},
+ {AST_CAUSE_ANSWERED_ELSEWHERE, "Answered elsewhere"},
+ {AST_CAUSE_DESTINATION_OUT_OF_ORDER, "Destination out of order"},
+ {AST_CAUSE_INVALID_NUMBER_FORMAT, "Invalid number format"},
+ {AST_CAUSE_FACILITY_REJECTED, "Facility rejected"},
+ {AST_CAUSE_RESPONSE_TO_STATUS_ENQUIRY, "Response to status inquiry"},
+ {AST_CAUSE_NORMAL_UNSPECIFIED, "Normal unspecified"},
+ {AST_CAUSE_NORMAL_CIRCUIT_CONGESTION, "Normal circuit congestion"},
+ {AST_CAUSE_NETWORK_OUT_OF_ORDER, "Network out of order"},
+ {AST_CAUSE_NORMAL_TEMPORARY_FAILURE, "Normal temporary failure"},
+ {AST_CAUSE_SWITCH_CONGESTION, "Switch congestion"},
+ {AST_CAUSE_ACCESS_INFO_DISCARDED, "Access info discarded"},
+ {AST_CAUSE_REQUESTED_CHAN_UNAVAIL, "Requested channel unavailable"},
+ {AST_CAUSE_FACILITY_NOT_SUBSCRIBED, "Facility not subscribed"},
+ {AST_CAUSE_OUTGOING_CALL_BARRED, "Outgoing call barred"},
+ {AST_CAUSE_INCOMING_CALL_BARRED, "Incoming call barred"},
+ {AST_CAUSE_BEARERCAPABILITY_NOTAUTH, "Bearer capability not authorized"},
+ {AST_CAUSE_BEARERCAPABILITY_NOTAVAIL, "Bearer capability not available"},
+ {AST_CAUSE_BEARERCAPABILITY_NOTIMPL, "Bearer capability not implemented"},
+ {AST_CAUSE_CHAN_NOT_IMPLEMENTED, "Channel not implemented"},
+ {AST_CAUSE_FACILITY_NOT_IMPLEMENTED, "Facility not implemented"},
+ {AST_CAUSE_INVALID_CALL_REFERENCE, "Invalid call reference"},
+ {AST_CAUSE_INCOMPATIBLE_DESTINATION, "Incompatible destination"},
+ {AST_CAUSE_INVALID_MSG_UNSPECIFIED, "Invalid message unspecified"},
+ {AST_CAUSE_MANDATORY_IE_MISSING, "Mandatory IE missing"},
+ {AST_CAUSE_MESSAGE_TYPE_NONEXIST, "Message type nonexistent"},
+ {AST_CAUSE_WRONG_MESSAGE, "Wrong message"},
+ {AST_CAUSE_IE_NONEXIST, "IE nonexistent"},
+ {AST_CAUSE_INVALID_IE_CONTENTS, "Invalid IE contents"},
+ {AST_CAUSE_WRONG_CALL_STATE, "Wrong call state"},
+ {AST_CAUSE_RECOVERY_ON_TIMER_EXPIRE, "Recovery on timer expire"},
+ {AST_CAUSE_MANDATORY_IE_LENGTH_ERROR, "Mandatory IE length error"},
+ {AST_CAUSE_PROTOCOL_ERROR, "Protocol error"},
+ {AST_CAUSE_INTERWORKING, "Interworking"},
{0, NULL}
};
-
+static value_string_ext iax_causecodes_ext = VALUE_STRING_EXT_INIT(iax_causecodes);
/* ************************************************************************* */
/* start with a hash of {addr,port type,port,call}->{id} */
typedef struct {
- address addr;
+ address addr;
port_type ptype;
- guint32 port;
- guint32 callno;
+ guint32 port;
+ guint32 callno;
/* this is where addr->data points to. it's put in here for easy freeing */
guint8 address_data[MAX_ADDRESS];
} iax_circuit_key;
/* tables */
+static GHashTable *iax_fid_table = NULL;
+static reassembly_table iax_reassembly_table;
+
static GHashTable *iax_circuit_hashtab = NULL;
static guint circuitcount = 0;
#ifdef DEBUG_HASHING
static gchar *key_to_str( const iax_circuit_key *key )
{
- static int i=0;
- static gchar *strp, str[3][80];
+ static int i = 0;
+ static gchar str[3][80];
+ gchar *strp;
+ gchar *addrstr;
i++;
- if(i>=3){
- i=0;
+ if (i >= 3) {
+ i = 0;
}
- strp=str[i];
-
- /* why doesn't ep_address_to_str take a const pointer?
- cast the warnings into oblivion. */
+ strp = str[i];
- /* XXX - is this a case for ep_alloc? */
+ addrstr = address_to_str(NULL, &key->addr)
g_snprintf(strp, 80, "{%s:%i,%i}",
- ep_address_to_str((address *)&key->addr),
+ addrstr,
key->port,
key->callno);
+ wmem_free(NULL, addrstr);
return strp;
}
#endif
const iax_circuit_key *v2 = (const iax_circuit_key *)w;
gint result;
- result = ( ADDRESSES_EQUAL(&(v1->addr), &(v2->addr)) &&
- v1->ptype == v2->ptype &&
- v1->port == v2->port &&
- v1->callno== v2->callno);
+ result = (ADDRESSES_EQUAL(&(v1->addr), &(v2->addr)) &&
+ v1->ptype == v2->ptype &&
+ v1->port == v2->port &&
+ v1->callno== v2->callno);
#ifdef DEBUG_HASHING
- g_debug( "+++ Comparing for equality: %s, %s: %u",key_to_str(v1), key_to_str(v2), result);
+ g_debug("+++ Comparing for equality: %s, %s: %u", key_to_str(v1), key_to_str(v2), result);
#endif
return result;
}
-static guint iax_circuit_hash (gconstpointer v)
+static guint iax_circuit_hash(gconstpointer v)
{
const iax_circuit_key *key = (const iax_circuit_key *)v;
- guint hash_val;
+ guint hash_val;
hash_val = 0;
ADD_ADDRESS_TO_HASH(hash_val, &key->addr);
hash_val += (guint)(key->callno);
#ifdef DEBUG_HASHING
- g_debug( "+++ Hashing key: %s, result %#x", key_to_str(key), hash_val );
+ g_debug("+++ Hashing key: %s, result %#x", key_to_str(key), hash_val);
#endif
- return (guint) hash_val;
+ return (guint)hash_val;
}
/* Find, or create, a circuit for the given
guint32 port,
guint32 callno)
{
- iax_circuit_key key;
- guint32 *circuit_id_p;
+ iax_circuit_key key;
+ guint32 *circuit_id_p;
- key.addr = *address_p;
- key.ptype = ptype;
- key.port = port;
+ key.addr = *address_p;
+ key.ptype = ptype;
+ key.port = port;
key.callno = callno;
- circuit_id_p = g_hash_table_lookup( iax_circuit_hashtab, &key);
- if( ! circuit_id_p ) {
+ circuit_id_p = (guint32 *)g_hash_table_lookup(iax_circuit_hashtab, &key);
+ if (! circuit_id_p) {
iax_circuit_key *new_key;
- new_key = se_alloc(sizeof(iax_circuit_key));
+ new_key = wmem_new(wmem_file_scope(), iax_circuit_key);
new_key->addr.type = address_p->type;
- new_key->addr.len = MIN(address_p->len,MAX_ADDRESS);
+ new_key->addr.len = MIN(address_p->len, MAX_ADDRESS);
new_key->addr.data = new_key->address_data;
- memcpy(new_key->address_data,address_p->data,new_key->addr.len);
- new_key->ptype = ptype;
- new_key->port = port;
- new_key->callno = callno;
+ memcpy(new_key->address_data, address_p->data, new_key->addr.len);
+ new_key->ptype = ptype;
+ new_key->port = port;
+ new_key->callno = callno;
- circuit_id_p = se_alloc(sizeof(iax_circuit_key));
+ circuit_id_p = (guint32 *)wmem_new(wmem_file_scope(), iax_circuit_key);
*circuit_id_p = ++circuitcount;
g_hash_table_insert(iax_circuit_hashtab, new_key, circuit_id_p);
*/
iax_dataformat_t dataformat;
- guint32 src_codec, dst_codec;
- guint32 src_vformat, dst_vformat;
+ guint32 src_codec, dst_codec;
+ guint32 src_vformat, dst_vformat;
/* when a transfer takes place, we'll get a new circuit id; we assume that we
don't try to transfer more than IAX_MAX_TRANSFERS times in a call */
/* the absolute start time of the call */
nstime_t start_time;
- GHashTable *fid_table;
- GHashTable *fragment_table;
iax_call_dirdata dirdata[2];
} iax_call_data;
{
if (iax_circuit_hashtab)
g_hash_table_destroy(iax_circuit_hashtab);
-
iax_circuit_hashtab = g_hash_table_new(iax_circuit_hash, iax_circuit_equal);
-
circuitcount = 0;
+
+ if (iax_fid_table)
+ g_hash_table_destroy(iax_fid_table);
+ iax_fid_table = g_hash_table_new(g_direct_hash, g_direct_equal);
+
+ reassembly_table_init(&iax_reassembly_table,
+ &addresses_reassembly_table_functions);
}
* transferred.
*
*/
-static circuit_t *iax2_new_circuit_for_call(guint circuit_id, guint framenum, iax_call_data *iax_call,
- gboolean reversed)
+static circuit_t *iax2_new_circuit_for_call(packet_info *pinfo, proto_item * item,
+ guint circuit_id, guint framenum,
+ iax_call_data *iax_call, gboolean reversed)
{
circuit_t *res;
- if(( reversed && iax_call->n_reverse_circuit_ids >= IAX_MAX_TRANSFERS) ||
- ( !reversed && iax_call->n_forward_circuit_ids >= IAX_MAX_TRANSFERS)) {
- g_warning("Too many transfers for iax_call");
+ if(!iax_call){
+ return NULL;
+ }
+ if ((reversed && iax_call->n_reverse_circuit_ids >= IAX_MAX_TRANSFERS) ||
+ (! reversed && iax_call->n_forward_circuit_ids >= IAX_MAX_TRANSFERS)) {
+ expert_add_info(pinfo, item, &ei_iax_too_many_transfers);
return NULL;
}
res = circuit_new(CT_IAX2,
circuit_id,
- framenum );
+ framenum);
circuit_add_proto_data(res, proto_iax2, iax_call);
- if( reversed )
+ if (reversed)
iax_call -> reverse_circuit_ids[iax_call->n_reverse_circuit_ids++] = circuit_id;
else
iax_call -> forward_circuit_ids[iax_call->n_forward_circuit_ids++] = circuit_id;
const iax_call_data *iax_call)
{
guint i;
- for(i=0;i<iax_call->n_forward_circuit_ids;i++){
- if(circuit_id == iax_call->forward_circuit_ids[i])
+ for(i=0; i<iax_call->n_forward_circuit_ids; i++) {
+ if (circuit_id == iax_call->forward_circuit_ids[i])
return TRUE;
}
return FALSE;
const iax_call_data *iax_call)
{
guint i;
- for(i=0;i<iax_call->n_reverse_circuit_ids;i++){
- if(circuit_id == iax_call->reverse_circuit_ids[i])
+ for(i=0; i<iax_call->n_reverse_circuit_ids; i++){
+ if (circuit_id == iax_call->reverse_circuit_ids[i])
return TRUE;
}
return FALSE;
}
-static iax_call_data *iax_lookup_call_from_dest( guint src_circuit_id,
+static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * item,
+ guint src_circuit_id,
guint dst_circuit_id,
guint framenum,
gboolean *reversed_p)
{
- circuit_t *dst_circuit;
- iax_call_data * iax_call;
- gboolean reversed = FALSE;
+ circuit_t *dst_circuit;
+ iax_call_data *iax_call;
+ gboolean reversed = FALSE;
- dst_circuit = find_circuit( CT_IAX2,
- dst_circuit_id,
- framenum );
+ dst_circuit = find_circuit(CT_IAX2,
+ dst_circuit_id,
+ framenum);
- if( !dst_circuit ) {
+ if (!dst_circuit) {
#ifdef DEBUG_HASHING
- g_debug( "++ destination circuit not found, must have missed NEW packet" );
+ g_debug("++ destination circuit not found, must have missed NEW packet");
#endif
- if( reversed_p )
+ if (reversed_p)
*reversed_p = FALSE;
return NULL;
}
#ifdef DEBUG_HASHING
- g_debug( "++ found destination circuit" );
+ g_debug("++ found destination circuit");
#endif
- iax_call = (iax_call_data *)circuit_get_proto_data(dst_circuit,proto_iax2);
+ iax_call = (iax_call_data *)circuit_get_proto_data(dst_circuit, proto_iax2);
/* there's no way we can create a CT_IAX2 circuit without adding
iax call data to it; assert this */
DISSECTOR_ASSERT(iax_call);
- if( is_forward_circuit(dst_circuit_id, iax_call )) {
+ if (is_forward_circuit(dst_circuit_id, iax_call)) {
#ifdef DEBUG_HASHING
- g_debug( "++ destination circuit matches forward_circuit_id of call, "
- "therefore packet is reversed" );
+ g_debug("++ destination circuit matches forward_circuit_id of call, "
+ "therefore packet is reversed");
#endif
reversed = TRUE;
- if( iax_call -> n_reverse_circuit_ids == 0 ) {
+ if (iax_call -> n_reverse_circuit_ids == 0) {
/* we are going in the reverse direction, and this call
doesn't have a reverse circuit associated with it.
create one now. */
#ifdef DEBUG_HASHING
- g_debug( "++ reverse_circuit_id of call is zero, need to create a "
- "new reverse circuit for this call" );
+ g_debug("++ reverse_circuit_id of call is zero, need to create a "
+ "new reverse circuit for this call");
#endif
- iax2_new_circuit_for_call( src_circuit_id, framenum, iax_call, TRUE );
+ iax2_new_circuit_for_call(pinfo, item, src_circuit_id, framenum, iax_call, TRUE);
#ifdef DEBUG_HASHING
- g_debug( "++ done" );
+ g_debug("++ done");
#endif
- } else if( !is_reverse_circuit(src_circuit_id, iax_call )) {
- g_warning( "IAX Packet %u from circuit ids %u->%u "
- "conflicts with earlier call with circuit ids %u->%u",
- framenum,
- src_circuit_id,dst_circuit_id,
- iax_call->forward_circuit_ids[0],
- iax_call->reverse_circuit_ids[0]);
+ } else if (!is_reverse_circuit(src_circuit_id, iax_call)) {
+ expert_add_info_format(pinfo, item, &ei_iax_circuit_id_conflict,
+ "IAX Packet %u from circuit ids %u->%u conflicts with earlier call with circuit ids %u->%u",
+ framenum,
+ src_circuit_id, dst_circuit_id,
+ iax_call->forward_circuit_ids[0],
+ iax_call->reverse_circuit_ids[0]);
return NULL;
}
- } else if ( is_reverse_circuit(dst_circuit_id, iax_call)) {
+ } else if (is_reverse_circuit(dst_circuit_id, iax_call)) {
#ifdef DEBUG_HASHING
- g_debug( "++ destination circuit matches reverse_circuit_id of call, "
- "therefore packet is forward" );
+ g_debug("++ destination circuit matches reverse_circuit_id of call, "
+ "therefore packet is forward");
#endif
reversed = FALSE;
- if( !is_forward_circuit(src_circuit_id, iax_call)) {
- g_warning( "IAX Packet %u from circuit ids %u->%u "
- "conflicts with earlier call with circuit ids %u->%u",
- framenum,
- src_circuit_id,dst_circuit_id,
- iax_call->forward_circuit_ids[0],
- iax_call->reverse_circuit_ids[0]);
- if( reversed_p )
+ if (!is_forward_circuit(src_circuit_id, iax_call)) {
+ expert_add_info_format(pinfo, item, &ei_iax_circuit_id_conflict,
+ "IAX Packet %u from circuit ids %u->%u conflicts with earlier call with circuit ids %u->%u",
+ framenum,
+ src_circuit_id, dst_circuit_id,
+ iax_call->forward_circuit_ids[0],
+ iax_call->reverse_circuit_ids[0]);
+ if (reversed_p)
*reversed_p = FALSE;
return NULL;
}
DISSECTOR_ASSERT_NOT_REACHED();
}
- if( reversed_p )
+ if (reversed_p)
*reversed_p = reversed;
return iax_call;
guint32 dcallno,
gboolean *reversed_p)
{
- gboolean reversed = FALSE;
+ gboolean reversed = FALSE;
iax_call_data *iax_call = NULL;
- guint src_circuit_id;
+ guint src_circuit_id;
+#ifdef DEBUG_HASHING
+ gchar *srcstr, *dststr;
+#endif
#ifdef DEBUG_HASHING
- g_debug( "++ iax_lookup_circuit_details: Looking up circuit for frame %u, "
- "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num,
- ep_address_to_str(&pinfo->src),pinfo->srcport,scallno,
- ep_address_to_str(&pinfo->dst),pinfo->destport,dcallno);
+ srcstr = address_to_str(NULL, &pinfo->src);
+ dststr = address_to_str(NULL, &pinfo->dst);
+ g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, "
+ "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num,
+ srcstr, pinfo->srcport, scallno,
+ dststr, pinfo->destport, dcallno);
+ wmem_free(NULL, srcstr);
+ wmem_free(NULL, dststr);
#endif
- src_circuit_id = iax_circuit_lookup(&pinfo->src,pinfo->ptype,
- pinfo->srcport,scallno);
+ src_circuit_id = iax_circuit_lookup(&pinfo->src, pinfo->ptype,
+ pinfo->srcport, scallno);
/* the most reliable indicator of call is the destination callno, if
we have one */
- if( dcallno != 0 ) {
+ if (dcallno != 0) {
guint dst_circuit_id;
#ifdef DEBUG_HASHING
- g_debug( "++ dcallno non-zero, looking up destination circuit" );
+ g_debug("++ dcallno non-zero, looking up destination circuit");
#endif
- dst_circuit_id = iax_circuit_lookup(&pinfo->dst,pinfo->ptype,
- pinfo->destport,dcallno);
+ dst_circuit_id = iax_circuit_lookup(&pinfo->dst, pinfo->ptype,
+ pinfo->destport, dcallno);
- iax_call = iax_lookup_call_from_dest(src_circuit_id, dst_circuit_id,
+ iax_call = iax_lookup_call_from_dest(pinfo, NULL, src_circuit_id, dst_circuit_id,
pinfo->fd->num, &reversed);
} else {
circuit_t *src_circuit;
/* in all other circumstances, the source circuit should already
- * exist: its absense indicates that we missed the all-important NEW
+ * exist: its absence indicates that we missed the all-important NEW
* packet.
*/
- src_circuit = find_circuit( CT_IAX2,
- src_circuit_id,
- pinfo->fd->num );
+ src_circuit = find_circuit(CT_IAX2,
+ src_circuit_id,
+ pinfo->fd->num);
- if( src_circuit ) {
- iax_call = (iax_call_data *)circuit_get_proto_data(src_circuit,proto_iax2);
+ if (src_circuit) {
+ iax_call = (iax_call_data *)circuit_get_proto_data(src_circuit, proto_iax2);
/* there's no way we can create a CT_IAX2 circuit without adding
iax call data to it; assert this */
DISSECTOR_ASSERT(iax_call);
- if( is_forward_circuit(src_circuit_id,iax_call))
+ if (is_forward_circuit(src_circuit_id, iax_call))
reversed = FALSE;
- else if(is_reverse_circuit(src_circuit_id,iax_call))
+ else if (is_reverse_circuit(src_circuit_id, iax_call))
reversed = TRUE;
else {
/* there's also no way we can attach an iax_call_data to a circuit
}
}
- if(reversed_p)
+ if (reversed_p)
*reversed_p = reversed;
#ifdef DEBUG_HASHING
- if( iax_call ) {
- g_debug( "++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0' );
+ if (iax_call) {
+ g_debug("++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0');
} else {
- g_debug( "++ Call not found. Must have missed the NEW packet?" );
+ g_debug("++ Call not found. Must have missed the NEW packet?");
}
#endif
return iax_call;
}
-/* initialise the per-direction parts of an iax_call_data structure */
+/* initialize the per-direction parts of an iax_call_data structure */
static void init_dir_data(iax_call_dirdata *dirdata)
{
dirdata -> current_frag_bytes=0;
static iax_call_data *iax_new_call( packet_info *pinfo,
guint32 scallno)
{
- iax_call_data *call;
- guint circuit_id;
- static const nstime_t millisecond = {0, 1000000};
+ iax_call_data *call;
+ guint circuit_id;
+ static const nstime_t millisecond = {0, 1000000};
#ifdef DEBUG_HASHING
- g_debug( "+ new_circuit: Handling NEW packet, frame %u", pinfo->fd->num );
+ g_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->fd->num);
#endif
- circuit_id = iax_circuit_lookup(&pinfo->src,pinfo->ptype,
- pinfo->srcport,scallno);
+ circuit_id = iax_circuit_lookup(&pinfo->src, pinfo->ptype,
+ pinfo->srcport, scallno);
- call = se_alloc(sizeof(iax_call_data));
- call -> dataformat = 0;
+ call = wmem_new(wmem_file_scope(), iax_call_data);
+ call -> dataformat = AST_DATAFORMAT_NULL;
call -> src_codec = 0;
call -> dst_codec = 0;
call -> n_forward_circuit_ids = 0;
call -> subdissector = NULL;
call -> start_time = pinfo->fd->abs_ts;
nstime_delta(&call -> start_time, &call -> start_time, &millisecond);
- call -> fid_table = g_hash_table_new(g_direct_hash, g_direct_equal);
init_dir_data(&call->dirdata[0]);
init_dir_data(&call->dirdata[1]);
- call->fragment_table = NULL;
- fragment_table_init(&(call->fragment_table));
- iax2_new_circuit_for_call(circuit_id,pinfo->fd->num,call,FALSE);
+ iax2_new_circuit_for_call(pinfo, NULL, circuit_id, pinfo->fd->num, call, FALSE);
return call;
}
/* per-packet data */
typedef struct iax_packet_data {
- gboolean first_time; /* we're dissecting this packet for the first time; so
- things like codec and transfer requests should be
- propogated into the call data */
+ gboolean first_time; /* we're dissecting this packet for the first time; so
+ * things like codec and transfer requests should be
+ * propagated into the call data */
iax_call_data *call_data;
- guint32 codec;
- gboolean reversed;
- nstime_t abstime; /* the absolute time of this packet, based on its
- * timestamp and the NEW packet's time (-1 if unknown) */
+ guint32 codec;
+ gboolean reversed;
+ nstime_t abstime; /* the absolute time of this packet, based on its
+ * timestamp and the NEW packet's time (-1 if unknown) */
} iax_packet_data;
static iax_packet_data *iax_new_packet_data(iax_call_data *call, gboolean reversed)
{
- iax_packet_data *p = se_alloc(sizeof(iax_packet_data));
- p->first_time=TRUE;
- p->call_data=call;
- p->codec=0;
- p->reversed=reversed;
- p->abstime.secs=-1;
- p->abstime.nsecs=-1;
+ iax_packet_data *p = wmem_new(wmem_file_scope(), iax_packet_data);
+ p->first_time = TRUE;
+ p->call_data = call;
+ p->codec = 0;
+ p->reversed = reversed;
+ p->abstime.secs = -1;
+ p->abstime.nsecs = -1;
return p;
}
-static void iax2_populate_pinfo_from_packet_data(packet_info *pinfo, const iax_packet_data * p)
+static void iax2_populate_pinfo_from_packet_data(packet_info *pinfo, const iax_packet_data *p)
{
/* info for subdissectors. We always pass on the original forward circuit,
* and steal the p2p_dir flag to indicate the direction */
- if( p->call_data == NULL ) {
+ if (p->call_data == NULL) {
/* if we missed the NEW packet for this call, call_data will be null. it's
* tbd what the best thing to do here is. */
pinfo -> ctype = CT_NONE;
pinfo -> circuit_id = (guint32)p->call_data->forward_circuit_ids[0];
pinfo -> p2p_dir = p->reversed?P2P_DIR_RECV:P2P_DIR_SENT;
- if (check_col (pinfo->cinfo, COL_IF_DIR))
- col_set_str (pinfo->cinfo, COL_IF_DIR, p->reversed ? "rev" : "fwd" );
+ col_set_str(pinfo->cinfo, COL_IF_DIR, p->reversed ? "rev" : "fwd");
}
}
/* this is passed up from the IE dissector to the main dissector */
typedef struct
{
- address peer_address;
+ address peer_address;
port_type peer_ptype;
- guint32 peer_port;
- guint32 peer_callno;
- guint32 dataformat;
+ guint32 peer_port;
+ guint32 peer_callno;
+ guint32 dataformat;
} iax2_ie_data;
-static guint32 dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno,
- packet_info * pinfo,
- proto_tree * iax2_tree,
- proto_tree * main_tree);
+static guint32 dissect_fullpacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno,
+ packet_info *pinfo,
+ proto_tree *iax2_tree,
+ proto_tree *main_tree);
+
+static guint32 dissect_minipacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno,
+ packet_info *pinfo,
+ proto_tree *iax2_tree,
+ proto_tree *main_tree);
-static guint32 dissect_minipacket (tvbuff_t * tvb, guint32 offset,
+static guint32 dissect_minivideopacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno,
+ packet_info *pinfo,
+ proto_tree *iax2_tree,
+ proto_tree *main_tree);
+
+static guint32 dissect_trunkpacket(tvbuff_t *tvb, guint32 offset,
guint16 scallno,
- packet_info * pinfo,
- proto_tree * iax2_tree,
- proto_tree * main_tree);
-
-static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno,
- packet_info * pinfo,
- proto_tree * iax2_tree,
- proto_tree * main_tree);
-
-static guint32 dissect_trunkpacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno,
- packet_info * pinfo,
- proto_tree * iax2_tree,
- proto_tree * main_tree);
+ packet_info *pinfo,
+ proto_tree *iax2_tree,
+ proto_tree *main_tree);
static void dissect_payload(tvbuff_t *tvb, guint32 offset,
packet_info *pinfo, proto_tree *iax2_tree,
static void
-dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+dissect_iax2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- proto_item *iax2_item = NULL;
- proto_tree *iax2_tree = NULL;
- proto_tree *full_mini_subtree = NULL;
- guint32 offset = 0, len;
- guint16 scallno = 0;
- guint16 stmp;
- packet_type type;
+ proto_item *iax2_item;
+ proto_tree *iax2_tree;
+ proto_tree *full_mini_subtree = NULL;
+ guint32 offset = 0, len;
+ guint16 scallno = 0;
+ guint16 stmp;
+ packet_type type;
+ proto_item *full_mini_base;
/* set up the protocol and info fields in the summary pane */
- col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_IAX2);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_IAX2);
col_clear(pinfo->cinfo, COL_INFO);
/* add the 'iax2' tree to the main tree */
- if (tree)
- {
- iax2_item = proto_tree_add_item (tree, proto_iax2, tvb, offset, -1, FALSE);
- iax2_tree = proto_item_add_subtree (iax2_item, ett_iax2);
- }
+ iax2_item = proto_tree_add_item(tree, proto_iax2, tvb, offset, -1, ENC_NA);
+ iax2_tree = proto_item_add_subtree(iax2_item, ett_iax2);
stmp = tvb_get_ntohs(tvb, offset);
- if( stmp == 0 ) {
+ if (stmp == 0) {
/* starting with 0x0000 indicates meta packet which can be either a mini
* video packet or a trunk packet */
offset+=2;
stmp = tvb_get_ntohs(tvb, offset);
- if( stmp & 0x8000 ) {
+ if (stmp & 0x8000) {
/* mini video packet */
type = IAX2_MINI_VIDEO_PACKET;
scallno = stmp & 0x7FFF;
/* The source call/fullpacket flag is common to both mini and full packets */
scallno = tvb_get_ntohs(tvb, offset);
offset += 2;
- if( scallno & 0x8000 )
+ if (scallno & 0x8000)
type = IAX2_FULL_PACKET;
else {
type = IAX2_MINI_VOICE_PACKET;
scallno &= 0x7FFF;
}
- if( tree ) {
- proto_item *full_mini_base;
-
- full_mini_base = proto_tree_add_uint(iax2_tree, hf_iax2_packet_type, tvb, 0, offset, type);
- full_mini_subtree = proto_item_add_subtree(full_mini_base, ett_iax2_full_mini_subtree);
+ full_mini_base = proto_tree_add_uint(iax2_tree, hf_iax2_packet_type, tvb, 0, offset, type);
+ full_mini_subtree = proto_item_add_subtree(full_mini_base, ett_iax2_full_mini_subtree);
- if( scallno != 0 )
- proto_tree_add_item (full_mini_subtree, hf_iax2_scallno, tvb, offset-2, 2, FALSE);
- }
+ if (scallno != 0)
+ proto_tree_add_item(full_mini_subtree, hf_iax2_scallno, tvb, offset-2, 2, ENC_BIG_ENDIAN);
iax2_info->ptype = type;
iax2_info->scallno = 0;
iax2_info->calledParty = NULL;
iax2_info->payload_data = NULL;
- switch( type ) {
+ switch (type) {
case IAX2_FULL_PACKET:
- len = dissect_fullpacket( tvb, offset, scallno, pinfo, full_mini_subtree, tree );
+ len = dissect_fullpacket(tvb, offset, scallno, pinfo, full_mini_subtree, tree);
break;
case IAX2_MINI_VOICE_PACKET:
iax2_info->messageName = "MINI_VOICE_PACKET";
- len = dissect_minipacket( tvb, offset, scallno, pinfo, full_mini_subtree, tree );
+ len = dissect_minipacket(tvb, offset, scallno, pinfo, full_mini_subtree, tree);
break;
case IAX2_MINI_VIDEO_PACKET:
iax2_info->messageName = "MINI_VIDEO_PACKET";
- len = dissect_minivideopacket( tvb, offset, scallno, pinfo, full_mini_subtree, tree );
+ len = dissect_minivideopacket(tvb, offset, scallno, pinfo, full_mini_subtree, tree);
break;
case IAX2_TRUNK_PACKET:
- /* not implemented yet */
iax2_info->messageName = "TRUNK_PACKET";
- len = dissect_trunkpacket( tvb, offset, scallno, pinfo, full_mini_subtree, tree );
+ len = dissect_trunkpacket(tvb, offset, scallno, pinfo, full_mini_subtree, tree);
break;
default:
len = 0;
static proto_item *dissect_datetime_ie(tvbuff_t *tvb, guint32 offset, proto_tree *ies_tree)
{
struct tm tm;
- guint32 ie_val;
- nstime_t datetime;
+ guint32 ie_val;
+ nstime_t datetime;
- proto_tree_add_item (ies_tree, hf_iax2_ies[IAX_IE_DATETIME], tvb, offset + 2, 4, FALSE);
+ proto_tree_add_item(ies_tree, hf_iax2_ies[IAX_IE_DATETIME], tvb, offset + 2, 4, ENC_BIG_ENDIAN);
ie_val = tvb_get_ntohl(tvb, offset+2);
/* who's crazy idea for a time encoding was this? */
- tm.tm_sec = (ie_val & 0x1f) << 1;
- tm.tm_min = (ie_val>>5) & 0x3f;
- tm.tm_hour = (ie_val>>11) & 0x1f;
- tm.tm_mday = (ie_val>>16) & 0x1f;
- tm.tm_mon = ((ie_val>>21) & 0xf) - 1;
+ tm.tm_sec = (ie_val & 0x1f) << 1;
+ tm.tm_min = (ie_val>>5) & 0x3f;
+ tm.tm_hour = (ie_val>>11) & 0x1f;
+ tm.tm_mday = (ie_val>>16) & 0x1f;
+ tm.tm_mon = ((ie_val>>21) & 0x0f) - 1;
tm.tm_year = ((ie_val>>25) & 0x7f) + 100;
tm.tm_isdst= -1; /* there's no info on whether DST was in force; assume it's
* the same as currently */
datetime.secs = mktime(&tm);
datetime.nsecs = 0;
- return proto_tree_add_time (ies_tree, hf_iax2_ie_datetime, tvb, offset+2, 4, &datetime);
+ return proto_tree_add_time(ies_tree, hf_iax2_ie_datetime, tvb, offset+2, 4, &datetime);
}
/* dissect the information elements in an IAX frame. Returns the updated offset */
-static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
- proto_tree * iax_tree,
- iax2_ie_data *ie_data)
+static guint32 dissect_ies(tvbuff_t *tvb, packet_info *pinfo, guint32 offset,
+ proto_tree *iax_tree, proto_item * iax_item,
+ iax2_ie_data *ie_data)
{
DISSECTOR_ASSERT(ie_data);
- while (offset < tvb_reported_length (tvb)) {
+ while (offset < tvb_reported_length(tvb)) {
- int ies_type = tvb_get_guint8(tvb, offset);
- int ies_len = tvb_get_guint8(tvb, offset + 1);
+ int ies_type = tvb_get_guint8(tvb, offset);
+ int ies_len = tvb_get_guint8(tvb, offset + 1);
guint16 apparent_addr_family;
/* do non-tree-dependent stuff first */
- switch(ies_type) {
+ switch (ies_type) {
case IAX_IE_DATAFORMAT:
if (ies_len != 4) THROW(ReportedBoundsError);
ie_data -> dataformat = tvb_get_ntohl(tvb, offset+2);
break;
case IAX_IE_CALLED_NUMBER:
- iax2_info->calledParty = g_strdup(tvb_format_text(tvb, offset+2, ies_len));
+ iax2_info->calledParty = wmem_strdup(wmem_packet_scope(), tvb_format_text(tvb, offset+2, ies_len));
break;
case IAX_IE_CALLING_NUMBER:
- iax2_info->callingParty = g_strdup(tvb_format_text(tvb, offset+2, ies_len));
+ iax2_info->callingParty = wmem_strdup(wmem_packet_scope(), tvb_format_text(tvb, offset+2, ies_len));
break;
case IAX_IE_APPARENT_ADDR:
This means the address family values are the Linux
address family values. */
apparent_addr_family = tvb_get_letohs(tvb, offset+2);
- switch( apparent_addr_family ) {
+ switch (apparent_addr_family) {
case LINUX_AF_INET:
/* IAX is always over UDP */
ie_data->peer_ptype = PT_UDP;
ie_data->peer_port = tvb_get_ntohs(tvb, offset+4);
/* the ip address is big-endian, but then so is peer_address.data */
- SET_ADDRESS(&ie_data->peer_address,AT_IPv4,4,tvb_get_ptr(tvb,offset+6,4));
+ TVB_SET_ADDRESS(&ie_data->peer_address, AT_IPv4, tvb, offset+6, 4);
break;
default:
- g_warning("Not supported in IAX dissector: peer address family of %u", apparent_addr_family);
+ expert_add_info_format(pinfo, iax_item, &ei_iax_peer_address_unsupported,
+ "Not supported in IAX dissector: peer address family of %u", apparent_addr_family);
break;
}
break;
/* the rest of this stuff only needs doing if we have an iax_tree */
- if( iax_tree ) {
+ if (iax_tree && ies_type < NUM_HF_IAX2_IES) {
proto_item *ti, *ie_item = NULL;
proto_tree *ies_tree;
int ie_hf = hf_iax2_ies[ies_type];
- ti = proto_tree_add_text(iax_tree, tvb, offset, ies_len+2, " " );
-
- ies_tree = proto_item_add_subtree(ti, ett_iax2_ie);
+ ies_tree = proto_tree_add_subtree(iax_tree, tvb, offset, ies_len+2, ett_iax2_ie, &ti, " ");
proto_tree_add_text(ies_tree, tvb, offset, 1, "IE id: %s (0x%02X)",
- val_to_str(ies_type, iax_ies_type, "Unknown"),
+ val_to_str_ext_const(ies_type, &iax_ies_type_ext, "Unknown"),
ies_type);
- proto_tree_add_text(ies_tree, tvb, offset+1, 1, "Length: %u",ies_len);
+ proto_tree_add_text(ies_tree, tvb, offset + 1, 1, "Length: %u", ies_len);
/* hf_iax2_ies[] is an array, indexed by IE number, of header-fields, one
per IE. Apart from a couple of special cases which require more
complex decoding, we can just look up an entry from the array, and add
- the relevant item.
+ the relevant item, although the encoding value used depends on the
+ type of the item.
*/
switch (ies_type) {
case IAX_IE_DATETIME:
- ie_item = dissect_datetime_ie(tvb,offset,ies_tree);
+ ie_item = dissect_datetime_ie(tvb, offset, ies_tree);
break;
if (ies_len != 4) THROW(ReportedBoundsError);
ie_item =
- proto_tree_add_item (ies_tree, ie_hf,
- tvb, offset + 2, ies_len, FALSE);
+ proto_tree_add_item(ies_tree, ie_hf,
+ tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
codec_tree =
- proto_item_add_subtree (ie_item, ett_iax2_codecs);
-
- proto_tree_add_item(codec_tree, hf_iax2_cap_g723_1, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_gsm, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_ulaw, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_alaw, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_g726, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_adpcm, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_slinear, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_lpc10, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_g729a, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_speex, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_ilbc, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_jpeg, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_png, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_h261, tvb, offset + 2, ies_len, FALSE );
- proto_tree_add_item(codec_tree, hf_iax2_cap_h263, tvb, offset + 2, ies_len, FALSE );
+ proto_item_add_subtree(ie_item, ett_iax2_codecs);
+
+ proto_tree_add_item(codec_tree, hf_iax2_cap_g723_1, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_gsm, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_ulaw, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_alaw, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_g726_aal2, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_adpcm, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_slinear, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_lpc10, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_g729a, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_speex, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_ilbc, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_g726, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_g722, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_siren7, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_siren14, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_slinear16, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_jpeg, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_png, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_h261, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_h263, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_h263_plus, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_h264, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(codec_tree, hf_iax2_cap_mpeg4, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
break;
}
case IAX_IE_APPARENT_ADDR:
{
- proto_tree *sockaddr_tree = NULL;
+ proto_tree *sockaddr_tree;
- ie_item = proto_tree_add_text(ies_tree, tvb, offset + 2, 16, "Apparent Address");
- sockaddr_tree = proto_item_add_subtree(ie_item, ett_iax2_ies_apparent_addr);
+ sockaddr_tree = proto_tree_add_subtree(ies_tree, tvb, offset + 2, 16,
+ ett_iax2_ies_apparent_addr, NULL, "Apparent Address");
/* The IAX2 I-D says that the "apparent address" structure
"is the same as the linux struct sockaddr_in", without
apparent_addr_family = tvb_get_letohs(tvb, offset+2);
proto_tree_add_uint(sockaddr_tree, hf_IAX_IE_APPARENTADDR_SINFAMILY, tvb, offset + 2, 2, apparent_addr_family);
- switch( apparent_addr_family ) {
+ switch (apparent_addr_family) {
case LINUX_AF_INET:
{
guint32 addr;
}
default:
- if( ie_hf != -1 ) {
+ if (ie_hf != -1) {
/* throw an error if the IE isn't the expected length */
- gint explen = ftype_length(proto_registrar_get_nth(ie_hf)->type);
- if(explen != 0 && ies_len != explen)
+ enum ftenum type = proto_registrar_get_nth(ie_hf)->type;
+ gint explen = ftype_length(type);
+ if (explen != 0 && ies_len != explen)
THROW(ReportedBoundsError);
- ie_item = proto_tree_add_item(ies_tree, ie_hf, tvb, offset + 2, ies_len, FALSE);
+ switch (type) {
+ case FT_UINT8:
+ case FT_UINT16:
+ case FT_UINT24:
+ case FT_UINT32:
+ case FT_UINT64:
+ case FT_INT8:
+ case FT_INT16:
+ case FT_INT24:
+ case FT_INT32:
+ case FT_INT64:
+ case FT_BOOLEAN:
+ case FT_IPv4:
+ ie_item = proto_tree_add_item(ies_tree, ie_hf, tvb, offset + 2, ies_len, ENC_BIG_ENDIAN);
+ break;
+
+ case FT_BYTES:
+ case FT_NONE:
+ ie_item = proto_tree_add_item(ies_tree, ie_hf, tvb, offset + 2, ies_len, ENC_NA);
+ break;
+
+ case FT_STRING:
+ case FT_STRINGZ:
+ ie_item = proto_tree_add_item(ies_tree, ie_hf, tvb, offset + 2, ies_len, ENC_UTF_8|ENC_NA);
+ break;
+
+ default:
+ DISSECTOR_ASSERT_NOT_REACHED();
+ break;
+ }
} else {
/* we don't understand this ie: add a generic one */
- guint32 value;
+ guint32 value;
const guint8 *ptr;
- const gchar *ie_name = val_to_str(ies_type, iax_ies_type, "Unknown");
+ const gchar *ie_name = val_to_str_ext_const(ies_type, &iax_ies_type_ext, "Unknown");
- switch(ies_len) {
+ switch (ies_len) {
case 1:
value = tvb_get_guint8(tvb, offset + 2);
ie_item =
proto_tree_add_uint_format(ies_tree, hf_IAX_IE_UNKNOWN_BYTE,
tvb, offset+2, 1, value,
- "%s: %#02x", ie_name, value );
+ "%s: %#02x", ie_name, value);
break;
case 2:
ie_item =
proto_tree_add_uint_format(ies_tree, hf_IAX_IE_UNKNOWN_I16,
tvb, offset+2, 2, value,
- "%s: %#04x", ie_name, value );
+ "%s: %#04x", ie_name, value);
break;
case 4:
ie_item =
proto_tree_add_uint_format(ies_tree, hf_IAX_IE_UNKNOWN_I32,
tvb, offset+2, 4, value,
- "%s: %#08x", ie_name, value );
+ "%s: %#08x", ie_name, value);
break;
default:
- ptr = tvb_get_ptr(tvb, offset + 2, ies_len);
+ ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, ies_len, ENC_ASCII);
ie_item =
proto_tree_add_string_format(ies_tree, hf_IAX_IE_UNKNOWN_BYTES,
tvb, offset+2, ies_len, ptr,
- "%s: %s", ie_name, ptr );
+ "%s: %s", ie_name, ptr);
break;
}
}
/* Retrieve the text from the item we added, and append it to the main IE
* item */
- if(!PROTO_ITEM_IS_HIDDEN(ti)) {
+ if (!PROTO_ITEM_IS_HIDDEN(ti)) {
field_info *ie_finfo = PITEM_FINFO(ie_item);
/* if the representation of the item has already been set, use that;
else we have to allocate a block to put the text into */
- if( ie_finfo && ie_finfo->rep != NULL )
+ if (ie_finfo && ie_finfo->rep != NULL)
proto_item_set_text(ti, "Information Element: %s",
ie_finfo->rep->representation);
else {
guint8 *ie_val = NULL;
- ie_val = g_malloc(ITEM_LABEL_LENGTH);
+ ie_val = (guint8 *)wmem_alloc(wmem_packet_scope(), ITEM_LABEL_LENGTH);
proto_item_fill_label(ie_finfo, ie_val);
proto_item_set_text(ti, "Information Element: %s",
ie_val);
- g_free(ie_val);
}
}
}
}
/* returns the new offset */
-static guint32 dissect_iax2_command(tvbuff_t * tvb, guint32 offset,
- packet_info * pinfo, proto_tree *tree,
+static guint32 dissect_iax2_command(tvbuff_t *tvb, guint32 offset,
+ packet_info *pinfo, proto_tree *tree,
iax_packet_data *iax_packet)
{
- guint8 csub = tvb_get_guint8(tvb, offset);
- guint8 address_data[MAX_ADDRESS];
- iax2_ie_data ie_data;
+ guint8 csub = tvb_get_guint8(tvb, offset);
+ guint8 address_data[MAX_ADDRESS];
+ proto_item* ti;
+ iax2_ie_data ie_data;
iax_call_data *iax_call;
ie_data.peer_address.type = AT_NONE;
- ie_data.peer_address.len = 0;
+ ie_data.peer_address.len = 0;
ie_data.peer_address.data = address_data;
- ie_data.peer_ptype = 0;
- ie_data.peer_port = 0;
- ie_data.peer_callno = 0;
- ie_data.dataformat = (guint32)-1;
- iax_call = iax_packet -> call_data;
+ ie_data.peer_ptype = PT_NONE;
+ ie_data.peer_port = 0;
+ ie_data.peer_callno = 0;
+ ie_data.dataformat = (guint32)-1;
+ iax_call = iax_packet -> call_data;
/* add the subclass */
- proto_tree_add_uint (tree, hf_iax2_iax_csub, tvb, offset, 1, csub);
+ ti = proto_tree_add_uint(tree, hf_iax2_iax_csub, tvb, offset, 1, csub);
offset++;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, " %s",
- val_to_str (csub, iax_iax_subclasses, "unknown (0x%02x)"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ val_to_str_ext(csub, &iax_iax_subclasses_ext, "unknown (0x%02x)"));
- if (offset >= tvb_reported_length (tvb))
+ if (offset >= tvb_reported_length(tvb))
return offset;
- offset += dissect_ies(tvb, offset, tree, &ie_data);
+ offset = dissect_ies(tvb, pinfo, offset, tree, ti, &ie_data);
/* if this is a data call, set up a subdissector for the circuit */
- if(iax_call && ie_data.dataformat != (guint32)-1 && iax_call -> subdissector == NULL) {
- iax_call -> subdissector = dissector_get_port_handle(iax2_dataformat_dissector_table, ie_data.dataformat );
- iax_call -> dataformat = ie_data.dataformat;
+ if (iax_call && ie_data.dataformat != (guint32)-1 && iax_call -> subdissector == NULL) {
+ iax_call -> subdissector = dissector_get_uint_handle(iax2_dataformat_dissector_table, ie_data.dataformat);
+ iax_call -> dataformat = (iax_dataformat_t)ie_data.dataformat;
}
/* if this is a transfer request, record it in the call data */
- if( csub == IAX_COMMAND_TXREQ && iax_packet -> first_time ) {
- if( ie_data.peer_address.type != AT_NONE && ie_data.peer_callno != 0 ) {
+ if (csub == IAX_COMMAND_TXREQ && iax_packet -> first_time) {
+ if (ie_data.peer_address.type != AT_NONE && ie_data.peer_callno != 0) {
guint tx_circuit = iax_circuit_lookup(&ie_data.peer_address,
ie_data.peer_ptype,
ie_data.peer_port,
ie_data.peer_callno);
-#if 0
- g_debug("found transfer request for call %u->%u, to new id %u",
- iax_call->forward_circuit_ids[0],
- iax_call->reverse_circuit_ids[0],
- tx_circuit);
-#endif
-
- iax2_new_circuit_for_call(tx_circuit,pinfo->fd->num,iax_call,iax_packet->reversed);
+ iax2_new_circuit_for_call(pinfo, NULL, tx_circuit, pinfo->fd->num, iax_call, iax_packet->reversed);
}
}
return offset;
}
-static void iax2_add_ts_fields(packet_info * pinfo, proto_tree * iax2_tree, iax_packet_data *iax_packet, guint16 shortts)
+static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, iax_packet_data *iax_packet, guint16 shortts)
{
- guint32 longts = shortts;
- nstime_t ts;
+ guint32 longts =shortts;
+ nstime_t ts;
proto_item *item;
- if(iax_packet->call_data == NULL) {
+ if (iax_packet->call_data == NULL) {
/* no call info for this frame; perhaps we missed the NEW packet */
return;
}
- if(iax_packet->abstime.secs == -1) {
+ if (iax_packet->abstime.secs == -1) {
time_t start_secs = iax_packet->call_data->start_time.secs;
- gint32 abs_secs = (gint32) (start_secs + longts/1000);
+ gint32 abs_secs = (gint32)(start_secs + longts/1000);
/* deal with short timestamps by assuming that packets are never more than
* 16 seconds late */
while(abs_secs < pinfo->fd->abs_ts.secs - 16) {
longts += 32768;
- abs_secs = (gint32) (start_secs + longts/1000);
+ abs_secs = (gint32)(start_secs + longts/1000);
}
iax_packet->abstime.secs=abs_secs;
iax_packet->abstime.nsecs=iax_packet->call_data->start_time.nsecs + (longts % 1000) * 1000000;
- if(iax_packet->abstime.nsecs >= 1000000000) {
+ if (iax_packet->abstime.nsecs >= 1000000000) {
iax_packet->abstime.nsecs -= 1000000000;
iax_packet->abstime.secs ++;
}
/* returns the new offset */
static guint32
-dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno,
- packet_info * pinfo, proto_tree * iax2_tree,
- proto_tree * main_tree)
+dissect_fullpacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno,
+ packet_info *pinfo, proto_tree *iax2_tree,
+ proto_tree *main_tree)
{
- guint32 retransmission = 0;
guint16 dcallno;
guint32 ts;
- guint8 type;
- guint8 csub;
+ guint8 type;
+ guint8 csub;
guint32 codec;
- proto_tree *packet_type_tree = NULL;
- iax_call_data *iax_call;
+ proto_tree *packet_type_tree = NULL;
+ iax_call_data *iax_call;
iax_packet_data *iax_packet;
- gboolean reversed;
- gboolean rtp_marker;
+ gboolean reversed;
+ gboolean rtp_marker;
/*
* remove the top bit for retransmission detection
*/
- dcallno = tvb_get_ntohs(tvb, offset);
- retransmission = dcallno & 0x8000;
- dcallno = dcallno & 0x7FFF;
- ts = tvb_get_ntohl(tvb, offset+2);
+ dcallno = tvb_get_ntohs(tvb, offset) & 0x7FFF;
+ ts = tvb_get_ntohl(tvb, offset + 2);
type = tvb_get_guint8(tvb, offset + 8);
csub = tvb_get_guint8(tvb, offset + 9);
- iax2_info->ftype = type;
- iax2_info->csub = csub;
+ iax2_info->ftype = type;
+ iax2_info->csub = csub;
iax2_info->scallno = scallno;
iax2_info->dcallno = dcallno;
/* see if we've seen this packet before */
- iax_packet = (iax_packet_data *)p_get_proto_data(pinfo->fd,proto_iax2);
- if( !iax_packet ) {
+ iax_packet = (iax_packet_data *)p_get_proto_data(wmem_file_scope(), pinfo, proto_iax2, 0);
+ if (!iax_packet) {
/* if not, find or create an iax_call info structure for this IAX session. */
- if( type == AST_FRAME_IAX && csub == IAX_COMMAND_NEW ) {
+ if (type == AST_FRAME_IAX && csub == IAX_COMMAND_NEW) {
/* NEW packets start a new call */
- iax_call = iax_new_call(pinfo,scallno);
+ iax_call = iax_new_call(pinfo, scallno);
reversed = FALSE;
} else {
iax_call = iax_lookup_call(pinfo, scallno, dcallno,
}
iax_packet = iax_new_packet_data(iax_call, reversed);
- p_add_proto_data(pinfo->fd,proto_iax2,iax_packet);
+ p_add_proto_data(wmem_file_scope(), pinfo, proto_iax2, 0, iax_packet);
} else {
iax_call = iax_packet->call_data;
reversed = iax_packet->reversed;
iax2_populate_pinfo_from_packet_data(pinfo, iax_packet);
- if( iax2_tree ) {
+ if (iax2_tree) {
proto_item *packet_type_base;
- proto_tree_add_item (iax2_tree, hf_iax2_dcallno, tvb, offset, 2, FALSE );
+ proto_tree_add_item(iax2_tree, hf_iax2_dcallno, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, FALSE );
+ proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, ENC_BIG_ENDIAN);
- if( iax_call ) {
+ if (iax_call) {
proto_item *item =
- proto_tree_add_uint (iax2_tree, hf_iax2_callno, tvb, 0, 4,
- iax_call->forward_circuit_ids[0] );
+ proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4,
+ iax_call->forward_circuit_ids[0]);
PROTO_ITEM_SET_GENERATED(item);
}
- proto_tree_add_uint (iax2_tree, hf_iax2_ts, tvb, offset+2, 4, ts);
+ proto_tree_add_uint(iax2_tree, hf_iax2_ts, tvb, offset+2, 4, ts);
iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
- proto_tree_add_item (iax2_tree, hf_iax2_oseqno, tvb, offset+6, 1,
- FALSE);
+ proto_tree_add_item(iax2_tree, hf_iax2_oseqno, tvb, offset+6, 1,
+ ENC_BIG_ENDIAN);
- proto_tree_add_item (iax2_tree, hf_iax2_iseqno, tvb, offset+7, 1,
- FALSE);
- packet_type_base = proto_tree_add_uint (iax2_tree, hf_iax2_type, tvb,
- offset+8, 1, type);
+ proto_tree_add_item(iax2_tree, hf_iax2_iseqno, tvb, offset+7, 1,
+ ENC_BIG_ENDIAN);
+ packet_type_base = proto_tree_add_uint(iax2_tree, hf_iax2_type, tvb,
+ offset+8, 1, type);
/* add the type-specific subtree */
- packet_type_tree = proto_item_add_subtree (packet_type_base, ett_iax2_type);
+ packet_type_tree = proto_item_add_subtree(packet_type_base, ett_iax2_type);
} else {
iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
}
/* add frame type to info line */
- if (check_col (pinfo->cinfo, COL_INFO)) {
- col_add_fstr (pinfo->cinfo, COL_INFO, "%s, source call# %d, timestamp %ums",
- val_to_str (type, iax_frame_types, "Unknown (0x%02x)"),
- scallno, ts);
- }
- iax2_info->messageName = val_to_str (type, iax_frame_types, "Unknown (0x%02x)");
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s, source call# %d, timestamp %ums",
+ val_to_str_ext(type, &iax_frame_types_ext, "Unknown (0x%02x)"),
+ scallno, ts);
- switch( type ) {
+ iax2_info->messageName = val_to_str_ext(type, &iax_frame_types_ext, "Unknown (0x%02x)");
+
+ switch (type) {
case AST_FRAME_IAX:
- offset=dissect_iax2_command(tvb,offset+9,pinfo,packet_type_tree,iax_packet);
- iax2_info->messageName = val_to_str (csub, iax_iax_subclasses, "unknown (0x%02x)");
- iax2_info->callState = csub;
+ offset=dissect_iax2_command(tvb, offset+9, pinfo, packet_type_tree, iax_packet);
+ iax2_info->messageName = val_to_str_ext(csub, &iax_iax_subclasses_ext, "unknown (0x%02x)");
+ if (csub < NUM_TAP_IAX_VOIP_STATES) iax2_info->callState = tap_iax_voip_state[csub];
break;
case AST_FRAME_DTMF_BEGIN:
case AST_FRAME_DTMF_END:
- proto_tree_add_item (packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, FALSE);
+ proto_tree_add_item(packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, ENC_ASCII|ENC_NA);
offset += 10;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, " digit %c", csub );
+ col_append_fstr(pinfo->cinfo, COL_INFO, " digit %c", csub);
break;
case AST_FRAME_CONTROL:
/* add the subclass */
- proto_tree_add_uint (packet_type_tree, hf_iax2_cmd_csub, tvb,
+ proto_tree_add_uint(packet_type_tree, hf_iax2_cmd_csub, tvb,
offset+9, 1, csub);
offset += 10;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, " %s",
- val_to_str (csub, iax_cmd_subclasses, "unknown (0x%02x)"));
- iax2_info->messageName = val_to_str (csub, iax_cmd_subclasses, "unknown (0x%02x)");
- if (csub <= 8) iax2_info->callState = tap_cmd_voip_state[csub];
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ val_to_str_ext(csub, &iax_cmd_subclasses_ext, "unknown (0x%02x)"));
+ iax2_info->messageName = val_to_str_ext (csub, &iax_cmd_subclasses_ext, "unknown (0x%02x)");
+ if (csub < NUM_TAP_CMD_VOIP_STATES) iax2_info->callState = tap_cmd_voip_state[csub];
break;
case AST_FRAME_VOICE:
/* add the codec */
iax_packet -> codec = codec = uncompress_subclass(csub);
- if( packet_type_tree ) {
+ if (packet_type_tree) {
proto_item *item;
- proto_tree_add_item (packet_type_tree, hf_iax2_voice_csub, tvb, offset+9, 1, FALSE);
- item = proto_tree_add_uint (packet_type_tree, hf_iax2_voice_codec, tvb, offset+9, 1, codec);
+ proto_tree_add_item(packet_type_tree, hf_iax2_voice_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN);
+ item = proto_tree_add_uint(packet_type_tree, hf_iax2_voice_codec, tvb, offset+9, 1, codec);
PROTO_ITEM_SET_GENERATED(item);
}
offset += 10;
- if( iax_call ) {
- if( reversed ) {
+ if (iax_call) {
+ if (reversed) {
iax_call->dst_codec = codec;
} else {
iax_call->src_codec = codec;
}
}
- dissect_payload(tvb, offset, pinfo, iax2_tree, main_tree, ts, FALSE,iax_packet);
+ dissect_payload(tvb, offset, pinfo, iax2_tree, main_tree, ts, FALSE, iax_packet);
break;
case AST_FRAME_VIDEO:
/* bit 6 of the csub is used to represent the rtp 'marker' bit */
rtp_marker = csub & 0x40 ? TRUE:FALSE;
- iax_packet -> codec = codec = uncompress_subclass((guint8) (csub & ~40));
+ iax_packet -> codec = codec = uncompress_subclass((guint8)(csub & ~40));
- if( packet_type_tree ) {
+ if (packet_type_tree) {
proto_item *item;
- proto_tree_add_item (packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, FALSE);
- proto_tree_add_item (packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, FALSE);
- item = proto_tree_add_uint (packet_type_tree, hf_iax2_video_codec, tvb, offset+9, 1, codec);
+ proto_tree_add_item(packet_type_tree, hf_iax2_video_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(packet_type_tree, hf_iax2_marker, tvb, offset+9, 1, ENC_BIG_ENDIAN);
+ item = proto_tree_add_uint(packet_type_tree, hf_iax2_video_codec, tvb, offset+9, 1, codec);
PROTO_ITEM_SET_GENERATED(item);
}
offset += 10;
- if( iax_call && iax_packet -> first_time ) {
- if( reversed ) {
+ if (iax_call && iax_packet -> first_time) {
+ if (reversed) {
iax_call->dst_vformat = codec;
} else {
iax_call->src_vformat = codec;
}
}
- if( rtp_marker )
- col_append_str (pinfo->cinfo, COL_INFO, ", Mark" );
+ if (rtp_marker)
+ col_append_str(pinfo->cinfo, COL_INFO, ", Mark");
dissect_payload(tvb, offset, pinfo, iax2_tree, main_tree, ts, TRUE, iax_packet);
break;
case AST_FRAME_MODEM:
- proto_tree_add_item (packet_type_tree, hf_iax2_modem_csub, tvb, offset+9, 1, FALSE);
+ proto_tree_add_item(packet_type_tree, hf_iax2_modem_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN);
+ offset += 10;
+
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ val_to_str(csub, iax_modem_subclasses, "unknown (0x%02x)"));
+ break;
+
+ case AST_FRAME_TEXT:
+ proto_tree_add_item(packet_type_tree, hf_iax2_text_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN);
offset += 10;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, " %s",
- val_to_str (csub, iax_modem_subclasses, "unknown (0x%02x)"));
+ {
+ int textlen = tvb_captured_length_remaining(tvb, offset);
+ if (textlen > 0)
+ {
+ proto_tree_add_item(packet_type_tree, hf_iax2_text_text, tvb, offset, textlen, ENC_UTF_8|ENC_NA);
+ offset += textlen;
+ }
+ }
break;
case AST_FRAME_HTML:
+ proto_tree_add_item(packet_type_tree, hf_iax2_html_csub, tvb, offset+9, 1, ENC_BIG_ENDIAN);
+ offset += 10;
+
+ if (csub == 0x01)
+ {
+ int urllen = tvb_captured_length_remaining(tvb, offset);
+ if (urllen > 0)
+ {
+ proto_item *pi = proto_tree_add_item(packet_type_tree, hf_iax2_html_url, tvb, offset, urllen, ENC_UTF_8|ENC_NA);
+ PROTO_ITEM_SET_URL(pi);
+ offset += urllen;
+ }
+ }
+ break;
+
case AST_FRAME_CNG:
default:
- proto_tree_add_uint (packet_type_tree, hf_iax2_csub, tvb, offset+9,
- 1, csub);
+ proto_tree_add_uint(packet_type_tree, hf_iax2_csub, tvb, offset+9,
+ 1, csub);
offset += 10;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, " subclass %d", csub );
+ col_append_fstr(pinfo->cinfo, COL_INFO, " subclass %d", csub);
break;
}
- /* next time we come to parse this packet, don't propogate the codec into the
+ /* next time we come to parse this packet, don't propagate the codec into the
* call_data */
iax_packet->first_time = FALSE;
return offset;
}
-static iax_packet_data *iax2_get_packet_data_for_minipacket(packet_info * pinfo,
+static iax_packet_data *iax2_get_packet_data_for_minipacket(packet_info *pinfo,
guint16 scallno,
gboolean video)
{
/* see if we've seen this packet before */
- iax_packet_data *p = (iax_packet_data *)p_get_proto_data(pinfo->fd,proto_iax2);
+ iax_packet_data *p = (iax_packet_data *)p_get_proto_data(wmem_file_scope(), pinfo, proto_iax2, 0);
- if( !p ) {
+ if (!p) {
/* if not, find or create an iax_call info structure for this IAX session. */
gboolean reversed;
iax_call_data *iax_call;
iax_call = iax_lookup_call(pinfo, scallno, 0, &reversed);
- p = iax_new_packet_data(iax_call,reversed);
- p_add_proto_data(pinfo->fd,proto_iax2,p);
+ p = iax_new_packet_data(iax_call, reversed);
+ p_add_proto_data(wmem_file_scope(), pinfo, proto_iax2, 0, p);
/* set the codec for this frame to be whatever the last full frame used */
- if( iax_call ) {
- if( video )
+ if (iax_call) {
+ if (video)
p->codec = reversed ? iax_call -> dst_vformat : iax_call -> src_vformat;
else
p->codec = reversed ? iax_call -> dst_codec : iax_call -> src_codec;
}
-static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno, packet_info * pinfo,
- proto_tree * iax2_tree, proto_tree *main_tree)
+static guint32 dissect_minivideopacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno, packet_info *pinfo,
+ proto_tree *iax2_tree, proto_tree *main_tree)
{
- guint32 ts;
+ guint32 ts;
iax_packet_data *iax_packet;
- gboolean rtp_marker;
- proto_item *item;
+ gboolean rtp_marker;
+ proto_item *item;
ts = tvb_get_ntohs(tvb, offset);
iax_packet = iax2_get_packet_data_for_minipacket(pinfo, scallno, TRUE);
- if( iax2_tree ) {
- if( iax_packet->call_data ) {
+ if (iax2_tree) {
+ if (iax_packet->call_data) {
item =
- proto_tree_add_uint (iax2_tree, hf_iax2_callno, tvb, 0, 4,
- iax_packet->call_data->forward_circuit_ids[0] );
+ proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4,
+ iax_packet->call_data->forward_circuit_ids[0]);
PROTO_ITEM_SET_GENERATED(item);
}
- proto_tree_add_item (iax2_tree, hf_iax2_minividts, tvb, offset, 2, FALSE);
+ proto_tree_add_item(iax2_tree, hf_iax2_minividts, tvb, offset, 2, ENC_BIG_ENDIAN);
iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
- proto_tree_add_item (iax2_tree, hf_iax2_minividmarker, tvb, offset, 2, FALSE);
+ proto_tree_add_item(iax2_tree, hf_iax2_minividmarker, tvb, offset, 2, ENC_BIG_ENDIAN);
} else {
iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
}
offset += 2;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_add_fstr (pinfo->cinfo, COL_INFO,
- "Mini video packet, source call# %d, timestamp %ums%s",
- scallno, ts, rtp_marker?", Mark":"");
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "Mini video packet, source call# %d, timestamp %ums%s",
+ scallno, ts, rtp_marker?", Mark":"");
dissect_payload(tvb, offset, pinfo, iax2_tree, main_tree, ts, TRUE, iax_packet);
- /* next time we come to parse this packet, don't propogate the codec into the
+ /* next time we come to parse this packet, don't propagate the codec into the
* call_data */
iax_packet->first_time = FALSE;
return offset;
}
-static guint32
-dissect_minipacket (tvbuff_t * tvb, guint32 offset, guint16 scallno, packet_info * pinfo, proto_tree * iax2_tree,
- proto_tree *main_tree)
+static guint32 dissect_minipacket(tvbuff_t *tvb, guint32 offset, guint16 scallno,
+ packet_info *pinfo, proto_tree *iax2_tree,
+ proto_tree *main_tree)
{
- guint32 ts;
+ guint32 ts;
iax_packet_data *iax_packet;
- proto_item *item;
+ proto_item *item;
ts = tvb_get_ntohs(tvb, offset);
iax_packet = iax2_get_packet_data_for_minipacket(pinfo, scallno, FALSE);
- if( iax2_tree ) {
- if( iax_packet->call_data ) {
- item = proto_tree_add_uint (iax2_tree, hf_iax2_callno, tvb, 0, 4,
- iax_packet->call_data->forward_circuit_ids[0] );
+ if (iax2_tree) {
+ if (iax_packet->call_data) {
+ item = proto_tree_add_uint(iax2_tree, hf_iax2_callno, tvb, 0, 4,
+ iax_packet->call_data->forward_circuit_ids[0]);
PROTO_ITEM_SET_GENERATED(item);
}
- proto_tree_add_uint (iax2_tree, hf_iax2_minits, tvb, offset, 2, ts);
- iax2_add_ts_fields(pinfo, iax2_tree, iax_packet,(guint16)ts);
+ proto_tree_add_uint(iax2_tree, hf_iax2_minits, tvb, offset, 2, ts);
+ iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
} else {
iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
}
offset += 2;
- if (check_col (pinfo->cinfo, COL_INFO))
- col_add_fstr (pinfo->cinfo, COL_INFO,
+ col_add_fstr(pinfo->cinfo, COL_INFO,
"Mini packet, source call# %d, timestamp %ums",
scallno, ts);
}
-static guint32 dissect_trunkcall_ts (tvbuff_t * tvb, guint32 offset, proto_tree * iax2_tree)
+static guint32 dissect_trunkcall_ts(tvbuff_t *tvb, guint32 offset, proto_tree *iax2_tree, guint16 *scallno)
{
- proto_item *call_item;
proto_tree *call_tree;
- guint16 datalen, rlen, ts, scallno;
-
+ guint16 datalen, rlen, ts;
/*
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Data Length (in octets) |R| Source Call Number |
: :
| |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
+ */
datalen = tvb_get_ntohs(tvb, offset);
- scallno = tvb_get_ntohs(tvb, offset + 2);
+ *scallno = tvb_get_ntohs(tvb, offset + 2);
ts = tvb_get_ntohs(tvb, offset + 4);
rlen = MIN(tvb_length(tvb) - offset - 6, datalen);
- if( iax2_tree ) {
- call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u, ts: %u", scallno, ts);
- call_tree = proto_item_add_subtree(call_item, ett_iax2_trunk_call);
-
- proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, FALSE);
- proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, FALSE);
- proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, FALSE);
+ if (iax2_tree) {
+ call_tree = proto_tree_add_subtree_format(iax2_tree, tvb, offset, rlen + 6,
+ ett_iax2_trunk_call, NULL, "Trunk call from %u, ts: %u", *scallno, ts);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 6, rlen, ENC_NA);
}
-
offset += 6 + rlen;
return offset;
}
-static guint32 dissect_trunkcall_nots (tvbuff_t * tvb, guint32 offset, proto_tree * iax2_tree)
+static guint32 dissect_trunkcall_nots(tvbuff_t *tvb, guint32 offset, proto_tree *iax2_tree, guint16 *scallno)
{
- proto_item *call_item;
proto_tree *call_tree;
- guint16 datalen, rlen, scallno;
-
+ guint16 datalen, rlen;
/*
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|R| Source Call Number | Data Length (in octets) |
: Data :
| |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
- scallno = tvb_get_ntohs(tvb, offset);
+ */
+ *scallno = tvb_get_ntohs(tvb, offset);
datalen = tvb_get_ntohs(tvb, offset + 2);
rlen = MIN(tvb_length(tvb) - offset - 4, datalen);
- if( iax2_tree ) {
- call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u", scallno);
- call_tree = proto_item_add_subtree(call_item, ett_iax2_trunk_call);
+ if (iax2_tree) {
+ call_tree = proto_tree_add_subtree_format(iax2_tree, tvb, offset, rlen + 6,
+ ett_iax2_trunk_call, NULL, "Trunk call from %u", *scallno);
- proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset, 2, FALSE);
- proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset + 2, 2, FALSE);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 4, rlen, ENC_NA);
}
-
offset += 4 + rlen;
return offset;
}
+typedef struct _call_list {
+ guint16 scallno;
+ struct _call_list *next;
+} call_list;
-static guint32 dissect_trunkpacket (tvbuff_t * tvb, guint32 offset,
- guint16 scallno, packet_info * pinfo,
- proto_tree * iax2_tree, proto_tree *main_tree)
+static call_list *call_list_append(call_list *list, guint16 scallno)
{
- guint32 ts;
- guint8 cmddata, trunkts;
- int ncalls = 0;
- /*iax_packet_data *iax_packet;*/
- proto_item *cd, *nc = NULL;
- proto_tree *field_tree = NULL;
+ call_list *node = wmem_new0(wmem_packet_scope(), call_list);
+
+ node->scallno = scallno;
- /* shut the compiler up */
- scallno = scallno;
- main_tree = main_tree;
+ if (list) {
+ call_list *cur = list;
+ while (cur->next) {
+ cur = cur->next;
+ }
+ cur->next = node;
+ return list;
+ } else {
+ return node;
+ }
+}
+
+static gboolean call_list_find(call_list *list, guint16 scallno)
+{
+ for (; list; list = list->next) {
+ if (list->scallno == scallno) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static guint call_list_length(call_list *list)
+{
+ guint count = 0;
+ for (; list; list = list->next) {
+ count++;
+ }
+ return count;
+}
+
+static guint32 dissect_trunkpacket(tvbuff_t *tvb, guint32 offset,
+ guint16 scallno_param _U_, packet_info *pinfo,
+ proto_tree *iax2_tree, proto_tree *main_tree _U_)
+{
+ guint8 cmddata, trunkts;
+ guint nframes = 0, ncalls = 0;
+ proto_item *cd, *nc = NULL;
+ proto_tree *field_tree = NULL;
+ call_list *calls = NULL;
+ /*iax_packet_data *iax_packet;*/
cmddata = tvb_get_guint8(tvb, offset + 1);
trunkts = cmddata & IAX2_TRUNK_TS;
/* | time-stamp | */
/* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */
-
- if( iax2_tree ) {
+ if (iax2_tree) {
/* Meta Command */
- proto_tree_add_item(iax2_tree, hf_iax2_trunk_metacmd, tvb, offset, 1, FALSE);
+ proto_tree_add_item(iax2_tree, hf_iax2_trunk_metacmd, tvb, offset, 1, ENC_BIG_ENDIAN);
/* Command data */
cd = proto_tree_add_uint(iax2_tree, hf_iax2_trunk_cmddata, tvb, offset + 1, 1, cmddata);
proto_tree_add_boolean(field_tree, hf_iax2_trunk_cmddata_ts, tvb, offset + 1, 1, cmddata);
/* Timestamp */
- ts = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(iax2_tree, hf_iax2_trunk_ts, tvb, offset + 2, 4, FALSE);
+ proto_tree_add_item(iax2_tree, hf_iax2_trunk_ts, tvb, offset + 2, 4, ENC_BIG_ENDIAN);
}
-
+
offset += 6;
- if( trunkts ) {
+ if (trunkts) {
/* Trunk calls with timestamp */
while(tvb_length_remaining(tvb, offset) >= 6) {
- offset = dissect_trunkcall_ts (tvb, offset, iax2_tree);
- ncalls++;
+ guint16 scallno;
+ offset = dissect_trunkcall_ts(tvb, offset, iax2_tree, &scallno);
+ if (!call_list_find(calls, scallno)) {
+ calls = call_list_append(calls, scallno);
+ }
+ nframes++;
}
}
else {
/* Trunk calls without timestamp */
while(tvb_length_remaining(tvb, offset) >= 4) {
- offset = dissect_trunkcall_nots (tvb, offset, iax2_tree);
- ncalls++;
+ guint16 scallno;
+ offset = dissect_trunkcall_nots(tvb, offset, iax2_tree, &scallno);
+ if (!call_list_find(calls, scallno)) {
+ calls = call_list_append(calls, scallno);
+ }
+ nframes++;
}
}
- if( iax2_tree ) {
+ ncalls = call_list_length(calls);
+
+ if (iax2_tree) {
/* number of items */
nc = proto_tree_add_uint(iax2_tree, hf_iax2_trunk_ncalls, NULL, 0, 0, ncalls);
PROTO_ITEM_SET_GENERATED(nc);
}
- col_add_fstr (pinfo->cinfo, COL_INFO, "Trunk packet with %d calls", ncalls);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Trunk packet with %d media frame%s for %d call%s",
+ nframes, plurality(nframes, "", "s"),
+ ncalls, plurality(ncalls, "", "s"));
return offset;
}
-static void process_iax_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
- gboolean video, iax_packet_data *iax_packet )
+static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+ gboolean video, iax_packet_data *iax_packet)
{
- guint32 codec = iax_packet -> codec;
+ guint32 codec = iax_packet -> codec;
iax_call_data *iax_call = iax_packet -> call_data;
#ifdef DEBUG_DESEGMENT
g_debug("calling process_iax_pdu; len = %u", tvb_reported_length(tvb));
#endif
- if( !video && iax_call && iax_call->subdissector ) {
+ if (!video && iax_call && iax_call->subdissector) {
call_dissector(iax_call->subdissector, tvb, pinfo, tree);
- }else if( codec != 0 && dissector_try_port(iax2_codec_dissector_table, codec, tvb, pinfo, tree )) {
+ } else if (codec != 0 && dissector_try_uint(iax2_codec_dissector_table, codec, tvb, pinfo, tree)) {
/* codec dissector handled our data */
- }else {
+ } else {
/* we don't know how to dissect our data: dissect it as data */
- call_dissector(data_handle,tvb, pinfo, tree);
+ call_dissector(data_handle, tvb, pinfo, tree);
}
#ifdef DEBUG_DESEGMENT
}
static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tree,
- proto_tree *tree, gboolean video, iax_packet_data *iax_packet )
+ proto_tree *tree, gboolean video, iax_packet_data *iax_packet)
{
- iax_call_data *iax_call = iax_packet -> call_data;
+ iax_call_data *iax_call = iax_packet -> call_data;
iax_call_dirdata *dirdata;
- gpointer value=NULL;
- guint32 frag_offset=0;
- fragment_data *fd_head;
- gboolean must_desegment = FALSE;
+ gpointer value = NULL;
+ guint32 frag_offset = 0;
+ fragment_head *fd_head;
+ gboolean must_desegment = FALSE;
DISSECTOR_ASSERT(iax_call);
- pinfo->can_desegment = 2;
+ pinfo->can_desegment = 2;
pinfo->desegment_offset = 0;
- pinfo->desegment_len = 0;
+ pinfo->desegment_len = 0;
#ifdef DEBUG_DESEGMENT
g_debug("dissecting packet %u", pinfo->fd->num);
dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]);
- if((!pinfo->fd->flags.visited && dirdata->current_frag_bytes > 0) ||
- (value = g_hash_table_lookup(iax_call->fid_table,
- GUINT_TO_POINTER(pinfo->fd->num))) != NULL ) {
+ if ((!pinfo->fd->flags.visited && (dirdata->current_frag_bytes > 0)) ||
+ ((value = g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num))) != NULL)) {
+
/* then we are continuing an already-started pdu */
guint32 fid;
- guint32 frag_len = tvb_reported_length( tvb );
+ guint32 frag_len = tvb_reported_length(tvb);
gboolean complete;
#ifdef DEBUG_DESEGMENT
g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->flags.visited?1:0,
- dirdata->current_frag_bytes, pinfo->fd->num, fid);
+ dirdata->current_frag_bytes, pinfo->fd->num, dirdata->current_frag_id);
#endif
- if(!pinfo->fd->flags.visited) {
+ if (!pinfo->fd->flags.visited) {
guint32 tot_len;
fid = dirdata->current_frag_id;
tot_len = dirdata->current_frag_minlen;
- g_hash_table_insert( iax_call->fid_table, GUINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER(fid) );
+ DISSECTOR_ASSERT(g_hash_table_lookup(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num)) == NULL);
+ g_hash_table_insert(iax_fid_table, GUINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER(fid));
frag_offset = dirdata->current_frag_bytes;
dirdata->current_frag_bytes += frag_len;
complete = dirdata->current_frag_bytes > tot_len;
#ifdef DEBUG_DESEGMENT
g_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u",
- pinfo->fd->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len );
+ pinfo->fd->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len);
#endif
} else {
fid = GPOINTER_TO_UINT(value);
}
/* fragment_add checks for already-added */
- fd_head = fragment_add( tvb, 0, pinfo, fid,
- iax_call->fragment_table,
- frag_offset,
- frag_len, !complete );
+ fd_head = fragment_add(&iax_reassembly_table, tvb, 0, pinfo, fid, NULL,
+ frag_offset,
+ frag_len, !complete);
- if(fd_head && (pinfo->fd->num == fd_head->reassembled_in)) {
+ if (fd_head && (pinfo->fd->num == fd_head->reassembled_in)) {
gint32 old_len;
- tvbuff_t *next_tvb = tvb_new_child_real_data(tvb, fd_head->data, fd_head->datalen, fd_head->datalen);
+ tvbuff_t *next_tvb = tvb_new_chain(tvb, fd_head->tvb_data);
add_new_data_source(pinfo, next_tvb, "Reassembled IAX2");
- process_iax_pdu(next_tvb,pinfo,tree,video,iax_packet);
+ process_iax_pdu(next_tvb, pinfo, tree, video, iax_packet);
/* calculate the amount of data which was available to the higher-level
dissector before we added this segment; if the returned offset is
pdus; if it's after that, it found one or more complete PDUs.
*/
old_len = (gint32)(tvb_reported_length(next_tvb) - frag_len);
- if( pinfo->desegment_len &&
- pinfo->desegment_offset < old_len ) {
+ if (pinfo->desegment_len &&
+ (pinfo->desegment_offset < old_len)) {
/* oops, it wasn't actually complete */
- fragment_set_partial_reassembly(pinfo, fid, iax_call->fragment_table);
- if(pinfo->desegment_len == DESEGMENT_ONE_MORE_SEGMENT) {
+ fragment_set_partial_reassembly(&iax_reassembly_table, pinfo, fid, NULL);
+ if (pinfo->desegment_len == DESEGMENT_ONE_MORE_SEGMENT) {
/* only one more byte should be enough for a retry */
dirdata->current_frag_minlen = fd_head->datalen + 1;
} else {
/* this nargery is to insert the fragment tree into the main tree
* between the IAX protocol entry and the subdissector entry */
show_fragment_tree(fd_head, &iax2_fragment_items, tree, pinfo, next_tvb, &frag_tree_item);
- iax_tree_item = proto_item_get_parent( proto_tree_get_parent( iax2_tree ));
- if( frag_tree_item && iax_tree_item )
- proto_tree_move_item( tree, iax_tree_item, frag_tree_item );
+ iax_tree_item = proto_item_get_parent(proto_tree_get_parent(iax2_tree));
+ if (frag_tree_item && iax_tree_item)
+ proto_tree_move_item(tree, iax_tree_item, frag_tree_item);
dirdata->current_frag_minlen = dirdata->current_frag_id = dirdata->current_frag_bytes = 0;
- if( pinfo->desegment_len ) {
+ if (pinfo->desegment_len) {
/* there's a bit of data left to desegment */
must_desegment = TRUE;
/* make desegment_offset relative to our tvb */
Call the normal subdissector.
*/
- process_iax_pdu(tvb,pinfo,tree,video,iax_packet);
+ process_iax_pdu(tvb, pinfo, tree, video, iax_packet);
- if(pinfo->desegment_len) {
+ if (pinfo->desegment_len) {
/* the higher-level dissector has asked for some more data - ie,
the end of this segment does not coincide with the end of a
higher-level PDU. */
/* must_desegment is set if the end of this segment (or the whole of it)
* contained the start of a higher-level PDU; we must add whatever is left of
* this segment (after pinfo->desegment_offset) to a fragment table for disassembly. */
- if(must_desegment) {
+ if (must_desegment) {
guint32 fid = pinfo->fd->num; /* a new fragment id */
guint32 deseg_offset = pinfo->desegment_offset;
- guint32 frag_len = tvb_reported_length_remaining(tvb,deseg_offset);
+ guint32 frag_len = tvb_reported_length_remaining(tvb, deseg_offset);
dirdata->current_frag_id = fid;
dirdata->current_frag_bytes = frag_len;
- if(pinfo->desegment_len == DESEGMENT_ONE_MORE_SEGMENT) {
+ if (pinfo->desegment_len == DESEGMENT_ONE_MORE_SEGMENT) {
/* only one more byte should be enough for a retry */
dirdata->current_frag_minlen = frag_len + 1;
} else {
dirdata->current_frag_minlen = frag_len + pinfo->desegment_len;
}
- fd_head = fragment_add(tvb, deseg_offset, pinfo, fid,
- iax_call->fragment_table,
- 0, frag_len, TRUE );
+ fd_head = fragment_add(&iax_reassembly_table,
+ tvb, deseg_offset, pinfo, fid, NULL,
+ 0, frag_len, TRUE);
#ifdef DEBUG_DESEGMENT
g_debug("Start offset of undissected bytes: %u; "
"Bytes remaining in this segment: %u; min required bytes: %u\n",
}
/* add a 'reassembled in' item if necessary */
- if( fd_head != NULL ) {
+ if (fd_head != NULL) {
guint32 deseg_offset = pinfo->desegment_offset;
- if( fd_head->reassembled_in != 0 &&
- !(fd_head->flags & FD_PARTIAL_REASSEMBLY) ) {
+ if (fd_head->reassembled_in != 0 &&
+ !(fd_head->flags & FD_PARTIAL_REASSEMBLY)) {
proto_item *iax_tree_item;
- iax_tree_item = proto_tree_add_uint( tree, hf_iax2_reassembled_in,
- tvb, deseg_offset, tvb_reported_length_remaining(tvb,deseg_offset),
- fd_head->reassembled_in);
+ iax_tree_item = proto_tree_add_uint(tree, hf_iax2_reassembled_in,
+ tvb, deseg_offset, tvb_reported_length_remaining(tvb, deseg_offset),
+ fd_head->reassembled_in);
PROTO_ITEM_SET_GENERATED(iax_tree_item);
} else {
/* this fragment is never reassembled */
- proto_tree_add_text( tree, tvb, deseg_offset, -1,
- "IAX2 fragment, unfinished");
+ proto_tree_add_text(tree, tvb, deseg_offset, -1,
+ "IAX2 fragment, unfinished");
}
- if( pinfo->desegment_offset == 0 ) {
+ if (pinfo->desegment_offset == 0) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAX2");
col_set_str(pinfo->cinfo, COL_INFO, "[IAX2 segment of a reassembled PDU]");
}
static void dissect_payload(tvbuff_t *tvb, guint32 offset,
packet_info *pinfo, proto_tree *iax2_tree,
- proto_tree *tree, guint32 ts, gboolean video,
+ proto_tree *tree, guint32 ts _U_, gboolean video,
iax_packet_data *iax_packet)
{
#if 0
- gboolean out_of_order = FALSE;
+ gboolean out_of_order = FALSE;
#endif
- tvbuff_t *sub_tvb;
- guint32 codec = iax_packet -> codec;
- guint32 nbytes;
- iax_call_data *iax_call = iax_packet -> call_data;
+ tvbuff_t *sub_tvb;
+ guint32 codec = iax_packet -> codec;
+ guint32 nbytes;
+ iax_call_data *iax_call = iax_packet -> call_data;
- /* keep compiler quiet */
- ts = ts;
-
- if( offset >= tvb_reported_length (tvb)) {
- col_append_str (pinfo->cinfo, COL_INFO, ", empty frame" );
+ if (offset >= tvb_reported_length(tvb)) {
+ col_append_str(pinfo->cinfo, COL_INFO, ", empty frame");
return;
}
/* XXX shouldn't pass through out-of-order packets. */
- if (check_col (pinfo->cinfo, COL_INFO)) {
- if( !video && iax_call && iax_call -> dataformat != 0 ) {
- col_append_fstr (pinfo->cinfo, COL_INFO, ", data, format %s",
- val_to_str (iax_call -> dataformat,
- iax_dataformats, "unknown (0x%02x)"));
+ if (!video && iax_call && iax_call -> dataformat != 0) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", data, format %s",
+ val_to_str(iax_call -> dataformat,
+ iax_dataformats, "unknown (0x%02x)"));
#if 0
- if( out_of_order )
- col_append_str (pinfo->cinfo, COL_INFO, " (out-of-order packet)");
+ if (out_of_order)
+ col_append_str(pinfo->cinfo, COL_INFO, " (out-of-order packet)");
#endif
- } else {
- col_append_fstr (pinfo->cinfo, COL_INFO, ", %s",
- val_to_str (codec, codec_types, "unknown (0x%02x)"));
- }
+ } else {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ val_to_str_ext(codec, &codec_types_ext, "unknown (0x%02x)"));
}
nbytes = tvb_reported_length(sub_tvb);
- proto_tree_add_text( iax2_tree, sub_tvb, 0, -1,
- "IAX2 payload (%u byte%s)", nbytes,
- plurality( nbytes, "", "s" ));
+ proto_tree_add_text(iax2_tree, sub_tvb, 0, -1,
+ "IAX2 payload (%u byte%s)", nbytes,
+ plurality(nbytes, "", "s"));
iax2_info->payload_len = nbytes;
iax2_info->payload_data = tvb_get_ptr(sub_tvb, 0, -1);
/* pass the rest of the block to a subdissector */
- if(iax_packet->call_data)
- desegment_iax( sub_tvb, pinfo, iax2_tree, tree, video, iax_packet );
+ if (iax_packet->call_data)
+ desegment_iax(sub_tvb, pinfo, iax2_tree, tree, video, iax_packet);
else
- process_iax_pdu(sub_tvb,pinfo,tree,video,iax_packet);
+ process_iax_pdu(sub_tvb, pinfo, tree, video, iax_packet);
}
/*
iax_init_protocol(void)
{
iax_init_hash();
-
}
void
-proto_register_iax2 (void)
+proto_register_iax2(void)
{
/* A header field is something you can search/filter on.
*
static hf_register_info hf[] = {
{&hf_iax2_packet_type,
- {"Packet type", "iax2.packet_type", FT_UINT8, BASE_DEC, VALS(iax_packet_types), 0,
+ {"Packet type", "iax2.packet_type",
+ FT_UINT8, BASE_DEC, VALS(iax_packet_types), 0,
"Full/minivoice/minivideo/trunk packet",
HFILL}},
{&hf_iax2_callno,
- {"Call identifier", "iax2.call", FT_UINT32, BASE_DEC, NULL, 0,
- "This is the identifier Wireshark assigns to identify this call. It does not correspond to any real field in the protocol", HFILL }},
+ {"Call identifier", "iax2.call",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "This is the identifier Wireshark assigns to identify this call."
+ " It does not correspond to any real field in the protocol",
+ HFILL }},
{&hf_iax2_scallno,
- {"Source call", "iax2.src_call", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
+ {"Source call", "iax2.src_call",
+ FT_UINT16, BASE_DEC, NULL, 0x7FFF,
"src_call holds the number of this call at the packet source pbx",
HFILL}},
/* FIXME could this be turned into a FRAMENUM field? */
{&hf_iax2_dcallno,
- {"Destination call", "iax2.dst_call", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
+ {"Destination call", "iax2.dst_call",
+ FT_UINT16, BASE_DEC, NULL, 0x7FFF,
"dst_call holds the number of this call at the packet destination",
HFILL}},
{&hf_iax2_retransmission,
- {"Retransmission", "iax2.retransmission", FT_BOOLEAN, 16,
- NULL, 0x8000,
- "retransmission is set if this packet is a retransmission of an earlier failed packet", HFILL}},
+ {"Retransmission", "iax2.retransmission",
+ FT_BOOLEAN, 16, NULL, 0x8000,
+ "retransmission is set if this packet is a retransmission of an earlier failed packet",
+ HFILL}},
{&hf_iax2_ts,
- {"Timestamp", "iax2.timestamp", FT_UINT32, BASE_DEC, NULL, 0x0,
+ {"Timestamp", "iax2.timestamp",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
"timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
HFILL}},
{&hf_iax2_minits,
- {"Timestamp", "iax2.timestamp", FT_UINT16, BASE_DEC, NULL, 0x0,
+ {"Timestamp", "iax2.timestamp",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
"timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
HFILL}},
{&hf_iax2_minividts,
- {"Timestamp", "iax2.timestamp", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
+ {"Timestamp", "iax2.timestamp",
+ FT_UINT16, BASE_DEC, NULL, 0x7FFF,
"timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
HFILL}},
{&hf_iax2_absts,
- {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
- "The absoulte time of this packet (calculated by adding the IAX timestamp to the start time of this call)",
+ {"Absolute Time", "iax2.abstime",
+ FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
+ "The absolute time of this packet (calculated by adding the IAX timestamp to the start time of this call)",
HFILL}},
{&hf_iax2_lateness,
- {"Lateness", "iax2.lateness", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
+ {"Lateness", "iax2.lateness",
+ FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The lateness of this packet compared to its timestamp",
HFILL}},
{&hf_iax2_minividmarker,
- {"Marker", "iax2.video.marker", FT_UINT16, BASE_DEC, NULL, 0x8000,
+ {"Marker", "iax2.video.marker",
+ FT_UINT16, BASE_DEC, NULL, 0x8000,
"RTP end-of-frame marker",
HFILL}},
{&hf_iax2_oseqno,
- {"Outbound seq.no.", "iax2.oseqno", FT_UINT16, BASE_DEC, NULL,
- 0x0,
- "oseqno is the sequence no of this packet. The first packet has oseqno==0, and subsequent packets increment the oseqno by 1",
+ {"Outbound seq.no.", "iax2.oseqno",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "oseqno is the sequence no of this packet. The first packet has oseqno==0,"
+ " and subsequent packets increment the oseqno by 1",
HFILL}},
{&hf_iax2_iseqno,
- {"Inbound seq.no.", "iax2.iseqno", FT_UINT16, BASE_DEC, NULL, 0x0,
+ {"Inbound seq.no.", "iax2.iseqno",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
"iseqno is the sequence no of the last successfully received packet",
HFILL}},
{&hf_iax2_type,
- {"Type", "iax2.type", FT_UINT8, BASE_DEC, VALS (iax_frame_types),
- 0x0,
+ {"Type", "iax2.type",
+ FT_UINT8, BASE_DEC | BASE_EXT_STRING, &iax_frame_types_ext, 0x0,
"For full IAX2 frames, type is the type of frame",
HFILL}},
{&hf_iax2_csub,
- {"Unknown subclass", "iax2.subclass", FT_UINT8, BASE_DEC, NULL, 0x0,
+ {"Unknown subclass", "iax2.subclass",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
"Subclass of unknown type of full IAX2 frame",
HFILL}},
{&hf_iax2_dtmf_csub,
- {"DTMF subclass (digit)", "iax2.dtmf.subclass", FT_STRINGZ, BASE_NONE, NULL, 0x0,
+ {"DTMF subclass (digit)", "iax2.dtmf.subclass",
+ FT_STRINGZ, BASE_NONE, NULL, 0x0,
"DTMF subclass gives the DTMF digit",
HFILL}},
{&hf_iax2_cmd_csub,
- {"Control subclass", "iax2.control.subclass", FT_UINT8, BASE_DEC,
- VALS (iax_cmd_subclasses), 0x0,
- "This gives the command number for a Control packet.", HFILL}},
+ {"Control subclass", "iax2.control.subclass",
+ FT_UINT8, BASE_DEC | BASE_EXT_STRING, &iax_cmd_subclasses_ext, 0x0,
+ "This gives the command number for a Control packet.",
+ HFILL}},
{&hf_iax2_iax_csub,
- {"IAX subclass", "iax2.iax.subclass", FT_UINT8, BASE_DEC,
- VALS (iax_iax_subclasses),
- 0x0,
- "IAX subclass gives the command number for IAX signalling packets", HFILL}},
+ {"IAX subclass", "iax2.iax.subclass",
+ FT_UINT8, BASE_DEC | BASE_EXT_STRING, &iax_iax_subclasses_ext, 0x0,
+ "IAX subclass gives the command number for IAX signaling packets",
+ HFILL}},
{&hf_iax2_voice_csub,
- {"Voice Subclass (compressed codec no)", "iax2.voice.subclass", FT_UINT8, BASE_DEC, NULL, 0x0,
- NULL,
- HFILL}},
+ {"Voice Subclass (compressed codec no)", "iax2.voice.subclass",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_voice_codec,
- {"CODEC", "iax2.voice.codec", FT_UINT32, BASE_HEX, VALS (codec_types),
- 0x0,
- "CODEC gives the codec used to encode audio data", HFILL}},
+ {"CODEC", "iax2.voice.codec",
+ FT_UINT32, BASE_HEX | BASE_EXT_STRING, &codec_types_ext, 0x0,
+ "CODEC gives the codec used to encode audio data",
+ HFILL}},
{&hf_iax2_video_csub,
- {"Video Subclass (compressed codec no)", "iax2.video.subclass", FT_UINT8, BASE_DEC, NULL, 0xBF,
- NULL,
- HFILL}},
+ {"Video Subclass (compressed codec no)", "iax2.video.subclass",
+ FT_UINT8, BASE_DEC, NULL, 0xBF,
+ NULL, HFILL}},
{&hf_iax2_marker,
- {"Marker", "iax2.video.marker", FT_BOOLEAN, 8, NULL, 0x40,
+ {"Marker", "iax2.video.marker",
+ FT_BOOLEAN, 8, NULL, 0x40,
"RTP end-of-frame marker",
HFILL}},
{&hf_iax2_video_codec,
- {"CODEC", "iax2.video.codec", FT_UINT32, BASE_HEX, VALS (codec_types), 0,
- "The codec used to encode video data", HFILL}},
+ {"CODEC", "iax2.video.codec",
+ FT_UINT32, BASE_HEX | BASE_EXT_STRING, &codec_types_ext, 0,
+ "The codec used to encode video data",
+ HFILL}},
{&hf_iax2_modem_csub,
- {"Modem subclass", "iax2.modem.subclass", FT_UINT8, BASE_DEC,
- VALS (iax_modem_subclasses),
- 0x0,
- "Modem subclass gives the type of modem", HFILL}},
+ {"Modem subclass", "iax2.modem.subclass",
+ FT_UINT8, BASE_DEC, VALS(iax_modem_subclasses), 0x0,
+ "Modem subclass gives the type of modem",
+ HFILL}},
+
+ {&hf_iax2_text_csub,
+ {"Text subclass", "iax2.text.subclass",
+ FT_UINT8, BASE_DEC, VALS(iax_text_subclasses), 0x0,
+ NULL,
+ HFILL}},
+
+ {&hf_iax2_text_text,
+ {"Text", "iax2.text.text",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL,
+ HFILL}},
+
+ {&hf_iax2_html_csub,
+ {"HTML subclass", "iax2.html.subclass",
+ FT_UINT8, BASE_DEC, VALS(iax_html_subclasses), 0x0,
+ NULL,
+ HFILL}},
+
+ {&hf_iax2_html_url,
+ {"HTML URL", "iax2.html.url",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL,
+ HFILL}},
{&hf_iax2_trunk_ts,
- {"Timestamp", "iax2.timestamp", FT_UINT32, BASE_DEC, NULL, 0x0,
- "timestamp is the time, in ms after the start ofCommand data this call, at which this trunk packet was transmitted",
+ {"Timestamp", "iax2.timestamp",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ "timestamp is the time, in ms after the start of Command data this call,"
+ " at which this trunk packet was transmitted",
HFILL}},
{&hf_iax2_trunk_metacmd,
- {"Meta command", "iax2.trunk.metacmd", FT_UINT8, BASE_DEC, NULL, 0x7F,
- "Meta command indicates whether or not the Meta Frame is a trunk.", HFILL}},
+ {"Meta command", "iax2.trunk.metacmd",
+ FT_UINT8, BASE_DEC, NULL, 0x7F,
+ "Meta command indicates whether or not the Meta Frame is a trunk.",
+ HFILL}},
{&hf_iax2_trunk_cmddata,
- {"Command data", "iax2.trunk.cmddata", FT_UINT8, BASE_HEX, NULL, 0x0,
- "Flags for options that apply to a trunked call", HFILL}},
+ {"Command data", "iax2.trunk.cmddata",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "Flags for options that apply to a trunked call",
+ HFILL}},
{&hf_iax2_trunk_cmddata_ts,
- {"Trunk timestamps", "iax2.trunk.cmddata.ts", FT_BOOLEAN, 8, NULL, IAX2_TRUNK_TS,
- "True: calls do each include their own timestamp", HFILL}},
+ {"Trunk timestamps", "iax2.trunk.cmddata.ts",
+ FT_BOOLEAN, 8, NULL, IAX2_TRUNK_TS,
+ "True: calls do each include their own timestamp",
+ HFILL}},
{&hf_iax2_trunk_call_len,
- {"Data length", "iax2.trunk.call.len", FT_UINT16, BASE_DEC, NULL, 0x0,
- "Trunk call data length in octets", HFILL}},
+ {"Data length", "iax2.trunk.call.len",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Trunk call data length in octets",
+ HFILL}},
{&hf_iax2_trunk_call_scallno,
- {"Source call number", "iax2.trunk.call.scallno", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
- "Trunk call source call number", HFILL}},
+ {"Source call number", "iax2.trunk.call.scallno",
+ FT_UINT16, BASE_DEC, NULL, 0x7FFF,
+ "Trunk call source call number",
+ HFILL}},
{&hf_iax2_trunk_call_ts,
- {"Timestamp", "iax2.trunk.call.ts", FT_UINT16, BASE_DEC, NULL, 0x0,
+ {"Timestamp", "iax2.trunk.call.ts",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
"timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
HFILL}},
+ {&hf_iax2_trunk_call_data,
+ {"Data", "iax2.trunk.call.payload",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ "Payload carried by this trunked packet.",
+ HFILL}},
+
{&hf_iax2_trunk_ncalls,
- {"Number of calls", "iax2.trunk.ncalls", FT_UINT16, BASE_DEC, NULL, 0x0,
+ {"Number of calls", "iax2.trunk.ncalls",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of calls in this trunk packet",
HFILL}},
+
/*
* Decoding for the ies
*/
{&hf_IAX_IE_APPARENTADDR_SINFAMILY,
- {"Family", "iax2.iax.app_addr.sinfamily", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {"Family", "iax2.iax.app_addr.sinfamily",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
{&hf_IAX_IE_APPARENTADDR_SINPORT,
- {"Port", "iax2.iax.app_addr.sinport", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+ {"Port", "iax2.iax.app_addr.sinport",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+
{&hf_IAX_IE_APPARENTADDR_SINADDR,
- {"Address", "iax2.iax.app_addr.sinaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
+ {"Address", "iax2.iax.app_addr.sinaddr",
+ FT_IPv4, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{&hf_iax2_ies[IAX_IE_CALLED_NUMBER],
{"Number/extension being called", "iax2.iax.called_number",
BASE_NONE, NULL, 0x0, NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLING_NUMBER],
- {"Calling number", "iax2.iax.calling_number", FT_STRING,
- BASE_NONE, NULL,
- 0x0, NULL, HFILL}},
+ {"Calling number", "iax2.iax.calling_number",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
+
{&hf_iax2_ies[IAX_IE_CALLING_ANI],
{"Calling number ANI for billing", "iax2.iax.calling_ani",
- FT_STRING,
- BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLING_NAME],
- {"Name of caller", "iax2.iax.calling_name", FT_STRING, BASE_NONE,
- NULL,
- 0x0, NULL, HFILL}},
+ {"Name of caller", "iax2.iax.calling_name",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLED_CONTEXT],
- {"Context for number", "iax2.iax.called_context", FT_STRING,
- BASE_NONE,
- NULL, 0x0, NULL, HFILL}},
+ {"Context for number", "iax2.iax.called_context",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_USERNAME],
- {"Username (peer or user) for authentication",
- "iax2.iax.username",
- FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Username (peer or user) for authentication", "iax2.iax.username",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_PASSWORD],
- {"Password for authentication", "iax2.iax.password", FT_STRING,
- BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Password for authentication", "iax2.iax.password",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CAPABILITY],
- {"Actual codec capability", "iax2.iax.capability", FT_UINT32,
- BASE_HEX,
- NULL, 0x0, NULL, HFILL}},
+ {"Actual codec capability", "iax2.iax.capability",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_FORMAT],
- {"Desired codec format", "iax2.iax.format", FT_UINT32, BASE_HEX,
- VALS (codec_types), 0x0, NULL, HFILL}},
+ {"Desired codec format", "iax2.iax.format",
+ FT_UINT32, BASE_HEX | BASE_EXT_STRING, &codec_types_ext, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_LANGUAGE],
- {"Desired language", "iax2.iax.language", FT_STRING, BASE_NONE,
- NULL,
- 0x0, NULL, HFILL}},
+ {"Desired language", "iax2.iax.language",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_VERSION],
- {"Protocol version", "iax2.iax.version", FT_UINT16, BASE_HEX, NULL,
- 0x0,
+ {"Protocol version", "iax2.iax.version",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_ADSICPE],
- {"CPE ADSI capability", "iax2.iax.cpe_adsi", FT_UINT16, BASE_HEX,
- NULL,
- 0x0, NULL, HFILL}},
+ {"CPE ADSI capability", "iax2.iax.cpe_adsi",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_DNID],
- {"Originally dialed DNID", "iax2.iax.dnid", FT_STRING, BASE_NONE,
- NULL,
- 0x0, NULL, HFILL}},
+ {"Originally dialed DNID", "iax2.iax.dnid",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_AUTHMETHODS],
- {"Authentication method(s)", "iax2.iax.auth.methods", FT_UINT16,
- BASE_HEX,
- NULL, 0x0, NULL, HFILL}},
+ {"Authentication method(s)", "iax2.iax.auth.methods",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CHALLENGE],
{"Challenge data for MD5/RSA", "iax2.iax.auth.challenge",
- FT_STRING,
- BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_MD5_RESULT],
- {"MD5 challenge result", "iax2.iax.auth.md5", FT_STRING,
- BASE_NONE, NULL,
- 0x0, NULL, HFILL}},
+ {"MD5 challenge result", "iax2.iax.auth.md5",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RSA_RESULT],
- {"RSA challenge result", "iax2.iax.auth.rsa", FT_STRING,
- BASE_NONE, NULL,
- 0x0, NULL, HFILL}},
+ {"RSA challenge result", "iax2.iax.auth.rsa",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_REFRESH],
- {"When to refresh registration", "iax2.iax.refresh", FT_INT16,
- BASE_DEC,
- NULL, 0x0, NULL, HFILL}},
+ {"When to refresh registration", "iax2.iax.refresh",
+ FT_INT16, BASE_DEC, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_DPSTATUS],
- {"Dialplan status", "iax2.iax.dialplan_status", FT_UINT16,
- BASE_HEX, NULL,
- 0x0, NULL, HFILL}},
+ {"Dialplan status", "iax2.iax.dialplan_status",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLNO],
- {"Call number of peer", "iax2.iax.call_no", FT_UINT16, BASE_DEC,
- NULL,
- 0x0, NULL, HFILL}},
+ {"Call number of peer", "iax2.iax.call_no",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CAUSE],
- {"Cause", "iax2.iax.cause", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
- HFILL}},
+ {"Cause", "iax2.iax.cause",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_IAX_UNKNOWN],
- {"Unknown IAX command", "iax2.iax.iax_unknown", FT_BYTES,
- BASE_NONE, NULL,
- 0x0, NULL, HFILL}},
+ {"Unknown IAX command", "iax2.iax.iax_unknown",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_MSGCOUNT],
- {"How many messages waiting", "iax2.iax.msg_count", FT_INT16,
- BASE_DEC,
- NULL, 0x0, NULL, HFILL}},
+ {"How many messages waiting", "iax2.iax.msg_count",
+ FT_INT16, BASE_DEC, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_AUTOANSWER],
- {"Request auto-answering", "iax2.iax.autoanswer", FT_NONE,
- BASE_NONE,
- NULL, 0x0, NULL, HFILL}},
+ {"Request auto-answering", "iax2.iax.autoanswer",
+ FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_MUSICONHOLD],
- {"Request musiconhold with QUELCH", "iax2.iax.moh", FT_NONE,
- BASE_NONE,
- NULL, 0x0, NULL, HFILL}},
+ {"Request musiconhold with QUELCH", "iax2.iax.moh",
+ FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_TRANSFERID],
- {"Transfer Request Identifier", "iax2.iax.transferid", FT_UINT32,
- BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Transfer Request Identifier", "iax2.iax.transferid",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RDNIS],
- {"Referring DNIS", "iax2.iax.rdnis", FT_STRING, BASE_NONE, NULL,
- 0x0, NULL,
- HFILL}},
+ {"Referring DNIS", "iax2.iax.rdnis",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_PROVISIONING],
- {"Provisioning info","iax2.iax.provisioning", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL}},
+ {"Provisioning info", "iax2.iax.provisioning",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_AESPROVISIONING],
- {"AES Provisioning info","iax2.iax.aesprovisioning", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL}},
+ {"AES Provisioning info", "iax2.iax.aesprovisioning",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_DATETIME],
- {"Date/Time", "iax2.iax.datetime.raw", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+ {"Date/Time", "iax2.iax.datetime.raw",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ie_datetime,
- {"Date/Time", "iax2.iax.datetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }},
+ {"Date/Time", "iax2.iax.datetime",
+ FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
+ NULL, HFILL }},
{&hf_iax2_ies[IAX_IE_DEVICETYPE],
- {"Device type", "iax2.iax.devicetype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Device type", "iax2.iax.devicetype",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_SERVICEIDENT],
- {"Service identifier", "iax2.iax.serviceident", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Service identifier", "iax2.iax.serviceident",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_FIRMWAREVER],
- {"Firmware version", "iax2.iax.firmwarever", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Firmware version", "iax2.iax.firmwarever",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_FWBLOCKDESC],
- {"Firmware block description", "iax2.iax.fwblockdesc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Firmware block description", "iax2.iax.fwblockdesc",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_FWBLOCKDATA],
- {"Firmware block of data", "iax2.iax.fwblockdata", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Firmware block of data", "iax2.iax.fwblockdata",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_PROVVER],
- {"Provisioning version", "iax2.iax.provver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Provisioning version", "iax2.iax.provver",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLINGPRES],
- {"Calling presentation", "iax2.iax.callingpres", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Calling presentation", "iax2.iax.callingpres",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLINGTON],
- {"Calling type of number", "iax2.iax.callington", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Calling type of number", "iax2.iax.callington",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CALLINGTNS],
- {"Calling transit network select", "iax2.iax.callingtns", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Calling transit network select", "iax2.iax.callingtns",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_SAMPLINGRATE],
- {"Supported sampling rates", "iax2.iax.samplingrate", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Supported sampling rates", "iax2.iax.samplingrate",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CAUSECODE],
- {"Hangup cause", "iax2.iax.causecode", FT_UINT8, BASE_HEX, VALS(iax_causecodes),
- 0x0, NULL, HFILL}},
+ {"Hangup cause", "iax2.iax.causecode",
+ FT_UINT8, BASE_HEX | BASE_EXT_STRING, &iax_causecodes_ext, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_ENCRYPTION],
- {"Encryption format", "iax2.iax.encryption", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Encryption format", "iax2.iax.encryption",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_ENCKEY],
- {"Encryption key", "iax2.iax.enckey", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Encryption key", "iax2.iax.enckey",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_CODEC_PREFS],
- {"Codec negotiation", "iax2.iax.codecprefs", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+ {"Codec negotiation", "iax2.iax.codecprefs",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_JITTER],
- {"Received jitter (as in RFC1889)", "iax2.iax.rrjitter", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Received jitter (as in RFC1889)", "iax2.iax.rrjitter",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_LOSS],
{"Received loss (high byte loss pct, low 24 bits loss count, as in rfc1889)", "iax2.iax.rrloss",
- FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_PKTS],
- {"Total frames received", "iax2.iax.rrpkts", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Total frames received", "iax2.iax.rrpkts",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_DELAY],
- {"Max playout delay in ms for received frames", "iax2.iax.rrdelay", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Max playout delay in ms for received frames", "iax2.iax.rrdelay",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_DROPPED],
- {"Dropped frames (presumably by jitterbuffer)", "iax2.iax.rrdropped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Dropped frames (presumably by jitterbuffer)", "iax2.iax.rrdropped",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_RR_OOO],
- {"Frame received out of order", "iax2.iax.rrooo", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+ {"Frame received out of order", "iax2.iax.rrooo",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ NULL, HFILL}},
{&hf_iax2_ies[IAX_IE_DATAFORMAT],
- {"Data call format", "iax2.iax.dataformat", FT_UINT32, BASE_HEX,
- VALS(iax_dataformats), 0x0, NULL, HFILL}},
+ {"Data call format", "iax2.iax.dataformat",
+ FT_UINT32, BASE_HEX, VALS(iax_dataformats), 0x0,
+ NULL, HFILL}},
{&hf_IAX_IE_UNKNOWN_BYTE,
- {"Unknown", "iax2.iax.unknownbyte", FT_UINT8, BASE_HEX, NULL,
- 0x0, "Raw data for unknown IEs",
- HFILL}},
+ {"Unknown", "iax2.iax.unknownbyte",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "Raw data for unknown IEs", HFILL}},
+
{&hf_IAX_IE_UNKNOWN_I16,
- {"Unknown", "iax2.iax.unknownshort", FT_UINT16, BASE_HEX, NULL,
- 0x0, "Raw data for unknown IEs",
- HFILL}},
+ {"Unknown", "iax2.iax.unknownshort",
+ FT_UINT16, BASE_HEX, NULL, 0x0,
+ "Raw data for unknown IEs", HFILL}},
+
{&hf_IAX_IE_UNKNOWN_I32,
- {"Unknown", "iax2.iax.unknownlong", FT_UINT32, BASE_HEX, NULL,
- 0x0, "Raw data for unknown IEs",
- HFILL}},
+ {"Unknown", "iax2.iax.unknownlong",
+ FT_UINT32, BASE_HEX, NULL, 0x0,
+ "Raw data for unknown IEs", HFILL}},
+
{&hf_IAX_IE_UNKNOWN_BYTES,
- {"Unknown", "iax2.iax.unknownstring", FT_STRING, BASE_NONE, NULL,
- 0x0, "Raw data for unknown IEs",
- HFILL}},
+ {"Unknown", "iax2.iax.unknownstring",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ "Raw data for unknown IEs", HFILL}},
- /* capablilites */
+ /* capabilities */
{&hf_iax2_cap_g723_1,
- {"G.723.1 compression", "iax2.cap.g723_1", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_G723_1,
+ {"G.723.1 compression", "iax2.cap.g723_1",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_G723_1,
NULL, HFILL }},
{&hf_iax2_cap_gsm,
- {"GSM compression", "iax2.cap.gsm", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_GSM,
+ {"GSM compression", "iax2.cap.gsm",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_GSM,
NULL, HFILL }},
{&hf_iax2_cap_ulaw,
- {"Raw mu-law data (G.711)", "iax2.cap.ulaw",FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_ULAW,
+ {"Raw mu-law data (G.711)", "iax2.cap.ulaw",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_ULAW,
NULL, HFILL }},
{&hf_iax2_cap_alaw,
- {"Raw A-law data (G.711)", "iax2.cap.alaw",FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_ALAW,
- NULL, HFILL }},
+ {"Raw A-law data (G.711)", "iax2.cap.alaw",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_ALAW,
+ NULL, HFILL } },
- {&hf_iax2_cap_g726,
- {"G.726 compression", "iax2.cap.g726",FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_G726,
+ {&hf_iax2_cap_g726_aal2,
+ {"G.726 compression (AAL2 packing)", "iax2.cap.g726_aal2",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_G726_AAL2,
NULL, HFILL }},
{&hf_iax2_cap_adpcm,
- {"ADPCM", "iax2.cap.adpcm", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_ADPCM,
+ {"ADPCM", "iax2.cap.adpcm",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_ADPCM,
NULL, HFILL }},
{&hf_iax2_cap_slinear,
NULL, HFILL }},
{&hf_iax2_cap_lpc10,
- {"LPC10, 180 samples/frame", "iax2.cap.lpc10", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_LPC10,
- NULL, HFILL }},
+ {"LPC10, 180 samples/frame",
+ "iax2.cap.lpc10", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported),
+ AST_FORMAT_LPC10, NULL, HFILL }},
{&hf_iax2_cap_g729a,
- {"G.729a Audio", "iax2.cap.g729a", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_G729A,
+ {"G.729a Audio", "iax2.cap.g729a",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_G729A,
NULL, HFILL }},
{&hf_iax2_cap_speex,
- {"SPEEX Audio", "iax2.cap.speex", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_SPEEX,
+ {"SPEEX Audio", "iax2.cap.speex",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SPEEX,
NULL, HFILL }},
{&hf_iax2_cap_ilbc,
- {"iLBC Free compressed Audio", "iax2.cap.ilbc", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_ILBC,
+ {"iLBC Free compressed Audio", "iax2.cap.ilbc",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_ILBC,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_g726,
+ {"ADPCM (G.726, 32kbps, RFC3551 codeword packing)", "iax2.cap.g726",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_G726,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_g722,
+ {"G.722 wideband audio", "iax2.cap.g722",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_G722,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_siren7,
+ {"G.722.1 (also known as Siren7, 32kbps assumed)", "iax2.cap.siren7",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SIREN7,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_siren14,
+ {"G.722.1 Annex C (also known as Siren14, 48kbps assumed)", "iax2.cap.siren14",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SIREN14,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_slinear16,
+ {"Raw 16-bit Signed Linear (16000 Hz) PCM", "iax2.cap.slinear16",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SLINEAR16,
NULL, HFILL }},
{&hf_iax2_cap_jpeg,
- {"JPEG images", "iax2.cap.jpeg", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_JPEG,
+ {"JPEG images", "iax2.cap.jpeg",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_JPEG,
NULL, HFILL }},
{&hf_iax2_cap_png,
- {"PNG images", "iax2.cap.png", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_PNG,
+ {"PNG images", "iax2.cap.png",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_PNG,
NULL, HFILL }},
{&hf_iax2_cap_h261,
- {"H.261 video", "iax2.cap.h261", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_H261,
+ {"H.261 video", "iax2.cap.h261",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_H261,
NULL, HFILL }},
{&hf_iax2_cap_h263,
- {"H.263 video", "iax2.cap.h263", FT_BOOLEAN, 32,
- TFS(&tfs_supported_not_supported), AST_FORMAT_H263,
+ {"H.263 video", "iax2.cap.h263",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_H263,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_h263_plus,
+ {"H.263+ video", "iax2.cap.h263_plus",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_H263_PLUS,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_h264,
+ {"H.264 video", "iax2.cap.h264",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_H264,
+ NULL, HFILL }},
+
+ {&hf_iax2_cap_mpeg4,
+ {"MPEG4 video", "iax2.cap.mpeg4",
+ FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_MP4_VIDEO,
NULL, HFILL }},
/* reassembly stuff */
{&hf_iax2_fragments,
- {"IAX2 Fragments", "iax2.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
+ {"IAX2 Fragments", "iax2.fragments",
+ FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_iax2_fragment,
- {"IAX2 Fragment data", "iax2.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+ {"IAX2 Fragment data", "iax2.fragment",
+ FT_FRAMENUM, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_iax2_fragment_overlap,
- {"Fragment overlap", "iax2.fragment.overlap", FT_BOOLEAN, BASE_NONE,
- NULL, 0x0, "Fragment overlaps with other fragments", HFILL }},
+ {"Fragment overlap", "iax2.fragment.overlap",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "Fragment overlaps with other fragments", HFILL }},
{&hf_iax2_fragment_overlap_conflict,
{"Conflicting data in fragment overlap", "iax2.fragment.overlap.conflict",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"Defragmentation error due to illegal fragments", HFILL }},
+ {&hf_iax2_fragment_count,
+ {"Fragment count", "iax2.fragment.count",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
{&hf_iax2_reassembled_in,
{"IAX2 fragment, reassembled in frame", "iax2.reassembled_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
&ett_iax2_trunk_call
};
- /* initialise the hf_iax2_ies[] array to -1 */
- memset(hf_iax2_ies,0xff,sizeof(hf_iax2_ies));
+ static ei_register_info ei[] = {
+ { &ei_iax_too_many_transfers, { "iax2.too_many_transfers", PI_PROTOCOL, PI_WARN, "Too many transfers for iax_call", EXPFILL }},
+ { &ei_iax_circuit_id_conflict, { "iax2.circuit_id_conflict", PI_PROTOCOL, PI_WARN, "Circuit ID conflict", EXPFILL }},
+ { &ei_iax_peer_address_unsupported, { "iax2.peer_address_unsupported", PI_PROTOCOL, PI_WARN, "Peer address unsupported", EXPFILL }},
+ };
+
+ expert_module_t* expert_iax;
+
+ /* initialize the hf_iax2_ies[] array to -1 */
+ memset(hf_iax2_ies, 0xff, sizeof(hf_iax2_ies));
proto_iax2 =
- proto_register_protocol ("Inter-Asterisk eXchange v2", "IAX2", "iax2");
- proto_register_field_array (proto_iax2, hf, array_length (hf));
- proto_register_subtree_array (ett, array_length (ett));
+ proto_register_protocol("Inter-Asterisk eXchange v2", "IAX2", "iax2");
+ proto_register_field_array(proto_iax2, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+ expert_iax = expert_register_protocol(proto_iax2);
+ expert_register_field_array(expert_iax, ei, array_length(ei));
register_dissector("iax2", dissect_iax2, proto_iax2);
iax2_codec_dissector_table = register_dissector_table(
- "iax2.codec","IAX codec number", FT_UINT32, BASE_HEX);
+ "iax2.codec", "IAX codec number", FT_UINT32, BASE_HEX);
iax2_dataformat_dissector_table = register_dissector_table(
- "iax2.dataformat","IAX dataformat number", FT_UINT32, BASE_HEX);
+ "iax2.dataformat", "IAX dataformat number", FT_UINT32, BASE_HEX);
/* register our init routine to be called at the start of a capture,
to clear out our hash tables etc */
}
void
-proto_reg_handoff_iax2 (void)
+proto_reg_handoff_iax2(void)
{
- dissector_handle_t v110_handle = NULL;
+ dissector_handle_t v110_handle;
- dissector_add("udp.port", IAX2_PORT, find_dissector("iax2"));
+ dissector_add_uint("udp.port", IAX2_PORT, find_dissector("iax2"));
v110_handle = find_dissector("v110");
- if(v110_handle)
- dissector_add("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle);
+ if (v110_handle)
+ dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle);
data_handle = find_dissector("data");
}
* indent-tabs-mode: nil
* End:
*
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/
git.samba.org / metze / wireshark / wip.git / blobdiff