Commit Graph

172 Commits

Author SHA1 Message Date
Bill Meier b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Pascal Quantin 70ca52c023 3GPP: upgrade 2G/3G NAS dissector to v12.7.0 and NAS EPS dissector to v12.6.0
Change-Id: I1e5bc5d28cb956b333c302b1cb18335b59d096a8
Reviewed-on: https://code.wireshark.org/review/5621
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-04 15:26:18 +00:00
Pascal Quantin e83c7f08f7 NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
Bug: 10699
Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
Reviewed-on: https://code.wireshark.org/review/5285
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-14 11:34:09 +00:00
Pascal Quantin 47b7df8627 NAS EPS: remove a now unused hf entry and convert tabs to spaces
Change-Id: I3d5e91bd0bdb44fe033284aa38bc1f3a1dc35f4f
Reviewed-on: https://code.wireshark.org/review/3740
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-19 22:03:41 +00:00
AndersBroman 7146999963 Use dissect_e212_imsi() to dissect IMSI
Fix dissection when MCC starts in the high nibble.
Replace deprecated APIs

Change-Id: Ic08a1db9ee7ebb535bf7914191807304e9f88981
Reviewed-on: https://code.wireshark.org/review/3736
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 21:18:17 +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
Martin Mathieson ba3c0d7c4d Show EMM and ESM causes in the Info column
Change-Id: I2e3be18e997d6be0b250fbd8e664779d0d2a8228
Reviewed-on: https://code.wireshark.org/review/1666
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-16 22:17:45 +00:00
Alexis La Goutte 2b2d8a963b Fix Dereference of null pointer found by Clang analyzer
Also add modeline info and use _U_ only when it is needed (for pinfo)

Change-Id: I71349d6451e1d8304fad04781e5ee226a1a4c729
Reviewed-on: https://code.wireshark.org/review/1466
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 13:12:08 +00:00
Pascal Quantin 418c3a7f62 NAS EPS: display also detach cause in case of network initiated procedure
Change-Id: I36fef9eb8a81b03f29c812f94524f4cdf056448b
Reviewed-on: https://code.wireshark.org/review/844
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-27 12:52:20 +00:00
AndersBroman 3584a21c87 From Martin Mathiesson: Display Detach Type in info col.
Change-Id: I33692ac93f60cbabec0804f6ee7e75a9d5b9497c
Reviewed-on: https://code.wireshark.org/review/842
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 09:50:44 +00:00
Pascal Quantin dd4e5fcbdd NAS EPS: fix dissection of CS service notification message
Fixes bug 9789

Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee
Reviewed-on: https://code.wireshark.org/review/330
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-23 22:42:56 +00:00
Jakub Zawadzki 715e2d6699 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54095
2013-12-14 16:09:57 +00:00
Bill Meier 2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Pascal Quantin c8be3dcee2 Add a MBIM (Mobile Broadband Interface Model) dissector
Still to be done:
- fragmentation support
- plug the MBIM dissector on USB dissector

svn path=/trunk/; revision=52279
2013-09-29 22:50:27 +00:00
Michael Mann 346f803d42 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string

There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.

svn path=/trunk/; revision=52098
2013-09-16 10:39:06 +00:00
Pascal Quantin 69dfcffbc0 Remove obsolete code
svn path=/trunk/; revision=51743
2013-09-03 21:25:16 +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
Michael Mann ce537f6b94 Remove static packet_info *gpinfo and just use the packet_info provided by the function.
svn path=/trunk/; revision=49145
2013-05-03 14:54:39 +00:00
Pascal Quantin 238659f271 Add dissection of USAT TLV IARI, PLMN list, EPS PDN connection activation parameters and Tracking Area Identification
svn path=/trunk/; revision=48862
2013-04-15 21:52:59 +00:00
Evan Huus 37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Pascal Quantin bda771b86b Do not initialize ett_tree and msg_fcn_p when match_strval_idx_ext does not find a match
svn path=/trunk/; revision=48538
2013-03-24 21:52:19 +00:00
Anders Broman 3eb06be97d From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48425
2013-03-19 19:28:57 +00:00
Pascal Quantin 86eda54fe6 As suggested by Evan Huus, use extended value_strings
svn path=/trunk/; revision=48407
2013-03-18 22:21:53 +00:00
Pascal Quantin 94f330030d use enum values instead of hardcoded values
(as suggested by Sylvain Munaut in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8487)

svn path=/trunk/; revision=48397
2013-03-18 20:26:47 +00:00
Pascal Quantin ae61fe0158 Try to fix dissection of GSM protocol family broken by r47209.
Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks.
(I hope I got everything right...)


svn path=/trunk/; revision=47218
2013-01-22 23:25:44 +00:00
Guy Harris b8af5b44d1 #if 0 out some variables that are used only in now-#if 0'ed code.
svn path=/trunk/; revision=47040
2013-01-11 21:20:57 +00:00
Pascal Quantin 9f387eddbb Try to deduce NAS EPS Detach Request direction from message size
svn path=/trunk/; revision=47039
2013-01-11 20:54:04 +00:00
Pascal Quantin 952ccb4b83 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8168 :
Detect properly the EMM Service Request message

svn path=/trunk/; revision=46991
2013-01-07 21:37:55 +00:00
Pascal Quantin 0b20f855f0 Upgrade NAS disssectors to v11.5.0
svn path=/trunk/; revision=46842
2012-12-29 17:10:04 +00:00
Bill Meier be99fcad4d Minor cleanup:
- prefs callback not needed;
- move proto_reg_handoff...() to the end of the file as per convention;
- reformat some log lines.

svn path=/trunk/; revision=46358
2012-12-03 22:42:56 +00:00
Bill Meier 727ed68381 Fix [-Wshadow] warning for purported variable shadowing another.
svn path=/trunk/; revision=46356
2012-12-03 22:26:34 +00:00
Anders Broman 810a200141 Revert 46018. Needs rethinking.
svn path=/trunk/; revision=46028
2012-11-14 10:02:15 +00:00
Pascal Quantin 9145ad5781 Display text in subtree
svn path=/trunk/; revision=46026
2012-11-13 21:59:14 +00:00
Anders Broman 6edabe05d8 Try to fix dissection with g_nas_eps_dissect_plain == TRUE.
svn path=/trunk/; revision=46018
2012-11-13 12:54:58 +00:00
Pascal Quantin 4518ece9f9 From Umberto Corponi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7912 :
Allow dissection of ESM messages with integrity protection and EEA0 ciphering

From me:
Tighten heuristic to check for allowed EPS bearer identity values

svn path=/trunk/; revision=45789
2012-10-25 21:37:12 +00:00
Pascal Quantin 924f9663fd Enhance dissection of Open Channel proactive command
svn path=/trunk/; revision=45413
2012-10-08 22:30:47 +00:00
Pascal Quantin 88324e39bb Use a value string array for EPS Bearer Identity and remove useless de_esm_lnkd_eps_bearer_id function
svn path=/trunk/; revision=45267
2012-10-02 20:44:36 +00:00
Pascal Quantin ff3bd58b74 Upgrade NAS EPS dissector to v11.4.0 (Release 11)
svn path=/trunk/; revision=45253
2012-10-02 12:46:21 +00:00
Pascal Quantin 6dedc6628b Test Procedures messages should be also integrity protected
svn path=/trunk/; revision=45046
2012-09-21 19:58:34 +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
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Pascal Quantin 777bbfb20d Use same capitalization for Service request message as for other messages
svn path=/trunk/; revision=43761
2012-07-17 10:35:21 +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 053707aef8 Fix dissection of NAS EPS Service Request message (broken in r42200)
svn path=/trunk/; revision=43474
2012-06-25 11:12:54 +00:00
Pascal Quantin 2d5792d19b Fix typo errors
svn path=/trunk/; revision=43473
2012-06-25 10:16:15 +00:00
Pascal Quantin 41b3988bbd Fix function name (it is an Authentication failure, not an Attach failure)
svn path=/trunk/; revision=43255
2012-06-14 07:25:53 +00:00
Pascal Quantin 3c20eeb452 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7368 :
Identity request, Identity response and Authentication failure message dissection are swapped

svn path=/trunk/; revision=43253
2012-06-14 07:14:59 +00:00
pascal 0ba1ab2909 Display Element ID in hexadecimal (like in 3GPP specs)
Display EPS bearer ID in decimal

svn path=/trunk/; revision=42755
2012-05-21 19:27:38 +00:00