osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Francesco Fondelli: 

Fix indentation.
(I restored "lost code")

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924

svn path=/trunk/; revision=40839
This commit is contained in:
Anders Broman 2012-02-04 14:01:46 +00:00
parent e1a7ad65d3
commit 9a296bbb74
2 changed files with 88 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-dccp.c
View File

@ -29,7 +29,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* NOTES:
*
* Nov 13, 2006: makes checksum computation dependent
@ -67,14 +66,19 @@
#include <epan/conversation.h>
#include <epan/tap.h>
/* Some definitions and the dissect_options() logic have been taken from Arnaldo Carvalho de Melo's DCCP implementation, thanks! */
/*
* Some definitions and the dissect_options() logic have been taken
* from Arnaldo Carvalho de Melo's DCCP implementation, thanks!
*/
#define DCCP_HDR_LEN 16 /* base DCCP header length, with 48 bits seqnums */
#define DCCP_HDR_LEN_MIN 12 /* , with 24 bits seqnum */
#define DCCP_HDR_PKT_TYPES_LEN_MAX 12 /* max per packet type extra header length */
#define DCCP_HDR_LEN_MIN 12 /* with 24 bits seqnum */
#define DCCP_HDR_PKT_TYPES_LEN_MAX 12 /* max per packet type extra
* header length
*/
#define DCCP_OPT_LEN_MAX 1008
#define DCCP_HDR_LEN_MAX (DCCP_HDR_LEN + DCCP_HDR_PKT_TYPES_LEN_MAX + DCCP_OPT_LEN_MAX)
#define DCCP_HDR_LEN_MAX (DCCP_HDR_LEN + DCCP_HDR_PKT_TYPES_LEN_MAX + \
DCCP_OPT_LEN_MAX)
static const value_string dccp_packet_type_vals[] = {
{0x0, "Request" },
@ -135,7 +139,6 @@ static const value_string dccp_feature_numbers_vals[] = {
{0, NULL }
};
#if 0
#define DBG(str, args...) do {\
fprintf(stdout, \
@ -152,7 +155,6 @@ static const value_string dccp_feature_numbers_vals[] = {
#define DBG2(format, arg1, arg2)
#endif /* 0/1 */
static int proto_dccp = -1;
static int dccp_tap = -1;

8
epan/dissectors/packet-dccp.h
View File

@ -33,7 +33,8 @@
#define __PACKET_DCCP_H__
/* DCCP structs and definitions */
typedef struct _e_dccphdr {
typedef struct _e_dccphdr
{
guint16 sport;
guint16 dport;
guint8 data_offset;
@ -46,7 +47,10 @@ typedef struct _e_dccphdr {
guint8 reserved2; /* if x == 1 */
guint64 seq; /* 48 or 24 bits sequence number */
guint16 ack_reserved; /* for all defined packet types except DCCP-Request and DCCP-Data */
guint16 ack_reserved; /*
* for all defined packet types except DCCP-Request
* and DCCP-Data
*/
guint64 ack; /* 48 or 24 bits acknowledgement sequence number */
guint32 service_code;