Commit Graph

44907 Commits

Author SHA1 Message Date
Anders Broman c45252a75f SDP in 183 session progress is also SDP_EXCHANGE_ANSWER_ACCEPT.
Without this patch I get a crash on Linux and lots of
STATUS_ACCESS_VIOLATION and a single STATUS_INTEGER_DIVIDE_BY_ZERO on windows.

svn path=/trunk/; revision=47639
2013-02-12 14:58:02 +00:00
Anders Broman ed5045605a SDP in 180 ringing is also SDP_EXCHANGE_ANSWER_ACCEPT.
Without this patch I get a crash on Linux and lots of
STATUS_ACCESS_VIOLATION and a single STATUS_INTEGER_DIVIDE_BY_ZERO on windows.

svn path=/trunk/; revision=47638
2013-02-12 14:27:06 +00:00
Anders Broman a3ef2a7293 Fix bit_offset.
svn path=/trunk/; revision=47637
2013-02-11 17:39:52 +00:00
Anders Broman 3139b2acf2 Add application ID:s
svn path=/trunk/; revision=47636
2013-02-11 17:38:16 +00:00
Anders Broman 755ccf4162 {..., NULL} is required as the last XXX_string array entry: value_string q763_generic_notification_indicator_vals[]
svn path=/trunk/; revision=47635
2013-02-11 15:56:02 +00:00
Anders Broman 76557a21f9 From: Michal Labedzki:
[PATCH 5/6] Bluetooth: BNEP: Remove unneeded code and do some style
 changes

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

svn path=/trunk/; revision=47634
2013-02-11 15:23:51 +00:00
Anders Broman 4056b11883 From: Michal Labedzki:
Subject: [PATCH 3/6] Bluetooth: Add modeline to hci_usb
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=47633
2013-02-11 15:18:26 +00:00
Anders Broman 4dc754f454 From: Michal Labedzki:
Bluetooth: Improve support of MAP, PBAP, BPP and BIP in OBEX

Add support for recognize profiles using OBEX (by "Target"), then add
all Application Parameters specific for MAP, PBAP, BPP, BIP.
Also fix one FIXME, so now dissecting by OBEX does not cause malformed
frames while jumping over dissected packets.

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

svn path=/trunk/; revision=47632
2013-02-11 15:04:53 +00:00
Bill Meier 07d2692cad Fixes/Updates:
- Call conversation_set_dissector();
- Fix encoding args related to use of FT_ABSOLUTE_TIME;
- Remove unneeded #include;
- Cleanup some whitespace.

svn path=/trunk/; revision=47631
2013-02-11 14:59:03 +00:00
Anders Broman 8f96a14263 Dissection of Q.763 ISUP Generic Notification.
based on bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8311

svn path=/trunk/; revision=47630
2013-02-11 14:50:50 +00:00
Evan Huus 8fd4797a08 Add an if (tree) check to prevent a very-long-but-not-infinite loop,
since without a tree the proto_tree_add_item calls won't throw an exception
when we run past the end of our TVB which means we could end up doing MAX_INT64
iterations.

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

svn path=/trunk/; revision=47629
2013-02-11 13:23:05 +00:00
Guy Harris 569aebade2 strlen() returns a size_t, so assign its return value to a size_t.
gtk_selection_data_set() takes an int, rather than a size_t, as its last
argument, so cast away that bit of "ZOMG ARENT SIZE_T AND INT THE SAME
SIZE!!!!!!!111ONE!!!!!"

svn path=/trunk/; revision=47628
2013-02-11 06:57:58 +00:00
Guy Harris 8f93b07ff9 Set line endings to "native".
svn path=/trunk/; revision=47627
2013-02-11 02:42:41 +00:00
Bill Meier 1e6e56c631 Fix two bugs in the example code that I revised.
svn path=/trunk/; revision=47626
2013-02-11 01:31:49 +00:00
Bill Meier 1cb08ae444 Remove a _U_ which I should not have used.
svn path=/trunk/; revision=47625
2013-02-11 01:27:04 +00:00
Chris Maynard eac3307abd Nope. Try again with explicit keywords.
svn path=/trunk/; revision=47624
2013-02-11 01:06:00 +00:00
Chris Maynard 8b65d2759e Well, that didn't work (keyword substitution, that is). Try now.
svn path=/trunk/; revision=47623
2013-02-11 01:02:38 +00:00
Chris Maynard b13e7f2000 Fix a couple of typos. Set svn properties.
svn path=/trunk/; revision=47622
2013-02-11 00:50:05 +00:00
Bill Meier 32834b7881 Update: Primarily to suggest calling conversation_set_dissector()
once a packet has been identified as being part of
        a particular protocol.

svn path=/trunk/; revision=47621
2013-02-11 00:12:59 +00:00
Evan Huus 2f156d0edc From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8309
Restore an else clause that appears to have been accidentally removed in r44542
which was causing TCP reassembly for SMB2 messages to fail.

svn path=/trunk/; revision=47620
2013-02-10 22:28:15 +00:00
Gerald Combs f8002de6a4 If we're using git, try pulling the SVN revision out of the commit body.
svn path=/trunk/; revision=47619
2013-02-10 22:20:31 +00:00
Guy Harris eb769ce13e Clean up some warnings (including warnings that ultimately come from
trying to modify string constants, which isn't necessarily guaranteed to
work).

svn path=/trunk/; revision=47618
2013-02-10 22:09:21 +00:00
Bill Meier f784806968 Comment out numerous unused hf_.... instances found by checkhf.
svn path=/trunk/; revision=47617
2013-02-10 20:52:21 +00:00
Guy Harris 0a20c5dd91 Add %option noinput to some Flex files, as we aren't using the input()
routine and thus don't need to have it generated - and as it produces
warnings of a routine defined but not used, we don't want to have it
generated.

svn path=/trunk/; revision=47616
2013-02-10 20:21:05 +00:00
Gerald Combs a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Bill Meier af28be3598 Fix a (benign) ERROR: NO ARRAY: opcua/opcua.c, hf_opcua_reassembled_data
svn path=/trunk/; revision=47614
2013-02-10 19:30:37 +00:00
Guy Harris ebacca89a7 Add %option noinput to a bunch of Flex files, as we aren't using the
input() routine and thus don't need to have it generated - and as it
produces warnings of a routine defined but not used, we don't want to
have it generated.

Squelch a casting-const-away warning.

svn path=/trunk/; revision=47613
2013-02-10 19:13:07 +00:00
Bill Meier 19ffe7eb4c Update a comment; tweak a RegEx.
svn path=/trunk/; revision=47612
2013-02-10 18:40:54 +00:00
Bill Meier 3f70cb4406 Add an "Unregistered hf!" hint to DISSECTOR_ASSERT((guint)hfindex < gpa_hfinfo.len).
svn path=/trunk/; revision=47611
2013-02-10 18:38:46 +00:00
Evan Huus ffa42bbdd8 Add svn properties and modelines.
svn path=/trunk/; revision=47608
2013-02-10 16:52:52 +00:00
Bill Meier c2b97dd845 Comment out various unused hf_... instances found by checkhf.
svn path=/trunk/; revision=47607
2013-02-10 16:31:52 +00:00
Michael Mann 27cf61e0a9 Add Bitcoin dissector
From Christian Svensson, bug 6000 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6000)

Cleaned up from the original patch

svn path=/trunk/; revision=47606
2013-02-10 16:23:11 +00:00
Bill Meier 9276c4340b Fix ERROR: NO ARRAY: packet-tlv.c, hf_docsis_rcv_mod_enc_ctr_freq_asgn
##Backport 1.6, 1.8


svn path=/trunk/; revision=47605
2013-02-10 16:18:18 +00:00
Gerald Combs 6da5bbbe9e [Automatic manuf, services and enterprise-numbers update for 2013-02-10]
svn path=/trunk/; revision=47602
2013-02-10 15:03:25 +00:00
Michael Mann 4da35cc956 Add support for IGNORE message type to SSH2 dissector + some minor cleanup
I was hoping this would fix bug 5064 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5064), but all it did was fix the malformed part of the dissector.

svn path=/trunk/; revision=47601
2013-02-10 02:27:08 +00:00
Guy Harris c225aafb8c Pull in a comment from the MATE plugin Makefile.nmake.
Pull in a change from that Makefile.nmake to keep us from trying to hand
a header file to the compiler as if it were a C source file.

svn path=/trunk/; revision=47600
2013-02-09 23:41:43 +00:00
Guy Harris a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Bill Meier 233fcd672f Remove blank lines separately after removing comments rather than as
part of the 'remove comments' regex.

Fixes a bug introduced in SVN #47583 which broke '#if 0' handling.


svn path=/trunk/; revision=47598
2013-02-09 22:14:13 +00:00
Guy Harris eca5bd1c65 We *did* fix the APIs used.
svn path=/trunk/; revision=47597
2013-02-09 20:21:37 +00:00
Guy Harris 4824a391e8 Pull the definition of NODIST_HEADER_FILES up into
plugins/Makefile.common.inc.

svn path=/trunk/; revision=47596
2013-02-09 20:15:18 +00:00
Gerald Combs 0eb047bcef Fix EXTRA_BINFILES for CMake + OS X.
svn path=/trunk/; revision=47595
2013-02-09 19:56:03 +00:00
Guy Harris 19aa5dbe46 "make maintainer-clean" should nuke all generated files.
svn path=/trunk/; revision=47594
2013-02-09 19:32:31 +00:00
Guy Harris c8af93ea2d Get rid of trailing tabs, make comments more similar.
svn path=/trunk/; revision=47593
2013-02-09 19:30:18 +00:00
Guy Harris ccadade242 Define GENERATED_HEADER_FILES in plugins/Makefile.common.inc.
svn path=/trunk/; revision=47592
2013-02-09 19:20:13 +00:00
Guy Harris 9c4e108387 plugins/Makefile.common.inc defines NODIST_SRC_FILES, and
plugins/mate/Makefile.common includes it, so there's no need to define
it in plugins/mate/Makefile.common.

svn path=/trunk/; revision=47591
2013-02-09 19:15:24 +00:00
Guy Harris df33477429 Define FLEX_GENERATED_SRC_FILES and LEMON_GENERATED_SRC_FILES in
plugins/Makefile.common.inc, and use it in plugins/mate/Makefile.nmake.

svn path=/trunk/; revision=47590
2013-02-09 19:11:14 +00:00
Guy Harris fa596409e0 plugins/Makefile.common.inc should already be defining
GENERATED_SRC_FILES, and plugins/mate/Makefile.common includes it, so it
shouldn't need to define GENERATED_SRC_FILES itself.

svn path=/trunk/; revision=47589
2013-02-09 18:54:27 +00:00
Guy Harris 518e27bc00 The type of the second argument to g_snprintf() is gulong. (It *should*
have been size_t, just as with Boring Old Snprintf; what were they
thinking?)

svn path=/trunk/; revision=47588
2013-02-09 18:41:06 +00:00
Anders Broman 4e4cf2b9a5 Add casts to make it build on win64.
svn path=/trunk/; revision=47587
2013-02-09 17:08:41 +00:00
Anders Broman 3f00e454a5 Try to fix the makefiles to be able to build mate after distclean.
svn path=/trunk/; revision=47586
2013-02-09 16:34:51 +00:00