Commit Graph

66 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 3815b14a07 E212: fix bytes highlighting when dissecting the high nibble variant
Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff
Reviewed-on: https://code.wireshark.org/review/5362
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-17 10:16:51 +00:00
Bill Meier 10406870f5 Add editor modelines; fix indentation as needed.
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263
Reviewed-on: https://code.wireshark.org/review/4363
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29 13:47:02 +00:00
Pascal Quantin 41764ec24b E.212: update list to Operational Bulletin No. 1058 (15.VIII.2014)
Change-Id: I79d12c4699df01f3435fae5342aa5ec295316959
Reviewed-on: https://code.wireshark.org/review/3874
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-08-27 14:39:41 +00:00
Jeff Morriss b9a94f009e Add a routine to dissect an UTF8-encoded IMSI (as you'd find in Diameter) and use it to decode the User-Name AVP of S6a/S6d messages.
Also clean up some white space/formatting.

Change-Id: Idf2d4cad2af1826b24de7d59407ffeb36100c19b
Reviewed-on: https://code.wireshark.org/review/3742
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 02:55:09 +00:00
Jeff Morriss 9d7784dfeb Get it compiling again.
Remove set-but-not-used variable.
Mark a parameter as unused.

Change-Id: I7c3af353da2967e5d611deb2cb027a9e30e54bdf
Reviewed-on: https://code.wireshark.org/review/3741
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 02:01:16 +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
AndersBroman d7e4564321 Use dissect_e212_imsi() to dissect IMSI
fix offset in dissect_e212_mcc_mnc_in_address().

Change-Id: I68006ea3e2c79e2549e6f2d2c8a997e44fc3cdf1
Reviewed-on: https://code.wireshark.org/review/3722
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 15:47:24 +00:00
AndersBroman 50413192e3 Use the E212 function to dissect IMSI correct the filter Id string in
E212.

Change-Id: I203502b39d4ef216282d305f90c930aca84241bf
Reviewed-on: https://code.wireshark.org/review/3718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 13:46:00 +00:00
AndersBroman 1cdef1d98a Implement a common function to dissect IMSI and use it GSM MAP as a start.
- remove soft deprecated APIs and unused hf.

Change-Id: Id00c3dd35f3fc65f543bc29df6d35515c45fe7e1
Reviewed-on: https://code.wireshark.org/review/3715
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 12:27:29 +00:00
Pascal Quantin ef8a0a2ce1 Update E.212 list to Operational Bulletin No. 1047 (1.III.2014)
Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235
Reviewed-on: https://code.wireshark.org/review/1081
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-12 17:24:11 +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
Pascal Quantin 3490faec34 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9286 :
PLMN 440 20 is now used by SoftBank.
While we are at it, update the E.212 list to the latest operational bulletin no. 1041.

svn path=/trunk/; revision=54496
2013-12-30 12:26:03 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Evan Huus 7cc5d870ee Remove non-ASCII characters causing checkAPI failures
svn path=/trunk/; revision=52703
2013-10-20 02:38:51 +00:00
Pascal Quantin f6e6660a19 Update E.212 list to Operational Bulletin No. 1038 (15.X.2013)
svn path=/trunk/; revision=52687
2013-10-19 14:10:05 +00:00
Pascal Quantin 514b38fbdd Make it more obvious that the function is using wmem memory
svn path=/trunk/; revision=52162
2013-09-21 11:08:35 +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 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 7e8e5b347e Batch of filterable expert_infos.
svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
Pascal Quantin 435fe919d8 Fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8569 :
Do not display a warning when MCC/MNC is set to 0xffffff and identify country / network code as 'Unset'

svn path=/trunk/; revision=48793
2013-04-08 20:25:09 +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 73ef143f95 Update ITU-T E.212 to bulletin 1019 (01.I.2013)
svn path=/trunk/; revision=47720
2013-02-17 21:48:18 +00:00
Bill Meier c439b805e2 Comment out unused hf[] entries & etc.
(found by checkhf)

svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +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
Bill Meier c591c6dd56 Comment out all but first value_string array entries with dup values:
kept: first dup since that's the one which would
       be found with a linear search.

svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
Martin Mathieson 053c3e7e24 Correct a number in a value_string.
Spotted in a profile that match_strval_ext() was calling
match_strval_linear() a lot (this value_string has 1476 entries - it was
epensive!).

Found error by adding temp debug to _match_strval_ext_init() - do we
ever expect the entries not to be in order?  Am wondering if the warning
should be committed.

svn path=/trunk/; revision=44576
2012-08-19 02:27:13 +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
Bill Meier 81d3b58f02 Whitespace cleanup: Convert 4 space tabs to spaces ...
svn path=/trunk/; revision=41139
2012-02-22 15:47:30 +00:00
Alexis La Goutte 0625d95778 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40906
2012-02-06 22:16:52 +00:00
Guy Harris abb8c5ef08 Fix typo.
svn path=/trunk/; revision=40707
2012-01-24 20:49:52 +00:00
Jeff Morriss e537085847 Get rid of a non-ASCII char
svn path=/trunk/; revision=40706
2012-01-24 20:44:49 +00:00
Anders Broman 5e00d09f64 Upate a few more entries and add links to where the information can be found.
svn path=/trunk/; revision=40701
2012-01-24 19:17:44 +00:00
Alexis La Goutte 73cefbad15 Add Free Mobile (Iliad) Mobile Network Code (the French Mobile Revolution...)
http://www.arcep.fr/uploads/tx_gsavis/10-0264.pdf

svn path=/trunk/; revision=40692
2012-01-24 13:30:20 +00:00
Alexis La Goutte 4ebdb40338 Fix -v for QtShark
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c 
the function is common to GTK and Qt need to put in version_info.[ch] ?

svn path=/trunk/; revision=40691
2012-01-24 13:08:07 +00:00
Jaap Keuter 4ac0559b63 From Grzegorz Szczytowski:
Update of packet-e212.c dissector according to local national regulatory 
MNC assignment document.
www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439

svn path=/trunk/; revision=35889
2011-02-09 08:46:21 +00:00
Anders Broman 022b418e40 Introduce dissect_e212_mcc_mnc_ep_str()
Which can be useful to make nice lables like:
+ Serving Network : MCC 311 United States of America, MNC 28

svn path=/trunk/; revision=35360
2011-01-04 16:58:07 +00:00
Anders Broman da383952df "Fill" value_strings.
svn path=/trunk/; revision=34935
2010-11-17 21:58:35 +00:00
Bill Meier 05168e614f Access several large value-string arrays via extended value-string functions.
svn path=/trunk/; revision=34501
2010-10-13 18:51:23 +00:00
Bill Meier e7568712ef Define some fcns & vars as static;
Minor whitespace and comments cleanup.

svn path=/trunk/; revision=34477
2010-10-11 19:00:55 +00:00
Gerasimos Dimitriadis 6f6fb2fd80 MNC, SANC, ISPC lists updated up to OB 960
svn path=/trunk/; revision=33963
2010-08-27 21:09:05 +00:00
Gerasimos Dimitriadis 6ebc2acff4 Updates due to ITU Operational Bulletins 956 and 957
svn path=/trunk/; revision=33833
2010-08-17 22:48:39 +00:00
Gerasimos Dimitriadis 728f1c516c MNC, SANC and ISPC lists updated up to the latest OB, No 955
svn path=/trunk/; revision=32813
2010-05-14 21:12:48 +00:00
Gerasimos Dimitriadis a2e05a5442 Update MCC/MNC list; remove double appearance of the same value
in the MCC list.

svn path=/trunk/; revision=32508
2010-04-18 19:34:57 +00:00
Gerasimos Dimitriadis 7eb0269c54 Add another MCC for India
svn path=/trunk/; revision=32297
2010-03-26 21:19:19 +00:00
Gerasimos Dimitriadis 8c1b0a8500 Update MNC list with all amendments up to No. 17 (ITU
Operational Bulletin 951)

svn path=/trunk/; revision=32291
2010-03-25 22:52:55 +00:00
Gerasimos Dimitriadis 4fd14a25ff Incorporate changes to the MNC list as mandated from Amendments 1-3
to the 'Annex to ITU Operational Bulletin No. 935'

svn path=/trunk/; revision=32275
2010-03-24 21:23:37 +00:00
Gerasimos Dimitriadis a16a5e89c6 Triggered by a comment from Mark Wallis:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4588#c6
2 and 3 digits long MNCs with the same arithmetic value (e.g.
21 and 021) are possible under the same MCC, yet in the
mcc_mnc_codes they would get mapped to the same entry. To 
avoid this aliasing, the encoding of the MCC/MNC pair into a
single arithmetic value in the mcc_mnc_codes list is changed.

svn path=/trunk/; revision=32274
2010-03-24 20:31:11 +00:00
Gerasimos Dimitriadis eaba9a1147 Include the leading zeroes when decoding the MNC
svn path=/trunk/; revision=32265
2010-03-22 18:06:03 +00:00
Gerasimos Dimitriadis dfde72f247 Fix for Bug 4588:
RANAP and friends want the MNC encoded in big endian form.

svn path=/trunk/; revision=32257
2010-03-20 23:53:22 +00:00