Commit Graph

14205 Commits

Author SHA1 Message Date
Guy Harris d5bad28951 Use "pcap_get_selectable_fd()" if we have it, and if it returns -1,
don't do a "select()".

svn path=/trunk/; revision=14358
2005-05-12 03:31:33 +00:00
Guy Harris 33db7e6fcb Don't include <pcap.h> twice.
svn path=/trunk/; revision=14357
2005-05-12 03:29:59 +00:00
Guy Harris bcc201cd88 If we have libpcap, include <pcap.h>, because "capture.h" requires it.
If we *don't* have libpcap, don't include "capture.h", and don't test
whether a capture is in progress.

Clean up a message.

svn path=/trunk/; revision=14356
2005-05-12 03:29:26 +00:00
Guy Harris 38c139dce3 Squelch a compiler warning (GCC 4.0's data flow analysis is
interprocedural, so it knows "sip_parse_line()" doesn't always set
"*token_1_len", but it doesn't know that if it doesn't return OTHER_LINE
it *does* always set it, so it's safe not to set it as long as it's
never used if the return value is OTHER_LINE).

svn path=/trunk/; revision=14355
2005-05-12 02:55:59 +00:00
Guy Harris bd29cb1267 Fix a routine to return the value it's supposed to return.
svn path=/trunk/; revision=14354
2005-05-12 02:51:59 +00:00
Guy Harris 3a8d46d8e9 Always set "*success" in "ipxnet_addr_lookup()" before returning (thanks
and a tip of the hat to GCC 4.0's interprocedural data flow analysis for
catching this one!).

svn path=/trunk/; revision=14353
2005-05-12 02:50:27 +00:00
Anders Broman 92b1092937 Reinsert Gerards patch (r14342) which was lost.
svn path=/trunk/; revision=14352
2005-05-11 22:20:11 +00:00
Anders Broman d87981ccb6 Reinsert Gerards patch (r14342) which was lost.
svn path=/trunk/; revision=14351
2005-05-11 22:19:36 +00:00
Anders Broman eac5e05d3a pinfo->p2p_dir not set in the new gsm_map dissector causing problems with dissection of SMS messages.
svn path=/trunk/; revision=14350
2005-05-11 22:00:50 +00:00
Anders Broman 0232c81b91 From Viorel Suman:
Enable a proper deconding of an alphanumeric 7-bit encoded SMS TP-Originating-Address.

svn path=/trunk/; revision=14349
2005-05-11 21:59:44 +00:00
Anders Broman 00bd7965b2 pinfo->p2p_dir not set in the new gsm_map dissector causing problems with dissection of SMS messages.
svn path=/trunk/; revision=14348
2005-05-11 21:46:16 +00:00
Ronnie Sahlberg 9ad2f9d11c avoid a div-by-0
svn path=/trunk/; revision=14347
2005-05-11 12:37:20 +00:00
Ronnie Sahlberg 4e3c7cc716 From Hannes Gredler
support for Juniper PPPOE encapsulation


svn path=/trunk/; revision=14346
2005-05-11 11:24:17 +00:00
Ronnie Sahlberg fcab322ada Some applications do very naughty things like reusing a port for a different protocol during different stages of an application cycle.
This is very naughty and will cause problems when we have assigned a dissector to a dynamic port using conversation_set_dissector().


To make ethereal handle this case I have changed the try_conversation_dissector() to allow it to fail and return 0,   meaning   yes there is indeed a protocol registered for this conversation but that protocol rejected this packet.
(which only happens for "new" style dissectors, "old" style dissectors will never reject a packet that way)

When this happens  the decode_udp_port() helper will still allow other dissectors to be tried, in the hope that the conversation is now used for some other protocol and thus someone else might be able to decode the packet.


Update SNMP and TFTP dissectors to  check that even if there already is a conversation but that conversation does NOT have snmp/tftp registered as the dissector for it, then create a new conversation anyway and attach the proper dissector.

Since ethereal keeps track of which frame number a conversation started in, this actually works really well.



svn path=/trunk/; revision=14345
2005-05-11 10:40:53 +00:00
Gerald Combs e3e4f52245 Don't write a '\0' way the heck past the end of an array. Fixes bug 164.
Add a comment asking if we shouldn't use oid_to_str() instead of our own
routine.

svn path=/trunk/; revision=14344
2005-05-10 23:45:39 +00:00
Luis Ontanon 5535853bf2 - export Audio Codec modes from isup/bicc
- detailed dissection of GSM/UMTS speech code list ETSI 126 103 (3gpp 26.103 v3.0.0)
- use it for H.248


svn path=/trunk/; revision=14343
2005-05-10 21:54:37 +00:00
Anders Broman 88c39bc93b Fix dissection of mo-forwardSM
svn path=/trunk/; revision=14342
2005-05-10 20:09:09 +00:00
Anders Broman 01adac2ffe Fix dissection of mt-forwardSM.
svn path=/trunk/; revision=14341
2005-05-10 20:06:04 +00:00
Anders Broman b782032c1e fix some field rename errors turned up by the latest asn2eth compiler.
svn path=/trunk/; revision=14340
2005-05-10 20:02:14 +00:00
Ronnie Sahlberg 39e517a9b3 make SNMP over UDP a new style dissector and add some heuristics to check if this is SNMP or not,
svn path=/trunk/; revision=14339
2005-05-10 08:49:27 +00:00
Gerald Combs c64e5e59f6 Make a field type check more strict. Remove some unnecessary code.
svn path=/trunk/; revision=14338
2005-05-10 03:10:09 +00:00
Gerald Combs cd321f5958 Make sure we don't feed a null string to strncmp(). Fixes bug 161.
Make sure we don't free static memory.  Fix a small memory leak.

svn path=/trunk/; revision=14337
2005-05-10 03:08:36 +00:00
Jörg Mayer 78d0e8b33d I just found a packet with an option e. As the value looked very much
like the mac-address of the switch, I added decoding of option e as
mac address.


svn path=/trunk/; revision=14336
2005-05-09 11:21:16 +00:00
Lars Roland 9a47db0c3d Add another sanity check to the new SIP URI parser.
Just to be sure.

svn path=/trunk/; revision=14335
2005-05-09 01:21:41 +00:00
Lars Roland 74328742ed Some fixes for the new SIP contact header parser.
svn path=/trunk/; revision=14334
2005-05-09 01:15:45 +00:00
Lars Roland 20901fcedf only lower-case ASCII letters, numbers,
underscores, and dots are allowed in the
preference name. 

Fix it the camel dissector.

svn path=/trunk/; revision=14333
2005-05-09 00:11:03 +00:00
Lars Roland 5f092fe201 Mark a function parameter as unused
svn path=/trunk/; revision=14332
2005-05-08 23:29:55 +00:00
Lars Roland 01f10ccd00 When saying that I remove the trailing white spaces I should do it, too.
So I do it now and do some more reindentation, too.

svn path=/trunk/; revision=14331
2005-05-08 22:39:38 +00:00
Lars Roland e5134e2f2d Improve dissection of SIP contact header and counting of bindings in REGISTER messages.
Introduce a function for disseting a sip uri in general

TODO: 
- add dissection of contact and uri parameters
- simplify the ugly code for dissecting "to" and "from" headers
      by using the new function for uri dissection

svn path=/trunk/; revision=14330
2005-05-08 22:19:18 +00:00
Lars Roland 429d72c457 Reindent dissect_sip_common() and remove trailing white spaces from packet-sip.c.
svn path=/trunk/; revision=14329
2005-05-08 21:17:37 +00:00
Anders Broman fd075dadf0 From Javier Acuna:
Added some code to dissect DateAndTime.

svn path=/trunk/; revision=14328
2005-05-08 20:35:44 +00:00
Anders Broman 513b781676 From Javier Acuna:
Added some code to dissect DateAndTime.

svn path=/trunk/; revision=14327
2005-05-08 20:34:57 +00:00
Ulf Lamping 8087f8ccb7 add icons for the "File Set" menu items
svn path=/trunk/; revision=14326
2005-05-07 20:47:39 +00:00
Lars Roland 52d26f6eb8 Increase size of an integer to prevent an integer overflow
Fixes Bug 162

svn path=/trunk/; revision=14325
2005-05-07 00:14:11 +00:00
Ronnie Sahlberg a456014e29 prettify YPSERV
svn path=/trunk/; revision=14324
2005-05-06 10:11:08 +00:00
Gilbert Ramirez 61e5a33ea2 A fix for the previous fix for the infinite loop in bootp, bug #160.
svn path=/trunk/; revision=14323
2005-05-06 02:08:30 +00:00
Gilbert Ramirez 01a3ed9c58 Check the offset delta while we loop through the options.
Make sure the delta is > 0.
This intends to fix bug 160, although with a capture file
to test it, I can't be totally sure.

svn path=/trunk/; revision=14322
2005-05-06 01:56:40 +00:00
Jörg Mayer b6db235c77 Change 802.11f -> F, 802.1d -> D, 802.1x -> X, 802.1q -Q, 802.1P -> p
svn path=/trunk/; revision=14321
2005-05-05 17:07:58 +00:00
Ulf Lamping 5049fe87b6 add GetWindowsVersion.nsh to the additional packaging files
svn path=/trunk/; revision=14320
2005-05-05 15:25:04 +00:00
Ronnie Sahlberg 1a647a2c6a make tethereal compile when plugins are disabled
svn path=/trunk/; revision=14319
2005-05-05 13:48:34 +00:00
Guy Harris 0c8fb767d1 Fix a call to dereference a pointer (found by a compiler warning).
svn path=/trunk/; revision=14318
2005-05-05 11:08:20 +00:00
Guy Harris aa36cca7d8 Don't explicitly initialize "h245_labels", as it's hard to initialize
all of it correctly, and as if you don't initialize all of it you get a
compiler warning.

Add an assignment to squelch a compiler warning.

svn path=/trunk/; revision=14317
2005-05-05 11:07:22 +00:00
Guy Harris 4a229a099c Fix a test (bug found by a compiler warning).
svn path=/trunk/; revision=14316
2005-05-05 11:06:08 +00:00
Guy Harris fff7cd2f34 Change some data types, and add initializations, to squelch compiler
warnings.

Fix indentation.

svn path=/trunk/; revision=14315
2005-05-05 11:05:15 +00:00
Guy Harris 25443a7a87 Change data types to match those of "iconv()", at least on OS X.
svn path=/trunk/; revision=14314
2005-05-05 11:03:46 +00:00
Guy Harris f98e6c2533 Squelch a compiler warning.
svn path=/trunk/; revision=14313
2005-05-05 11:02:31 +00:00
Guy Harris f17c1822cc Re-parenthesize an expression, to squelch a compiler warning.
svn path=/trunk/; revision=14312
2005-05-05 10:00:29 +00:00
Guy Harris 73cad260c5 "oid_to_str()" and "oid_to_str_buf()" don't modify what the "oid"
argument points to, so make it a "const" pointer.

svn path=/trunk/; revision=14311
2005-05-05 09:40:24 +00:00
Gerald Combs fe5561715b Don't try to feed a null pointer to strncmp(). Fixes bug 158.
Shouldn't the number of fuzz bugs decrease asymptotically at some
point?

svn path=/trunk/; revision=14306
2005-05-04 17:02:56 +00:00
Gerald Combs 0b1b3d5716 From Lars Roland:
Make sure a hash table exists before trying to access it.  Fixes bug 105.

svn path=/trunk/; revision=14305
2005-05-04 16:40:30 +00:00