forked from osmocom/wireshark
Updates from Richard v d Hoff
IAX2 updates and a CRC16 routine svn path=/trunk/; revision=11233
This commit is contained in:
Ronnie Sahlberg
parent
79d7a7cba6
commit
e790073f3a
4
AUTHORS
4
AUTHORS
|
|
@ -2144,6 +2144,10 @@ Dominic Béchaz <bdo [AT] zhwin.ch> {
|
|||
IEEE 1588 / PTP support
|
||||
}
|
||||
|
||||
Richard van der Hoff <richardv [AT] mxtelecom.com> {
|
||||
IAX2 updates
|
||||
CRC16 routines
|
||||
}
|
||||
|
||||
And assorted fixes and enhancements by the people listed above and by:
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,152 @@
|
|||
/* crc16.c
|
||||
* CRC-16 routine
|
||||
*
|
||||
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
|
||||
*
|
||||
* $Id: crc16.c,v 1.1 2004/06/25 06:31:46 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@xxxxxxxxxxxx>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* Copied from README.developer
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* References:
|
||||
* "A Painless Guide to CRC Error Detection Algorithms", Ross Williams
|
||||
* http://www.repairfaq.org/filipg/LINK/F_crc_v3.html
|
||||
*
|
||||
* ITU-T Recommendation V.42 (2002), "Error-Correcting Procedures for
|
||||
* DCEs using asynchronous-to-synchronous conversion", Para. 8.1.1.6.1
|
||||
*/
|
||||
|
||||
#include <glib.h>
|
||||
#include <epan/tvbuff.h>
|
||||
#include "crc16.h"
|
||||
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
/*
|
||||
* Table for the CCITT/ITU/CRC-16 16-bit CRC
|
||||
*
|
||||
* Polynomial is
|
||||
*
|
||||
* x^16 + x^12 + x^5 + 1
|
||||
*/
|
||||
|
||||
/* */
|
||||
/* CRC LOOKUP TABLE */
|
||||
/* ================ */
|
||||
/* The following CRC lookup table was generated automagically */
|
||||
/* by the Rocksoft^tm Model CRC Algorithm Table Generation */
|
||||
/* Program V1.0 using the following model parameters: */
|
||||
/* */
|
||||
/* Width : 2 bytes. */
|
||||
/* Poly : 0x1021 */
|
||||
/* Reverse : TRUE. */
|
||||
/* */
|
||||
/* For more information on the Rocksoft^tm Model CRC Algorithm, */
|
||||
/* see the document titled "A Painless Guide to CRC Error */
|
||||
/* Detection Algorithms" by Ross Williams */
|
||||
/* (ross@xxxxxxxxxxxxxxxxxxxxxx). This document is likely to be */
|
||||
/* in the FTP archive "ftp.adelaide.edu.au/pub/rocksoft". */
|
||||
/* */
|
||||
/*****************************************************************/
|
||||
|
||||
guint crc16_ccitt_table[256] =
|
||||
{
|
||||
0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
|
||||
0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
|
||||
0x1081, 0x0108, 0x3393, 0x221A, 0x56A5, 0x472C, 0x75B7, 0x643E,
|
||||
0x9CC9, 0x8D40, 0xBFDB, 0xAE52, 0xDAED, 0xCB64, 0xF9FF, 0xE876,
|
||||
0x2102, 0x308B, 0x0210, 0x1399, 0x6726, 0x76AF, 0x4434, 0x55BD,
|
||||
0xAD4A, 0xBCC3, 0x8E58, 0x9FD1, 0xEB6E, 0xFAE7, 0xC87C, 0xD9F5,
|
||||
0x3183, 0x200A, 0x1291, 0x0318, 0x77A7, 0x662E, 0x54B5, 0x453C,
|
||||
0xBDCB, 0xAC42, 0x9ED9, 0x8F50, 0xFBEF, 0xEA66, 0xD8FD, 0xC974,
|
||||
0x4204, 0x538D, 0x6116, 0x709F, 0x0420, 0x15A9, 0x2732, 0x36BB,
|
||||
0xCE4C, 0xDFC5, 0xED5E, 0xFCD7, 0x8868, 0x99E1, 0xAB7A, 0xBAF3,
|
||||
0x5285, 0x430C, 0x7197, 0x601E, 0x14A1, 0x0528, 0x37B3, 0x263A,
|
||||
0xDECD, 0xCF44, 0xFDDF, 0xEC56, 0x98E9, 0x8960, 0xBBFB, 0xAA72,
|
||||
0x6306, 0x728F, 0x4014, 0x519D, 0x2522, 0x34AB, 0x0630, 0x17B9,
|
||||
0xEF4E, 0xFEC7, 0xCC5C, 0xDDD5, 0xA96A, 0xB8E3, 0x8A78, 0x9BF1,
|
||||
0x7387, 0x620E, 0x5095, 0x411C, 0x35A3, 0x242A, 0x16B1, 0x0738,
|
||||
0xFFCF, 0xEE46, 0xDCDD, 0xCD54, 0xB9EB, 0xA862, 0x9AF9, 0x8B70,
|
||||
0x8408, 0x9581, 0xA71A, 0xB693, 0xC22C, 0xD3A5, 0xE13E, 0xF0B7,
|
||||
0x0840, 0x19C9, 0x2B52, 0x3ADB, 0x4E64, 0x5FED, 0x6D76, 0x7CFF,
|
||||
0x9489, 0x8500, 0xB79B, 0xA612, 0xD2AD, 0xC324, 0xF1BF, 0xE036,
|
||||
0x18C1, 0x0948, 0x3BD3, 0x2A5A, 0x5EE5, 0x4F6C, 0x7DF7, 0x6C7E,
|
||||
0xA50A, 0xB483, 0x8618, 0x9791, 0xE32E, 0xF2A7, 0xC03C, 0xD1B5,
|
||||
0x2942, 0x38CB, 0x0A50, 0x1BD9, 0x6F66, 0x7EEF, 0x4C74, 0x5DFD,
|
||||
0xB58B, 0xA402, 0x9699, 0x8710, 0xF3AF, 0xE226, 0xD0BD, 0xC134,
|
||||
0x39C3, 0x284A, 0x1AD1, 0x0B58, 0x7FE7, 0x6E6E, 0x5CF5, 0x4D7C,
|
||||
0xC60C, 0xD785, 0xE51E, 0xF497, 0x8028, 0x91A1, 0xA33A, 0xB2B3,
|
||||
0x4A44, 0x5BCD, 0x6956, 0x78DF, 0x0C60, 0x1DE9, 0x2F72, 0x3EFB,
|
||||
0xD68D, 0xC704, 0xF59F, 0xE416, 0x90A9, 0x8120, 0xB3BB, 0xA232,
|
||||
0x5AC5, 0x4B4C, 0x79D7, 0x685E, 0x1CE1, 0x0D68, 0x3FF3, 0x2E7A,
|
||||
0xE70E, 0xF687, 0xC41C, 0xD595, 0xA12A, 0xB0A3, 0x8238, 0x93B1,
|
||||
0x6B46, 0x7ACF, 0x4854, 0x59DD, 0x2D62, 0x3CEB, 0x0E70, 0x1FF9,
|
||||
0xF78F, 0xE606, 0xD49D, 0xC514, 0xB1AB, 0xA022, 0x92B9, 0x8330,
|
||||
0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
|
||||
};
|
||||
|
||||
static const guint16 crc16_ccitt_start = 0xFFFF;
|
||||
static const guint16 crc16_ccitt_xorout = 0xFFFF;
|
||||
|
||||
/* two types of crcs are possible: unreflected (bits shift left) and
|
||||
* reflected (bits shift right).
|
||||
*/
|
||||
#if 0
|
||||
static guint16 crc16_unreflected(const unsigned char *buf, guint len,
|
||||
guint16 crc_in, const guint table[])
|
||||
{
|
||||
/* we use guints, rather than guint16s, as they are likely to be
|
||||
faster. We just ignore the top 16 bits and let them do what they want. */
|
||||
guint crc16 = (guint)crc_in;;
|
||||
|
||||
while( len-- > 0 )
|
||||
crc16 = table[(crc16 ^ *buf++) & 0xff] ^ (crc16 << 8);
|
||||
|
||||
return (guint16)crc16;
|
||||
}
|
||||
#endif
|
||||
|
||||
static guint16 crc16_reflected(const unsigned char *buf, guint len,
|
||||
guint16 crc_in, const guint table[])
|
||||
{
|
||||
/* we use guints, rather than guint16s, as they are likely to be
|
||||
faster. We just ignore the top 16 bits and let them do what they want. */
|
||||
guint crc16 = (guint)crc_in;;
|
||||
|
||||
while( len-- > 0 )
|
||||
crc16 = table[(crc16 ^ *buf++) & 0xff] ^ (crc16 >> 8);
|
||||
|
||||
return (guint16)crc16;
|
||||
}
|
||||
|
||||
|
||||
guint16 crc16_ccitt(const unsigned char *buf, guint len)
|
||||
{
|
||||
return crc16_reflected(buf,len,crc16_ccitt_start,crc16_ccitt_table)
|
||||
^ crc16_ccitt_xorout;
|
||||
}
|
||||
|
||||
guint16 crc16_ccitt_tvb(tvbuff_t *tvb, unsigned int len)
|
||||
{
|
||||
const unsigned char* buf = tvb_get_ptr(tvb, 0, len);
|
||||
|
||||
return crc16_ccitt(buf, len);
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/* crc16.h
|
||||
* Declaration of CRC-16 routines and table
|
||||
*
|
||||
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
|
||||
*
|
||||
* $Id: crc16.h,v 1.1 2004/06/25 06:31:46 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@xxxxxxxxxxxx>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* Copied from README.developer
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* Calculate the CCITT/ITU/CRC-16 16-bit CRC
|
||||
|
||||
(parameters for this CRC are:
|
||||
Polynomial: x^16 + x^12 + x^5 + 1 (0x1021);
|
||||
Start value 0xFFFF;
|
||||
XOR result with 0xFFFF;
|
||||
First bit is LSB)
|
||||
*/
|
||||
extern guint16 crc16_ccitt(const unsigned char *buf, guint len);
|
||||
extern guint16 crc16_ccitt_tvb(tvbuff_t *tvb, unsigned int len);
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet_info.h
|
||||
* Definitions for packet info structures and routines
|
||||
*
|
||||
* $Id: packet_info.h,v 1.40 2004/03/23 01:02:40 guy Exp $
|
||||
* $Id: packet_info.h,v 1.41 2004/06/25 06:31:47 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -121,7 +121,8 @@ typedef enum {
|
|||
CT_DLCI, /* Frame Relay DLCI */
|
||||
CT_ISDN, /* ISDN channel number */
|
||||
CT_X25, /* X.25 logical channel number */
|
||||
CT_ISUP /* ISDN User Part CIC */
|
||||
CT_ISUP, /* ISDN User Part CIC */
|
||||
CT_IAX2 /* IAX2 call id */
|
||||
/* Could also have ATM VPI/VCI pairs */
|
||||
} circuit_type;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
/* iax2_codec_type.h
|
||||
* Defines IAX2 codec types
|
||||
*
|
||||
* $Id: iax2_codec_type.h,v 1.1 2004/06/25 06:31:46 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __IAX2_CODEC_TYPE_H__
|
||||
#define __IAX2_CODEC_TYPE_H__
|
||||
|
||||
|
||||
/* Ref: frame.h from Asterisk source */
|
||||
|
||||
/* Data formats for capabilities and frames alike */
|
||||
/* suitable for use in iax2.codec dissector table */
|
||||
/*! G.723.1 compression */
|
||||
#define AST_FORMAT_G723_1 (1 << 0)
|
||||
/*! GSM compression */
|
||||
#define AST_FORMAT_GSM (1 << 1)
|
||||
/*! Raw mu-law data (G.711) */
|
||||
#define AST_FORMAT_ULAW (1 << 2)
|
||||
/*! Raw A-law data (G.711) */
|
||||
#define AST_FORMAT_ALAW (1 << 3)
|
||||
/*! ADPCM (G.726, 32kbps) */
|
||||
#define AST_FORMAT_G726 (1 << 4)
|
||||
/*! ADPCM (IMA) */
|
||||
#define AST_FORMAT_ADPCM (1 << 5)
|
||||
/*! Raw 16-bit Signed Linear (8000 Hz) PCM */
|
||||
#define AST_FORMAT_SLINEAR (1 << 6)
|
||||
/*! LPC10, 180 samples/frame */
|
||||
#define AST_FORMAT_LPC10 (1 << 7)
|
||||
/*! G.729A audio */
|
||||
#define AST_FORMAT_G729A (1 << 8)
|
||||
/*! SpeeX Free Compression */
|
||||
#define AST_FORMAT_SPEEX (1 << 9)
|
||||
/*! iLBC Free Compression */
|
||||
#define AST_FORMAT_ILBC (1 << 10)
|
||||
/*! Maximum audio format */
|
||||
#define AST_FORMAT_MAX_AUDIO (1 << 15)
|
||||
/*! JPEG Images */
|
||||
#define AST_FORMAT_JPEG (1 << 16)
|
||||
/*! PNG Images */
|
||||
#define AST_FORMAT_PNG (1 << 17)
|
||||
/*! H.261 Video */
|
||||
#define AST_FORMAT_H261 (1 << 18)
|
||||
/*! H.263 Video */
|
||||
#define AST_FORMAT_H263 (1 << 19)
|
||||
/*! Max one */
|
||||
#define AST_FORMAT_MAX_VIDEO (1 << 24)
|
||||
|
||||
|
||||
/* data format for IAX_IE_DATAFORMAT ie */
|
||||
/* suitable for use in iax2.dataformat dissector table */
|
||||
typedef enum {
|
||||
AST_DATAFORMAT_NULL, /* N/A: analogue call etc */
|
||||
AST_DATAFORMAT_V110, /* ITU-T V.110 rate adaption */
|
||||
AST_DATAFORMAT_H223_H245 /* ITU-T H.223/H.245 */
|
||||
} iax_dataformat_t;
|
||||
|
||||
#endif
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright 2003 Niklas Ögren <niklas.ogren@7l.se>
|
||||
* Seven Levels Consultants AB
|
||||
*
|
||||
* $Id: packet-h263.c,v 1.4 2003/08/25 21:48:44 guy Exp $
|
||||
* $Id: packet-h263.c,v 1.5 2004/06/25 06:31:46 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -45,6 +45,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "rtp_pt.h"
|
||||
#include "iax2_codec_type.h"
|
||||
|
||||
/* H.263 header fields */
|
||||
static int proto_h263 = -1;
|
||||
|
|
@ -526,6 +527,7 @@ proto_register_h263(void)
|
|||
"H.263", "h263");
|
||||
proto_register_field_array(proto_h263, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
register_dissector("h263", dissect_h263, proto_h263);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -533,6 +535,7 @@ proto_reg_handoff_h263(void)
|
|||
{
|
||||
dissector_handle_t h263_handle;
|
||||
|
||||
h263_handle = create_dissector_handle(dissect_h263, proto_h263);
|
||||
h263_handle = find_dissector("h263");
|
||||
dissector_add("rtp.pt", PT_H263, h263_handle);
|
||||
dissector_add("iax2.codec", AST_FORMAT_H263, h263_handle);
|
||||
}
|
||||
|
|
|
|||
1636
packet-iax2.c
1636
packet-iax2.c
File diff suppressed because it is too large
Load Diff
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
* Mark Spencer <markster@linux-support.net>
|
||||
*
|
||||
* $Id: packet-iax2.h,v 1.2 2004/05/15 21:26:09 guy Exp $
|
||||
* $Id: packet-iax2.h,v 1.3 2004/06/25 06:31:46 sahlberg Exp $
|
||||
*
|
||||
* This program is free software, distributed under the terms of
|
||||
* the GNU General Public License
|
||||
|
|
@ -112,6 +112,10 @@
|
|||
#define IAX_IE_MUSICONHOLD 26 /* Request musiconhold with QUELCH -- none or string */
|
||||
#define IAX_IE_TRANSFERID 27 /* Transfer Request Identifier -- int */
|
||||
#define IAX_IE_RDNIS 28 /* Referring DNIS -- string */
|
||||
#define IAX_IE_PROVISIONING 29 /* Provisioning info */
|
||||
#define IAX_IE_AESPROVISIONING 30 /* AES Provisioning info */
|
||||
#define IAX_IE_DATETIME 31 /* Date/Time */
|
||||
#define IAX_IE_DATAFORMAT 255 /* Data call format -- iax_dataformat_t */
|
||||
|
||||
#define IAX_AUTH_PLAINTEXT (1 << 0)
|
||||
#define IAX_AUTH_MD5 (1 << 1)
|
||||
|
|
@ -126,20 +130,4 @@
|
|||
#define IAX_DPSTATUS_IGNOREPAT (1 << 14)
|
||||
#define IAX_DPSTATUS_MATCHMORE (1 << 15)
|
||||
|
||||
#define AST_FORMAT_G723_1 (1 << 0) /* G.723.1 compression */
|
||||
#define AST_FORMAT_GSM (1 << 1) /* GSM compression */
|
||||
#define AST_FORMAT_ULAW (1 << 2) /* Raw mu-law data (G.711) */
|
||||
#define AST_FORMAT_ALAW (1 << 3) /* Raw A-law data (G.711) */
|
||||
#define AST_FORMAT_G726 (1 << 4) /* ADPCM (G.726, 32kbps) */
|
||||
#define AST_FORMAT_ADPCM (1 << 5) /* ADPCM (IMA) */
|
||||
#define AST_FORMAT_SLINEAR (1 << 6) /* Raw 16-bit Signed Linear (8000 Hz) PCM */
|
||||
#define AST_FORMAT_LPC10 (1 << 7) /* LPC10, 180 samples/frame */
|
||||
#define AST_FORMAT_G729A (1 << 8) /* G.729a Audio */
|
||||
#define AST_FORMAT_SPEEX (1 << 9) /* SpeeX Free Compression */
|
||||
#define AST_FORMAT_ILBC (1 << 10) /* iLBC Free Compression */
|
||||
#define AST_FORMAT_JPEG (1 << 16) /* JPEG Images */
|
||||
#define AST_FORMAT_PNG (1 << 17) /* PNG Images */
|
||||
#define AST_FORMAT_H261 (1 << 18) /* H.261 Video */
|
||||
#define AST_FORMAT_H263 (1 << 19) /* H.263 Video */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue