c8b6b76996
Thou shalt not put newlines in the strings in value_string tables.
...
That just breaks too many things.
This catches the examples of that found in bug 9878. There might be
others that my grepping didn't find.
We should also have the checkAPIs.pl script check for this, so this
isn't a full fix for bug 9878.
Change-Id: I3bf6f1fc0fe8654d0f54a995e72f1966ae012f5e
Reviewed-on: https://code.wireshark.org/review/623
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-12 22:10:53 +00:00
0e3956ddde
Remove 1 duplicate #include and several unneeded #include's.
...
Change-Id: Iab434edd114082586cc13f05b38e6a9d256a74c5
Reviewed-on: https://code.wireshark.org/review/588
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-10 13:27:38 +00:00
3003f1c791
Use tvb_length() instead of tvb_reported_length_remaining() for a heuristics length check.
...
Change-Id: I197fe3d401ffb2d5894c823690a11f4a68fb7268
Reviewed-on: https://code.wireshark.org/review/585
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-10 13:23:08 +00:00
3be07682c7
Omitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg will not get all its tags
...
Change-Id: I2ace2271d9ce5650e5239c12e64080463aae9367
Reviewed-on: https://code.wireshark.org/review/556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-08 08:56:13 +00:00
3a4b311e8b
When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM
...
Fixes bug 9829
Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8
Reviewed-on: https://code.wireshark.org/review/494
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 12:19:07 +00:00
1dff4e309d
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
...
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 19:38:21 +00:00
98e6bb18d3
asn1/kerberos: remember in what frame a key was learned
...
Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/363
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:47:10 +00:00
88c34ec6c8
Fix Called function pointer is null (null dereference) found by Clang
...
../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read
if (!prop->dissector) prop = &no_param;
Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1
Reviewed-on: https://code.wireshark.org/review/301
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-22 16:43:50 +00:00
8c608e6e82
Remove $Id$ from the ASN.1 dissectors and regenerate them.
...
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-18 03:05:28 +00:00
7a503703ac
Add some asn1 files to .gitignore.
...
(Now doing "make -C asn1" doesn't result in any untracked changes.)
Change-Id: I2971407f8227ca6f409cfb60d842d58ff2780500
Reviewed-on: https://code.wireshark.org/review/206
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-14 02:10:00 +00:00
5236d89e26
Dissector assert in packet-nbap.c. num_items isn't reset before calling a sequence filling the array.
...
Closed-bug #9726
Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2
Reviewed-on: https://code.wireshark.org/review/120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-05 16:03:54 +00:00
8f547d74dc
Upgrade RRC dissector to v11.8.0
...
Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7
Reviewed-on: https://code.wireshark.org/review/94
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-03 22:25:12 +00:00
3ba10a7051
Apply g4cc69483 to asn1 templates.
...
Change-Id: Id44ef17e7293be5d713c5e9e5d55b25194b46016
Reviewed-on: https://code.wireshark.org/review/86
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-02-03 10:05:25 +00:00
f903141d65
Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting
...
svn path=/trunk/; revision=54978
2014-01-27 12:06:46 +00:00
fbaff1f081
Add back the fix from revision 54693.
...
svn path=/trunk/; revision=54976
2014-01-27 09:55:46 +00:00
face757db3
Added back x509af_get_last_algorithm_id() removed in revision 54647 to
...
restore usage in cms and pkcs12. They never got a valid value in
actx->external.direct_reference because they use another actx in this case.
This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.
See comments in bug 9573.
svn path=/trunk/; revision=54975
2014-01-27 09:02:06 +00:00
90e6423c38
I don't see any specification of how a H221NonStandardIdentifier is
...
encoded, but let's say it's pure ASCII for now.
svn path=/trunk/; revision=54899
2014-01-22 07:33:57 +00:00
d262ff8789
Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, so
...
just treat it as ASCII.
svn path=/trunk/; revision=54896
2014-01-22 04:53:43 +00:00
9ec41e3db2
The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as
...
such.
Replace proto_tree_add_string(..., tvb_get_string_enc(same ...,
ENC_xxx)) with proto_tree_add_item(..., ENC_xxx).
svn path=/trunk/; revision=54895
2014-01-22 04:50:23 +00:00
d85bca8969
Another probably-wrong tvb_get_string().
...
Also, add a URL for the PKCS #12 spec.
svn path=/trunk/; revision=54894
2014-01-22 04:39:31 +00:00
051cb78cd9
To quote section B.5 "Keys for password integrity mode" of PKCS #12
...
v1.1: Personal Information Exchange Syntax:
http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf
"When password integrity mode is used to protect a PFX PDU, a password
and salt are used to derive a MAC key. As with password privacy mode,
the password is a Unicode string, and the salt is a byte string."
So, not having found any other references to salts as text strings, copy
it with tvb_memdup(), not tvb_get_string().
svn path=/trunk/; revision=54893
2014-01-22 04:27:15 +00:00
19930d6f49
Clean up indentation and bracketing.
...
svn path=/trunk/; revision=54892
2014-01-22 04:14:05 +00:00
c85b34ed66
The strings in question are generated as UTF-8 from the CBS encoding, so
...
process them as such.
svn path=/trunk/; revision=54891
2014-01-22 04:13:37 +00:00
e163578906
Another tvb_get_string() replacement.
...
svn path=/trunk/; revision=54890
2014-01-22 02:41:13 +00:00
c12dc67752
Strings in LDAP are generally UTF-8, although if we treat something only
...
as a string if every byte in it is a printable ASCII character, it's
ASCII. Use tvb_get_string_enc() with an appropriate encoding.
svn path=/trunk/; revision=54889
2014-01-22 02:37:45 +00:00
5e0641f271
Use tvb_get_string_enc() with an explicit encoding.
...
svn path=/trunk/; revision=54886
2014-01-22 02:04:15 +00:00
e35ca75a68
It's one character, either + or -, hence ASCII.
...
svn path=/trunk/; revision=54885
2014-01-22 01:28:31 +00:00
a75657bbd6
It's not a string, it's a byte array (bit array, really).
...
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634.
svn path=/trunk/; revision=54884
2014-01-22 01:22:01 +00:00
87f4b376f1
Fix one half-changed tvb_get_string() call.
...
svn path=/trunk/; revision=54879
2014-01-21 20:13:17 +00:00
73598a7991
IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not
...
tvb_get_string().
svn path=/trunk/; revision=54877
2014-01-21 20:08:39 +00:00
1f8d2e25d2
Update to version V12.3.0 (2013-12).
...
svn path=/trunk/; revision=54815
2014-01-15 07:13:23 +00:00
f862fc40ba
Don't cast away constness.
...
svn path=/trunk/; revision=54800
2014-01-14 18:35:36 +00:00
570a36436c
Consistently use "guint8" for "8-bit byte".
...
Constify.
For routines that manipulate sequences of 8-bit bytes, have them take
guint8 pointers rather than void pointers.
Don't cast away constness.
svn path=/trunk/; revision=54795
2014-01-14 18:03:54 +00:00
13176da15b
Don't cast away constness.
...
svn path=/trunk/; revision=54793
2014-01-14 17:47:31 +00:00
0a99ee25d5
Don't make claims of constness that can't be guaranteed in terms the C
...
compiler can verify.
svn path=/trunk/; revision=54792
2014-01-14 17:45:03 +00:00
a48b6f4aac
Upgrade LTE RRC dissector to v11.6.0
...
svn path=/trunk/; revision=54789
2014-01-14 16:51:10 +00:00
ecdc864656
Don't cast away constness.
...
svn path=/trunk/; revision=54780
2014-01-14 08:32:50 +00:00
e1b57afbc9
Don't cast away constness.
...
svn path=/trunk/; revision=54779
2014-01-14 08:30:45 +00:00
9232db14c7
But *do* cast const void * to the appropriate type.
...
svn path=/trunk/; revision=54778
2014-01-14 08:30:24 +00:00
1ec9417a43
Don't cast away constness.
...
svn path=/trunk/; revision=54777
2014-01-14 08:26:24 +00:00
6b8e8d3fea
Make a routine not used outside the SNMP dissector static.
...
svn path=/trunk/; revision=54751
2014-01-14 02:06:42 +00:00
41a13add47
Upgrade LPP dissector to v11.5.0
...
svn path=/trunk/; revision=54737
2014-01-13 22:57:31 +00:00
4a09abdf67
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
...
svn path=/trunk/; revision=54732
2014-01-13 22:25:13 +00:00
a7c8e678bf
Added a check for valid algorithm id.
...
svn path=/trunk/; revision=54653
2014-01-08 08:19:51 +00:00
92a567f20d
Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573 ). Removes valgrind warnings as well as just being Good Code.
...
svn path=/trunk/; revision=54647
2014-01-08 04:55:59 +00:00
5a3ba6c19b
Omit assignment for not used types.
...
svn path=/trunk/; revision=54614
2014-01-06 08:30:53 +00:00
0c3f422b30
Omit assignment for not used types.
...
svn path=/trunk/; revision=54596
2014-01-04 17:48:15 +00:00
3a533ccc32
Omit assignment for not used types.
...
svn path=/trunk/; revision=54593
2014-01-04 12:03:02 +00:00
c7c5e4f54e
Omit assignment for not used types.
...
svn path=/trunk/; revision=54592
2014-01-04 11:54:27 +00:00
6b58ef91d4
Omit assignment for not used types.
...
svn path=/trunk/; revision=54591
2014-01-04 11:48:40 +00:00
42e0144f08
Remove unused function and variable.
...
svn path=/trunk/; revision=54590
2014-01-04 11:40:43 +00:00
2334acec2c
Omit assignment for not used types.
...
svn path=/trunk/; revision=54589
2014-01-04 11:34:46 +00:00
4763f36a75
Omit assignment for not used types.
...
svn path=/trunk/; revision=54588
2014-01-04 11:26:30 +00:00
2b32fed0ef
Omit assignment for not used types.
...
svn path=/trunk/; revision=54587
2014-01-04 11:24:33 +00:00
72970675bd
Add the rest of the NOKIA extensions.
...
svn path=/trunk/; revision=54586
2014-01-04 10:06:04 +00:00
4f62f2cfa3
Add a few more of the NOKIA extensions.
...
svn path=/trunk/; revision=54580
2014-01-03 13:29:48 +00:00
b22d9ab940
Disabling building of the gnm dissector, I don't tink it was ever used.
...
svn path=/trunk/; revision=54561
2014-01-02 18:01:33 +00:00
3cb2c58eaf
Fix [-Wmissing-prototypes]
...
svn path=/trunk/; revision=54552
2014-01-02 11:27:10 +00:00
c228237fac
Change incorrect property 'keywords' to 'svn:keywords'
...
svn path=/trunk/; revision=54540
2014-01-01 18:08:30 +00:00
6ebc058f47
Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it.
...
Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions.
Update documentation a bit.
svn path=/trunk/; revision=54534
2014-01-01 14:33:19 +00:00
aa796df61c
Add SVN properties
...
svn path=/trunk/; revision=54511
2013-12-31 14:50:52 +00:00
43e892e985
From Dirk
...
dissector for Novell's PKIS certificate extensions
from me
clean up the $Id$ tags
remove packet-pkis(-template).h
remove ASN.1 definitions that cause compiler warnings
(OID, SecurityLabelType2)
move the dissector to the clean ASN.1 dissectors
support CMake build
change the name to novell_pkis
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9597
svn path=/trunk/; revision=54508
2013-12-31 14:20:08 +00:00
1c9b36ad46
gcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static.
...
svn path=/trunk/; revision=54502
2013-12-30 22:31:04 +00:00
58346b6327
Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory.
...
svn path=/trunk/; revision=54499
2013-12-30 22:07:38 +00:00
edb6cf0b16
Get rid of no-longer-used variables.
...
svn path=/trunk/; revision=54433
2013-12-24 01:30:00 +00:00
0d7a48a8bf
Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a
...
bit-packed string, and use it in some places.
svn path=/trunk/; revision=54428
2013-12-24 00:20:09 +00:00
5084f58ce2
We support ENC_UCS_2, so use that in proto_tree_add_item() and
...
tvb_get_string_enc() rather than using iconv to convert it to UTF-8.
svn path=/trunk/; revision=54350
2013-12-22 02:12:32 +00:00
deb2b236f2
Add missing includes
...
svn path=/trunk/; revision=54332
2013-12-21 17:23:17 +00:00
33ef0c2600
isascii(x) && isprint(x) -> g_ascii_isprint(x)
...
svn path=/trunk/; revision=54328
2013-12-21 15:12:11 +00:00
064082e68a
Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx)
...
svn path=/trunk/; revision=54314
2013-12-20 22:39:32 +00:00
90c8f5dde0
Copy Evan r54250 changes to asn/
...
Rename more to_str functions to have ep_ in the name if they return ephemeral buffers.
svn path=/trunk/; revision=54313
2013-12-20 22:32:11 +00:00
6be37815a1
Add bytestring_to_str() which takes a wmem scope and is otherwise identical to
...
bytestring_to_ep_str (now deprecated). Use the new one in a few obvious places.
Also just print directly to the buffer when loading ethernet addresses for
resolution. The straight-to-buffer bytes_to_hexstr seems useful, maybe it
shouldn't be in a private header...
svn path=/trunk/; revision=54270
2013-12-19 20:53:44 +00:00
771dc849f5
Update file forgotten in r54250
...
svn path=/trunk/; revision=54264
2013-12-19 18:58:31 +00:00
2ae8edccea
Rename more to_str functions to have ep_ in the name if they return ephemeral
...
buffers. Remove two unused functions.
svn path=/trunk/; revision=54250
2013-12-19 16:28:39 +00:00
a6415ece0a
Rename a couple of to_str functions to have ep_ in the name. This makes it
...
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).
svn path=/trunk/; revision=54249
2013-12-19 15:49:09 +00:00
317b828986
Use proto_tree_add_item() or tvb_get_string_enc() instead of
...
tvb_get_unicode_string(). If there's an indication that the encoding is
UCS-2, use that, otherwise use UTF-16. (For example, "BMP" stands for
"Basic Multilingual Plane", which is the part of Unicode that can be
encoded in 16 bits, hence UCS-2.)
In the description of the "Use Heuristics for UDP" preference for the
XML dissector, note that it's not just trying to recognize XML in UCS-2,
it's trying to recognize XML in *big-endian* UCS-2.
svn path=/trunk/; revision=54245
2013-12-19 09:19:33 +00:00
8f665d9b36
Add a sixteenth element to all BCD digit sets to avoid garbage values when
...
decoding corrupt bytes. Some of these digit sets could probably be
deduplicated...
svn path=/trunk/; revision=54224
2013-12-18 15:54:32 +00:00
e6d09c1634
Make local functions static. Include *.h when needed.
...
svn path=/trunk/; revision=54201
2013-12-17 22:07:32 +00:00
4d92f6079b
Remove not needed ';'
...
svn path=/trunk/; revision=54088
2013-12-14 11:12:20 +00:00
4b609d4c92
Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures.
...
svn path=/trunk/; revision=53965
2013-12-12 19:04:38 +00:00
a97a3152b0
Reject the packet if data is NULL. Remove _U_ where data is actually used. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures.
...
(Arguably it's the responsibility of the dissector passing this information to set the signature correctly so if there's an invalid signature, the bug is with the calling dissector and not with the one receiving the invalid signature.)
svn path=/trunk/; revision=53964
2013-12-12 18:10:08 +00:00
16f85131bd
Fix (-W)unused-const-variable error found by Clang
...
svn path=/trunk/; revision=53935
2013-12-11 13:14:00 +00:00
25ce6c262e
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53908
2013-12-10 17:41:57 +00:00
ff42551d71
comment out unused functions
...
fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9538
reported by Yaniv Kaul
svn path=/trunk/; revision=53902
2013-12-10 10:52:29 +00:00
acf2fed688
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53901
2013-12-10 06:01:16 +00:00
babc735c3a
Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT(rose_ctx_tmp) since get_rose_ctx() also checks the signature, which might be invalid even if data is not NULL.
...
svn path=/trunk/; revision=53896
2013-12-09 22:38:42 +00:00
79fa0d0a3f
Reject the packet if data is NULL without doing anything else.
...
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT().
svn path=/trunk/; revision=53895
2013-12-09 22:23:44 +00:00
b693f74b89
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53877
2013-12-09 06:50:09 +00:00
0d46cdae53
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53876
2013-12-09 06:20:42 +00:00
6e2465b94e
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53873
2013-12-08 22:11:18 +00:00
4124b7aa17
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53872
2013-12-08 22:02:12 +00:00
93398e794e
Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors
...
svn path=/trunk/; revision=53867
2013-12-08 20:03:15 +00:00
5db045212e
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53862
2013-12-08 16:50:07 +00:00
8983ae005a
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53861
2013-12-08 16:40:49 +00:00
c9884f573a
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53860
2013-12-08 15:52:29 +00:00
b630ccec17
- Forward declaration of register functions.
...
svn path=/trunk/; revision=53859
2013-12-08 15:40:10 +00:00
eb252d2d34
- Make local functions static.
...
- Forward declaration of register functions.
svn path=/trunk/; revision=53821
2013-12-07 11:37:58 +00:00
470a022c6d
Fix for dissecting cdt without having a tree.
...
svn path=/trunk/; revision=53777
2013-12-04 09:39:19 +00:00
65db82872c
When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
...
svn path=/trunk/; revision=53769
2013-12-03 22:16:49 +00:00
231e52a9ea
Reject the packet if data is NULL without doing anything else.
...
svn path=/trunk/; revision=53737
2013-12-02 21:52:46 +00:00
9b38829b34
Reject the packet if data is NULL without doing anything else.
...
svn path=/trunk/; revision=53708
2013-12-02 02:31:04 +00:00
42a64c3557
If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly.
...
svn path=/trunk/; revision=53706
2013-12-02 02:07:42 +00:00
40c6d9abcb
Copy over rev 53700 to cmake
...
svn path=/trunk/; revision=53702
2013-12-01 21:56:40 +00:00
9baa93519c
Update to V11.7.1 (2013-09)
...
svn path=/trunk/; revision=53700
2013-12-01 20:34:21 +00:00
82e2675f45
Avoid including <wiretap/wtap.h> in dissectors.
...
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00
5ac6474c94
Rename some of pint.h macros to match common style (bits number on the end).
...
pntohs -> pntoh16
pntohl -> pntoh32
pletohs -> pletoh16
pletohl -> pletoh32
phtons -> phton16
phtonl -> phton32
svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
861e0334f4
From Vineeth:
...
Support for Nokias GSM MAP Private Extensions
svn path=/trunk/; revision=53600
2013-11-26 20:29:17 +00:00
402fed459f
Fix a shadowed declaration error when compiling with gcc 4.3.2
...
svn path=/trunk/; revision=53562
2013-11-25 11:23:11 +00:00
17e16ae136
Prettify LTE Positioning Protocol dissection
...
svn path=/trunk/; revision=53561
2013-11-25 11:16:24 +00:00
db7405bb13
Dissect UE Rx - Tx time difference field
...
svn path=/trunk/; revision=53557
2013-11-24 23:09:48 +00:00
1db1b8e2bb
Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
...
of ansi_tcap code while in the neighbourhood.
svn path=/trunk/; revision=53530
2013-11-23 22:37:33 +00:00
9b7fb8a811
Create the ability to have packet scoped "proto" data. Bug 9470 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470 )
...
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do.
The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.
All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data.
svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
14ee1a5a86
Fix unused-const-variable error when build with clang 3.4
...
svn path=/trunk/; revision=53510
2013-11-22 14:52:04 +00:00
0d20064172
Fix unused-const-variable error when build with clang 3.4
...
svn path=/trunk/; revision=53509
2013-11-22 14:51:52 +00:00
ea45be32c5
Add a way to retrieve a PER variable bit string length
...
svn path=/trunk/; revision=53382
2013-11-17 13:31:32 +00:00
7221215cdc
Add "rtp handle protection" inside srtp_add_address/rtp_add_address/bluetooth_add_address so dissectors calling it don't need to find "rtp" just for the handle check.
...
svn path=/trunk/; revision=53288
2013-11-12 22:04:03 +00:00
a661864f48
Add "T.38 handle protection" inside t38_add_address() so dissectors calling it don't need to find "t38" just for the handle check.
...
svn path=/trunk/; revision=53283
2013-11-12 21:10:20 +00:00
4945174ae6
Pass "wild_card" directly to dissector instead of using private_data. "h248term" dissector is not in Wireshark source, so third-party will need to update accordingly.
...
svn path=/trunk/; revision=53241
2013-11-10 21:33:45 +00:00
ce62a3c5cc
Use ASN.1 private data instead of pinfo->private_data to exchange kerberos callback functions.
...
svn path=/trunk/; revision=53240
2013-11-10 19:58:03 +00:00
d5d8c3c359
context is not being passed to dissector, not through pinfo->private_data so check data parameter, not pinfo->private_data.
...
svn path=/trunk/; revision=53236
2013-11-10 17:17:18 +00:00
ae59b09443
Add missing includes in order to remove exceptions.h from proto.h (next commit).
...
svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
8081cf1d90
Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors.
...
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?
Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one.
svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
c9b2ee3768
include <wsutil/pint.h> only when needed.
...
svn path=/trunk/; revision=53196
2013-11-09 15:44:29 +00:00
1899903f69
Include <epan/to_str.h> only when needed.
...
svn path=/trunk/; revision=53189
2013-11-09 13:41:10 +00:00
d62f92b7f1
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data.
...
Cleanup a forgotten pinfo->private_data use in the H245 dissector.
svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
fa3332e8ed
Remove extraction of cmake parameters from autotools files.
...
While it was an interesting exercise it just doesn't
work good enough to stay, i.e. it doesn't automatically
pick up changes but requires rerunning cmake instead.
svn path=/trunk/; revision=53149
2013-11-07 21:40:31 +00:00
696194999e
From Vasil Velichkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9382 :
...
Fix dissection of GSM MAPv3 ReportSM_DeliveryStatusRes
svn path=/trunk/; revision=53148
2013-11-07 21:08:15 +00:00
5f2c75e940
Add missing cast.
...
svn path=/trunk/; revision=53096
2013-11-05 22:58:50 +00:00
b6b78d69db
In an effort to reduce the use of pinfo->private_data (and some true global variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is.
...
svn path=/trunk/; revision=53090
2013-11-05 18:47:26 +00:00
149de99d68
Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
...
svn path=/trunk/; revision=53061
2013-11-03 12:57:58 +00:00
60e3e52a53
Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
...
svn path=/trunk/; revision=53055
2013-11-03 02:45:22 +00:00
02a8391535
Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
...
svn path=/trunk/; revision=53049
2013-11-02 15:52:25 +00:00
c0fcebb07a
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.
...
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL.
svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
bd683d5ee1
Pass T.38 data to subdissectors directly instead of using pinfo->private_data.
...
svn path=/trunk/; revision=52964
2013-10-29 21:12:50 +00:00
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
66d64c686e
Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them)
...
svn path=/trunk/; revision=52946
2013-10-29 13:49:14 +00:00
c89b9a2cdc
initialize tree variables
...
svn path=/trunk/; revision=52920
2013-10-28 16:59:57 +00:00
3b91b9586f
Pass tcap_private into the dissectors that need it rather than use private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use.
...
svn path=/trunk/; revision=52916
2013-10-28 13:36:49 +00:00
09bd9ad788
Have ANSI TCAP dissector pass data through subdissector parameter instead of using struct _packet_info.
...
svn path=/trunk/; revision=52885
2013-10-27 02:00:18 +00:00
0690c4f490
More SVN properties cleanup.
...
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
3342e3bc89
Convert some emem to wmem. It took some manual flow analysis, but they are only
...
used during actual packet dissection.
svn path=/trunk/; revision=52870
2013-10-26 16:04:21 +00:00
6dd42b581a
Fix some [-Wunused-const-variable] warnings (using '#if 0')
...
svn path=/trunk/; revision=52862
2013-10-26 02:09:14 +00:00
95f484a91e
Add a very small hack to make the UAT update callback error string freeable, and
...
convert all existing UAT update callbacks to use glib memory instead of
ephemeral memory for that string.
UAT code paths are entirely distinct from packet dissection, so using ephemeral
memory was the wrong choice, because there was no guarantees about when it would
be freed.
The move away from emem still needs to be propogated deeper into the UAT code
itself at some point.
Net effect: remove another bunch of emem calls from dissectors, where replacing
with wmem would have caused assertions.
svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
b552143a5c
Put PDU dissection in protocol tree
...
svn path=/trunk/; revision=52724
2013-10-20 21:05:37 +00:00
7f3d07b9fd
From e.yimjia via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9289 :
...
Add dissection of OMA-ILP
svn path=/trunk/; revision=52721
2013-10-20 18:43:00 +00:00
d269d19f99
Fix a typo
...
svn path=/trunk/; revision=52719
2013-10-20 18:06:23 +00:00
744f47107e
H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)
...
svn path=/trunk/; revision=52659
2013-10-17 11:24:43 +00:00
938206442c
Upgrade RRLP dissector to V11.0.0
...
svn path=/trunk/; revision=52640
2013-10-16 03:06:46 +00:00
f6e09faa2d
From Ed Beroset: add modelines and fix irregular indenting;
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9273
This patch adds modelines and cleans up the irregular indentation of
this dissector's code. The only other change was in
asn1/c1222/packet-c1222-template.c to consolidate an #ifdef that had a
redundant #endif (line 812) and subsequent reopening #ifdef (line
824). The only thing between them was comments, so the span of the
original #ifdef (line 644) was simply extended by eliminating those
two lines.
The purpose for this patch is to make the file easier to edit and
understand in advance of more substantive patches later. This patch
is intended to be easy to review by having only non-substantive
changes.
svn path=/trunk/; revision=52636
2013-10-16 00:57:28 +00:00
9c4ee86784
Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
...
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.
svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
545455db1c
Fix compilation when we don't HAVE_LIBGCRYPT
...
svn path=/trunk/; revision=52527
2013-10-11 00:42:02 +00:00
f29544f9df
Add a call to tvb_ensure_bytes_exist before we allocate memory based on our
...
offset+size, prevents attempts to allocate outrageous memory, fixing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9260
svn path=/trunk/; revision=52503
2013-10-10 17:44:55 +00:00
a50dee3286
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246
...
Fix memory leaks and bad memory accesses in c1222 dissector.
From me: use realloc in a handoff function since it may get called multiple
times, and we only need the latest.
svn path=/trunk/; revision=52497
2013-10-10 16:18:49 +00:00
8a9e9de7bf
mpeg pes private data is 16 bytes long, see iso 13818-1
...
svn path=/trunk/; revision=52447
2013-10-08 11:23:22 +00:00
94f0e1fe21
Fully support relative AP-titles in C12.22. Bug 9196 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9196 )
...
From Ed Beroset
svn path=/trunk/; revision=52394
2013-10-06 02:42:14 +00:00
76e8ff1d8d
Replace the 3 dissector tables (with a single entry in each) by a direct call to the GSM SMS dissector
...
svn path=/trunk/; revision=52336
2013-10-02 18:04:06 +00:00
408ba7bade
From beroset@mindspring.com:
...
c1222 dissector has wrong tag value for BER-encoding of calling_AE_qualifier
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9193
svn path=/trunk/; revision=52225
2013-09-26 21:15:44 +00:00
019e64f58d
Upgrade RRC dissector to v11.7.0
...
svn path=/trunk/; revision=52202
2013-09-24 17:56:17 +00:00
d74564d6cf
Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message
...
svn path=/trunk/; revision=52193
2013-09-23 21:21:58 +00:00
15ba18d1df
Upgrade LPPa dissector to v11.3.0
...
svn path=/trunk/; revision=52192
2013-09-23 20:20:36 +00:00
102c452bcb
More emem -> wmem conversion:
...
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly
svn path=/trunk/; revision=52180
2013-09-22 20:04:35 +00:00
a0c53ffaa1
emem -> wmem conversion:
...
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
6df83e8078
Add _g_ to the names of functions that allocate glib memory. This is a bit more
...
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures
that take the appropriate wmem pool.
Majority of the conversion done with sed.
svn path=/trunk/; revision=52164
2013-09-21 17:04:41 +00:00
95c5f81c83
DCH-ID can be 255
...
svn path=/trunk/; revision=52154
2013-09-20 14:19:31 +00:00
ab7d8cc87d
Fix a couple of EXPORT_DEPENDS
...
svn path=/trunk/; revision=52135
2013-09-18 03:58:07 +00:00
6883f691c7
Add the dependeny handling for windows builds as well
...
svn path=/trunk/; revision=52134
2013-09-18 03:31:03 +00:00
ae8824d555
Missed 1 character replacement as part of r52132.
...
svn path=/trunk/; revision=52133
2013-09-18 02:58:14 +00:00
b9ee9fa694
Remove all non-ASCII characters from all .asn files. I didn't see the harm in replacing them all as opposed to only those not copied verbatim from other sources.
...
svn path=/trunk/; revision=52132
2013-09-18 02:48:29 +00:00
af15a51a6b
Fix remaining dependencides for -exp.cnf files.
...
svn path=/trunk/; revision=52129
2013-09-17 20:45:00 +00:00
de20bbf0ac
More dependeny updates for asn1 -exp.cnf files.
...
Only three remaining: p7, p22, x509ce - thanks to Chris Maynard for the list.
svn path=/trunk/; revision=52127
2013-09-17 19:43:37 +00:00
72f8ca4895
One of the wmem patches only updated the generated packet-snmp.c
...
but not the source. Fix that.
svn path=/trunk/; revision=52123
2013-09-17 18:54:18 +00:00
fb834104e5
When building packet-dap.c on an empty build tree, packet-dap.c would
...
be incorrect on the first pass and only be correct when remade.
The reason was that disp-exp.cnf was created incorrectly on first pass.
disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism
to add dependencies for export files.
Note: Only the cmake change has been tested, the autofoo stuff requires
testing.
svn path=/trunk/; revision=52120
2013-09-17 18:02:25 +00:00
a2e86de160
Fix dependency problems (continuation of r52110 and r52112).
...
svn path=/trunk/; revision=52118
2013-09-17 14:45:52 +00:00
af96c7bb45
Fix a difference to Makefile.common
...
svn path=/trunk/; revision=52117
2013-09-17 05:53:02 +00:00
686dd9b061
Copy over rev 52110 to cmake
...
svn path=/trunk/; revision=52112
2013-09-16 21:45:46 +00:00
e14b587293
Fix dependency problem reported by Joerg Mayer on wireshark-dev.
...
Ref: http://www.wireshark.org/lists/wireshark-dev/201309/msg00151.html
svn path=/trunk/; revision=52110
2013-09-16 21:35:27 +00:00
886332e74f
Whitespace changes
...
svn path=/trunk/; revision=52109
2013-09-16 21:35:19 +00:00
7d6899b96b
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9155 :
...
Ensure that codec_str string is always initialized
svn path=/trunk/; revision=52107
2013-09-16 21:26:03 +00:00
c5ffff76d8
Fix checkapi warnings (missing id)
...
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.
svn path=/trunk/; revision=52062
2013-09-15 15:00:03 +00:00
65ff43fada
Finish asn1 emem -> wmem conversion.
...
Left are snmp and those functions that don't have wmem equivalents.
svn path=/trunk/; revision=52060
2013-09-15 14:37:46 +00:00
c65459c729
emem -> wmem (don't forget about .cnf)
...
svn path=/trunk/; revision=52058
2013-09-15 14:33:38 +00:00
888650324b
emem -> wmem
...
svn path=/trunk/; revision=52054
2013-09-15 13:24:14 +00:00
868b345eea
Convert a few more dissectors to wmem API
...
svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
fd50ee16e8
dissect OCSP nonce extension
...
some minor reformatting of the ASN.1 imports
svn path=/trunk/; revision=51987
2013-09-12 21:29:50 +00:00
efe18f199c
Convert a few dissectors from emem to wmem API
...
svn path=/trunk/; revision=51983
2013-09-12 20:37:30 +00:00
0c11b6f8da
Give various files RCS IDs.
...
svn path=/trunk/; revision=51963
2013-09-12 03:41:22 +00:00
0c41507bad
Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list.
...
svn path=/trunk/; revision=51904
2013-09-09 21:55:57 +00:00
9e3f9b449f
expert_add_info_format_text -> expert_add_info_format
...
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
00dd0adc0d
expert_add_info_format_text -> expert_add_info_format
...
svn path=/trunk/; revision=51851
2013-09-09 00:28:48 +00:00
f54441c125
Add a chunk forgotten in r51846
...
svn path=/trunk/; revision=51847
2013-09-08 21:22:11 +00:00
a6ae13dee9
Slightly different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 :
...
Check that tvb returned by dissect_per_bit_string is not null before trying to use it
svn path=/trunk/; revision=51846
2013-09-08 21:10:36 +00:00
57c28aeffd
Fix the FSF address in the license header for the new ASN.1 dissectors.
...
svn path=/trunk/; revision=51830
2013-09-07 22:12:24 +00:00
52c9e57474
Deduplicate some type and field names.
...
svn path=/trunk/; revision=51800
2013-09-06 17:39:03 +00:00
96d29a5d50
Get rid of a duplicated filter name.
...
svn path=/trunk/; revision=51792
2013-09-05 20:55:59 +00:00
8552f0df64
The length field is retrieved from the packet in bytes, not bits, so stop
...
adjusting it by 8 everywhere.
Seems to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9087 though
someone more familiar with the protocol will have to verify it's actually
correct now.
svn path=/trunk/; revision=51784
2013-09-05 13:15:04 +00:00
3b6f55c579
Convert atn-* dissectors to wmem. No emem in new code please!
...
svn path=/trunk/; revision=51780
2013-09-05 12:13:00 +00:00
39bff3218a
Missed 50% of the updates in last commit
...
svn path=/trunk/; revision=51773
2013-09-05 07:33:05 +00:00
d4f2865595
CMakeLists was no longer in sync with Makefile.common
...
svn path=/trunk/; revision=51772
2013-09-05 07:28:47 +00:00
022706764b
Add missing CMakeLists.txt files
...
svn path=/trunk/; revision=51771
2013-09-05 06:05:15 +00:00
02a61b07e4
Fix cmake syntax - so now it "only" warns about missing
...
CMakeLists.txt in the subdirectories.
svn path=/trunk/; revision=51770
2013-09-05 05:48:22 +00:00
Guy Harris