Commit Graph

76 Commits

Author SHA1 Message Date
Michael Mann fe4b7ee625 convert to proto_tree_add_subtree[_format]
Change-Id: If110de1e0555637264f86f1508858d569871a9c7
Reviewed-on: https://code.wireshark.org/review/2675
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:10:02 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Pascal Quantin c4ead251da GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing
While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent

Bug: 10120
Change-Id: I3fe113279c779a9d8143d07489747a67d7351664
Reviewed-on: https://code.wireshark.org/review/1794
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-25 16:39:00 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Bill Meier 58bb4726a8 Comment out a lot more hf[] entries and related.
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?


svn path=/trunk/; revision=54990
2014-01-28 03:09:03 +00:00
Guy Harris 020230e865 f_k() is used outside packet-gsm_a_rr.c, so it can't be static.
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

That means f_k() doesn't need to, and shouldn't be, declared in
packet-gsm_rlcmac.h.  Include packet-gsm_a_rr.h in packet-gsm_rlcmac.c.

svn path=/trunk/; revision=54724
2014-01-13 21:36:43 +00:00
Michael Mann f4ef031335 Make more items filterable courtesy of convert_proto_tree_add_text.pl
svn path=/trunk/; revision=54279
2013-12-20 02:13:02 +00:00
Alexis La Goutte c1ceac58cd Fix -Wunused-const-variable found by Clang
svn path=/trunk/; revision=54222
2013-12-18 14:31:14 +00:00
Irene Rüngeler d54801bff5 Fix warning because of functions defined but not used.
svn path=/trunk/; revision=54211
2013-12-18 09:53:25 +00:00
Anders Broman e8b935ad6e Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54209
2013-12-18 06:51:09 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Pascal Quantin cebc175814 Make use of ctrl_ack_vals value_string array
svn path=/trunk/; revision=53506
2013-11-22 11:22:46 +00:00
Bill Meier fc5adb9b66 Comment out *many* unused vars found by CLANG;
Fix 2 minor bugs wherein an incorrect (NULL) tree was always used;
Remove some unneeded initializers;
Localize some variables;
Use consistent indentation & whitespace formatting
Add editor modelines.

svn path=/trunk/; revision=53497
2013-11-21 23:21:49 +00:00
Michael Mann b9e36145f4 Got burned by forgetting to compile first...
svn path=/trunk/; revision=53129
2013-11-07 03:13:53 +00:00
Michael Mann 4fb9091422 Have the gsm_rlcmac_ul and gsm_rlcmac_dl use the data parameter of the dissector function instead of pinfo->private_data to receive a RlcMacPrivateData_t structure.
This work was done in bug 7615 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615), but the tie in to use the RlcMacPrivateData_t structure (passed by the GSMTAP dissector) was never completed.  Whenever that picks up again, the data parameter of the dissector should be used instead of pinfo->private_data.

svn path=/trunk/; revision=53128
2013-11-07 02:47:22 +00:00
Bill Meier 0ad98563a2 From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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


svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Bill Meier 2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Michael Mann a72fc72061 Batch of filterable expert info.
svn path=/trunk/; revision=51689
2013-09-03 02:26:50 +00:00
Pascal Quantin 84bf0acc00 Convert a few dissectors from EMEM to WMEM API
svn path=/trunk/; revision=51597
2013-08-30 14:49:55 +00:00
Alexis La Goutte 3c0c2e2e75 Fix (-W)documentation error found by Clang
./packet-gsm_rlcmac.h:1086:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >
^~~
/**<
./packet-gsm_rlcmac.h:1089:26: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
typedef guint8 A5_bits_t;/*<A5 bits> ::= < A5/1 : bit> <A5/2 : bit> <A5/...
                         ^~~~~
                         /**<
packet-gsm_rlcmac.c:169:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global TFI IE >*/
^~~
/**<
packet-gsm_rlcmac.c:171:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Starting Frame Number Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:174:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Ack/Nack Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:178:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:183:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:191:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:195:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:197:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Channel Quality Report struct >*/
^~~
/**<
packet-gsm_rlcmac.c:210:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< EGPRS Ack/Nack Description >*/
^~~
/**<
packet-gsm_rlcmac.c:216:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P1 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:218:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P2 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:264:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< SI 13 Rest Octets >*/
^~~
/**<
packet-gsm_rlcmac.c:288:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet TBF Release message content >*/
^~~
/**<
packet-gsm_rlcmac.c:293:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Control Acknowledgement message content >*/
^~~
/**<
packet-gsm_rlcmac.c:299:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Downlink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:301:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Uplink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:305:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >*/
^~~
/**<

svn path=/trunk/; revision=51267
2013-08-10 21:29:51 +00:00
Anders Broman 6bde918078 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
Bill Meier 6549fbbad7 #if 0 unused hf[] entries & etc.
Note: All (or almost all) unused hf[] entries
       in non-generated Wireshark dissectors
       have been #if 0'd (or commented) out.
       (This applies only to 'static hf_...' vars).
      A number of (non-generated) dissector
       files with *missing* hf[] entries
       still need to be fixed.


svn path=/trunk/; revision=47459
2013-02-03 22:29:48 +00:00
Bill Meier 329f6e8cc0 Initialize some hf_... vars to -1;
(Reduces the number of checkhf false positives)

svn path=/trunk/; revision=47310
2013-01-26 21:42:36 +00:00
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Anders Broman a4e26f6600 From Mike Morrin:
fix handling of some EGPRS Coding and Puncturing Schemes.

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

svn path=/trunk/; revision=46394
2012-12-05 09:10:18 +00:00
Anders Broman 79d8f9f5f9 From Mike Morrin:
The gsm rlcmac dissector truncates the 12 bit BSNs to 8 bits when storing them.

Fix this and the handling of BSN2 is refactored to clarify the difference between BSN2 (the stored value) and BSN2_offset (the value transferred at the air interface).

svn path=/trunk/; revision=46301
2012-11-30 09:42:58 +00:00
Pascal Quantin a059014195 Fix 'value computed is not used' error
svn path=/trunk/; revision=45992
2012-11-10 20:59:38 +00:00
Pascal Quantin e4a0fe1007 Fix a few Clang dead assignment / increment warnings
svn path=/trunk/; revision=45990
2012-11-10 20:31:08 +00:00
Stig Bjørlykke 1e355c77d3 Removed double parentheses in a while
svn path=/trunk/; revision=45943
2012-11-06 08:40:40 +00:00
Pascal Quantin 4afd80511e Fix hf_me (it is a 2 bits long field, not a boolean)
svn path=/trunk/; revision=45249
2012-10-02 07:20:31 +00:00
Pascal Quantin 99e7a5b4dc From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 :
Fix minor bug in dissection of "e" bit and add value strings for remaining data block header fields

svn path=/trunk/; revision=45206
2012-09-29 08:34:00 +00:00
Pascal Quantin 12c71b2ff1 Remove a duplicate hf
svn path=/trunk/; revision=45198
2012-09-28 20:36:03 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Anders Broman 6aca10831f From Mike Morrin:
Fix pedantic compiler warnings in csn.1 dissectors.

There is some tricky casting going on in csn.1 structures.  To eliminate all
the warnings, the function pointers needed to be moved out of the object
pointer unions.  Fortunately macros (mostly) hide these changes from the
protocol dissector tables.

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

svn path=/trunk/; revision=44899
2012-09-14 14:05:50 +00:00
Pascal Quantin 3e8ac587fd Fix FBI true_false_string array and remove a useless hf variable
svn path=/trunk/; revision=44884
2012-09-12 12:29:59 +00:00
Anders Broman e97273a35d From Mike Morrin:
* fixup of dissection of message type for PRACH messages.
* fixed dissection of optional octet 2/3 in dl control messages
* removed a few more duplicate hf items
* changed all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf.
* fixed dissection of ul_tfi and dl_tfi so that assignments and usage can be
filtered more easily
* fixed missing references to existing value strings and converted to tfs
strings where possible

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

svn path=/trunk/; revision=44883
2012-09-12 12:07:53 +00:00
Pascal Quantin 7e9411fee3 Enhance dissection of PSI1
svn path=/trunk/; revision=44870
2012-09-11 07:48:49 +00:00
Martin Kaiser 1f34b32040 fix compiler errors
packet-gsm_rlcmac.c:6341: error: missing braces around initializer

packet-gsm_rlcmac.c:473: error: hf_h110qi_t_tqi defined but not used
packet-gsm_rlcmac.c:474: error: hf_packetuplinkid_tqi defined but not used
packet-gsm_rlcmac.c:477: error: hf_multiblock_allocation_number_of_radio_blocks_allocated defined but not used

svn path=/trunk/; revision=44855
2012-09-10 21:00:18 +00:00
Pascal Quantin 3f1e1285f3 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 :
Remove duplicate hf items in packet-gsm_rlcmac.c

svn path=/trunk/; revision=44854
2012-09-10 20:31:41 +00:00
Anders Broman cc6d4341e6 From Mike Morrin:
Interface based on header type rather than MCS.

passes in the header type for EGPRS packets. 
This makes sense because in a real protocol stack, the header type is encoded
in the burst stealing bits, allowing the header can be decoded, giving the CPS
IE, which then allows the data blocks to be decoded, so wireshark now follows
the same practice.

I found that there was a (previously overlooked) alignment error in decoding
the last octet of some headers due to the last "octet" having less than 8 bits,
and both the protocol stacks I have here assume that the left-hand bits are
missing (as per the figures in 44.060).  I corrected this by making a small
extension to the NULL encoding in packet-csn.[ch] to allow a NULL field to
consume more than 0 bits.

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

svn path=/trunk/; revision=44805
2012-09-07 07:43:13 +00:00
Evan Huus d936fe6cf0 Fix compile with gcc. Mostly removing unused parameters and code.
Change one tvb_get_bits8 to tvb_get_bits16 since the queried length is
9 bits long (should this be added to checkAPI somehow?)

svn path=/trunk/; revision=44742
2012-09-02 16:46:39 +00:00
Anders Broman 12e5e625a6 From Mike Morrin:
Enhancemnt to GSM RLCMAC dissection adding dissection of data block headers

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

svn path=/trunk/; revision=44741
2012-09-02 15:05:43 +00:00
Michael Mann 1741731384 remove unnecessary underscores from display filters
svn path=/trunk/; revision=44181
2012-08-01 02:59:17 +00:00
Michael Mann 175851fb40 Updated GSM dissectors display filters per checkfiltername.pl
Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.

svn path=/trunk/; revision=44162
2012-07-31 18:54:11 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Pascal Quantin 8c91a5ab0b Do not use same name for filters with incompatible types
svn path=/trunk/; revision=43446
2012-06-23 14:10:19 +00:00
Jakub Zawadzki 68ec58d385 Fix some: 'cast discards qualifiers from pointer target type' warnings
- Add const qualifier
- Remove some strange casts

svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
Martin Mathieson 51c31cd7bd Move 'static' qualifier before 'const' in a couple of places. I didn't
know it mattered, but gcc warns.

svn path=/trunk/; revision=41155
2012-02-23 11:03:30 +00:00