Commit Graph

8666 Commits

Author SHA1 Message Date
Bill Meier db7ff13a50 Remove unneeded 'if(check_col()...)'
svn path=/trunk/; revision=30214
2009-09-30 13:32:53 +00:00
Bill Meier 0882e38510 Remove some unneeded (indirect) 'if(check_col()...)' guarding.
svn path=/trunk/; revision=30213
2009-09-30 13:30:35 +00:00
Bill Meier 832013eee3 #include <epan/expert.h>, <epan/strutil.h>, <stdio.h> & etc not needed....
svn path=/trunk/; revision=30212
2009-09-30 13:22:56 +00:00
Bill Meier 7245b43dde Rework is_acn to use tvb_memeql insted of doing a tvb_get_epemeral_string and a memcmp;
Remove some unneeded calls to col_clear().

svn path=/trunk/; revision=30211
2009-09-30 13:19:14 +00:00
Ronnie Sahlberg a5e9e49e83 Move the definition of the uuid, and registration of its name, for the
standard ndr transfer syntax from the epm dissector to packet-dcerpc.c

Add a new transfer syntax : ndr64. This is a new syntax with different
scalar sizes and different alignment rules compared to normal ndr.
It is negotiated and used between w2k8 and samba4 boxens and one may 
assume, future versions of windows as well.

We need to associate the transfer syntax with the bind information since
the transfer syntax will change the packet encoding rules for the 
protocol.
For example, SAMR, as well as all other interfaces support both syntaxes 
and are thus encoded differently, wiht different alignments depending on 
which transfer was negotioated during the bind.



This will require additional changes to the dcerpc helpers and also to 
pidl.



svn path=/trunk/; revision=30209
2009-09-30 09:43:14 +00:00
Ronnie Sahlberg d69e9a3a05 The dcerpc dissectors used to walk the list of items upward parent by
parent in order to push teh display of extra interesting fields in the 
packet to higher up in the decode tree. This was useful for making sure 
that things like DomainNames etc are clearly visible without having to 
drill down 500 layers of NDR.

This code used to just blindly walk the indicated number of parents, and 
then attach the string to that item.
This relied on the "unsafe" assumption that the topmost item would have 
pointer point to itself, so this was "safe".

This is no longer safe since the root object in the tree now has NULL as 
parent, and thus some of these dcerpc interfaces can now cause a SEGV 
trying to dereference NULL->parent.


I added a macro to safely walk to the parent object, or remain at the 
current object if parent is NULL.



This was a serious bug, where dcerpc traffic could cause a SEGV.
Please merge into all stable versions.





svn path=/trunk/; revision=30208
2009-09-30 07:53:12 +00:00
Ronnie Sahlberg 3e5715008e add the name ModeSense6 to the list of known opcodes for mmc
svn path=/trunk/; revision=30207
2009-09-30 07:47:47 +00:00
Stig Bjørlykke 10f169444f Removed second prototype of dissect_zbee_aps_skke_data().
svn path=/trunk/; revision=30184
2009-09-28 18:12:00 +00:00
Stig Bjørlykke e2d6320d75 Only include config.h in C files, to avoid multiple inclusion.
svn path=/trunk/; revision=30182
2009-09-28 17:58:47 +00:00
Stig Bjørlykke 8fce84f9e2 Fix a possible dereference of null pointer when having no tree.
svn path=/trunk/; revision=30174
2009-09-27 21:18:18 +00:00
Bill Meier ce75ae1292 Upon 2nd thought: revert changes I made to remove 'if(checkcol(...)' around col_add_fstr(...)
svn path=/trunk/; revision=30134
2009-09-25 01:22:08 +00:00
Bill Meier 8ccb52de00 Upon 2nd thought: revert removal of 'if (check_col(...))' around col_add_fstr & etc.
svn path=/trunk/; revision=30133
2009-09-25 00:29:06 +00:00
Bill Meier 0d22e0acb4 Changes:
- Fix some #defines which just happened to sum up to the correct values but which used the wrong symbols;
- check_col() no longer req'd;
- use col_add_str() rather than col_add_fstr();
- check bytes are actually present before doing a heuristics check which fetches the bytes;
- use tvb_reported_length_remaining() instead of tvb_length_remaining() in one case;
- fix call to tvb_new_subset;
- (pedantic): return 0 or tvb_length(...) rather than FALSE or TRUE for this new-style dissector;

svn path=/trunk/; revision=30132
2009-09-24 23:05:46 +00:00
Jörg Mayer f054e6e54f - Remove the comments about the breaks, they were needed.
- Add another break
- Add a comment about suboption 9
- Add suboption 11 decoding while I'm at it
  (Server Identifier Override Suboption)

svn path=/trunk/; revision=30131
2009-09-24 21:42:57 +00:00
Kovarththanan Rajaratnam 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Kovarththanan Rajaratnam 830dd8e8f0 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30126
2009-09-24 20:07:41 +00:00
Kovarththanan Rajaratnam 65c53fedb6 Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
2009-09-24 20:00:21 +00:00
Kovarththanan Rajaratnam cf8138e195 Remove check_col() guard
svn path=/trunk/; revision=30124
2009-09-24 19:50:43 +00:00
Bill Meier bc67c25759 Remove unneeded #includes (along with C++ style comments added by mistake in the last commit).
svn path=/trunk/; revision=30123
2009-09-24 19:50:00 +00:00
Bill Meier 4a73b89199 Minor: Use tvb_reported_length... not tvb_length...
svn path=/trunk/; revision=30122
2009-09-24 19:26:45 +00:00
Bill Meier 8f95ef909a Various:
- check_col no longer req'd;
 - Remove unneeded #includes;
 - Use consistent indentation/style;
 - Reformat a few lines;

svn path=/trunk/; revision=30121
2009-09-24 19:05:26 +00:00
Bill Meier bc2f7b7b8b Add what appear to be missing breaks in two cases of a switch () {...}.
svn path=/trunk/; revision=30119
2009-09-24 19:01:42 +00:00
Bill Meier 263a93b9f3 Minor changes:
- Use col_clear only once (in the right place);
 - Use col_add_fstr instead of col_clear/col_append_fstr;
 - check_col no longer req'd;

svn path=/trunk/; revision=30118
2009-09-24 17:30:20 +00:00
Bill Meier 4bd230c8f2 Minor changes:
Use col_clear (in the right place) instead of col_set_str(...,"");
  check_col no longer req'd;

svn path=/trunk/; revision=30117
2009-09-24 16:54:54 +00:00
Bill Meier 8b2d2d9488 Minor changes:
- remove unneeded includes;
 - check_col no longer req'd;
 - move proto_register/proto_reg_handoff to the end of the file;
 - fix some typos;

svn path=/trunk/; revision=30116
2009-09-24 16:22:37 +00:00
Bill Meier 4f39e04e29 Minor changes:
- check_col no longer req'd;
- use tvb_strncaseeql instead of tvb_get_ptr & etc;
- Change if (guint > 0) to if (guint != 0).

svn path=/trunk/; revision=30114
2009-09-24 15:44:59 +00:00
Kovarththanan Rajaratnam 82778b3f86 Use val_to_str_const() since we intend on passing the string to col_set_str (which expects a constant string)
svn path=/trunk/; revision=30112
2009-09-24 13:36:02 +00:00
Anders Broman 9ac672ca81 Update *.vcproj to visual studio 8
svn path=/trunk/; revision=30111
2009-09-24 05:11:47 +00:00
Kovarththanan Rajaratnam 0b5f235491 Call subdissector even when tree is NULL
svn path=/trunk/; revision=30108
2009-09-24 04:52:35 +00:00
Jaap Keuter d909f9f62c Fix for bug 4046:
Fix type of FIP dissector header field hf_fip_desc_map.

svn path=/trunk/; revision=30103
2009-09-23 19:14:35 +00:00
Bill Meier 8790ed892f Define a global variable as static;
#include <stdio.h> & <stdlib.h>  not req'd.

svn path=/trunk/; revision=30101
2009-09-23 18:20:06 +00:00
Bill Meier 9310f13f19 Change gchar foo[mm][nn] = {"xxx", "yyy", ...} to static const gchar *foo[mm] = {...}
Add a comment about a possible bug: some strings in array are never used ?
Do some minor reformatting.

svn path=/trunk/; revision=30097
2009-09-23 17:55:37 +00:00
Bill Meier 81444cdda0 Quick fix for Bug #4040.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4040

ToDo: Fix usage of
 gchar xxx[..][..] = {"aaa", "bbb", ...};

svn path=/trunk/; revision=30094
2009-09-23 16:06:39 +00:00
Anders Broman 1b454d9012 Propagate the changes to the .cnf file so they don't get lost when regenerating the dissector.
Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO

svn path=/trunk/; revision=30092
2009-09-23 15:43:55 +00:00
Kovarththanan Rajaratnam 90a5e748c2 Don't col_clear(COL_PROTOCOL) followed by col_set_str(COL_PROTOCOL). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
svn path=/trunk/; revision=30090
2009-09-23 14:59:22 +00:00
Kovarththanan Rajaratnam 124faf721c Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO
svn path=/trunk/; revision=30089
2009-09-23 14:52:01 +00:00
Kovarththanan Rajaratnam 633bb05380 Use col_set_str instead of col_add_fstri/col_add_str when adding constant strings to COL_PROTOCOL
svn path=/trunk/; revision=30088
2009-09-23 14:43:23 +00:00
Kovarththanan Rajaratnam 99624329fa Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
svn path=/trunk/; revision=30086
2009-09-23 14:30:36 +00:00
Kovarththanan Rajaratnam c28bafe341 Use col_set_str instead of col_add_fstr when adding constant strings to COL_INFO
svn path=/trunk/; revision=30082
2009-09-22 21:18:11 +00:00
Anders Broman 2cacda1823 From Vincent Helfre:
MS network capability enhancement.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4039

svn path=/trunk/; revision=30075
2009-09-22 19:15:30 +00:00
Anders Broman b8af7c77c8 From Gerasimos Dimitriadis:
Change of IEs in DTAP MODIFY msg.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4032

svn path=/trunk/; revision=30064
2009-09-22 06:42:10 +00:00
Jaap Keuter f4b9554a27 From Julian Fielding:
Function dissect_epath() expects path_length in bytes, but the value from the 
packet is in words, so there's lots of *2 and /2 in those parts of the code.
In this invocation dissect_epath( tvbIOI, pi, 0, preq_info->IOILen, TRUE );
preq_info->IOILen is in words.

In six places proto_tree_add_item is used with tvb NULL and size 0 to add an
FT_UINT8/16/32 item. I think it should be replaced with proto_tree_add_uint().

svn path=/trunk/; revision=30061
2009-09-22 05:49:15 +00:00
Kovarththanan Rajaratnam 3ea9409792 Store 'color_filter' as const in 'frame_data'
svn path=/trunk/; revision=30051
2009-09-21 18:48:53 +00:00
Michael Tüxen 5879399609 Add initial support for DNS/SCTP.
svn path=/trunk/; revision=30035
2009-09-21 12:00:03 +00:00
Anders Broman c9dcf6c415 From Gerasimos Dimitriadis:
DTAP decoding of Notification Indicator IE.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4029

svn path=/trunk/; revision=30028
2009-09-20 21:54:39 +00:00
Jaap Keuter 1da709093c From Kjell Hultman:
IEC104 Signal dissection added - not complete (only implemented what I needed for the moment).

svn path=/trunk/; revision=30026
2009-09-20 21:08:04 +00:00
Kovarththanan Rajaratnam ebaaada382 Only duplicate string the first time around, i.e. 'pinfo->fd->flags.visited == FALSE' or else we end up leaking memory
svn path=/trunk/; revision=30013
2009-09-20 13:36:16 +00:00
Kovarththanan Rajaratnam a569e8d5b8 Use tvb_get_ephemeral_string() to avoid memleak (should have been part of r29994.
svn path=/trunk/; revision=30003
2009-09-20 08:42:51 +00:00
Kovarththanan Rajaratnam 9441e9b344 Use tvb_get_ephemeral_stringz() instead of tvb_get_stringz()
svn path=/trunk/; revision=30002
2009-09-20 08:40:01 +00:00
Kovarththanan Rajaratnam 57659e8133 Use tvb_get_ephemeral_string() to avoid memleak.
svn path=/trunk/; revision=30001
2009-09-20 08:35:49 +00:00