diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-11-27 19:57:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-11-27 19:57:35 +0000 |
| commit | e8fd3756305ebf44a793d88c7cca25bf0bdba6db (patch) | |
| tree | 29a89c1600d968e6b2ad6bc15dca9f75209ae5cd /capture_sync.c | |
| parent | 9c89cdaaa3eccfe74d4e17705f38508c640b5047 (diff) | |
| download | wireshark-e8fd3756305ebf44a793d88c7cca25bf0bdba6db.tar.gz wireshark-e8fd3756305ebf44a793d88c7cca25bf0bdba6db.tar.bz2 wireshark-e8fd3756305ebf44a793d88c7cca25bf0bdba6db.zip | |
Fixes from Sam Leffler:
In capture_sync.c: Don't clobber the DLT value.
In packet-cops.c (modified by me): Instead of adding an item as a static,
mis-cast FT_UINT16 to the tree, add it as an FT_NONE.
In packet-802.11.c: Add the right address to the tree.
svn path=/trunk/; revision=23624
Diffstat (limited to 'capture_sync.c')
| -rw-r--r-- | capture_sync.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/capture_sync.c b/capture_sync.c index da444f5b59..d07f8a6151 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -243,6 +243,7 @@ init_pipe_args(int *argc) { gboolean sync_pipe_start(capture_options *capture_opts) { char ssnap[ARGV_NUMBER_LEN]; + char sdlt[ARGV_NUMBER_LEN]; char scount[ARGV_NUMBER_LEN]; char sfilesize[ARGV_NUMBER_LEN]; char sfile_duration[ARGV_NUMBER_LEN]; @@ -297,12 +298,12 @@ sync_pipe_start(capture_options *capture_opts) { if (capture_opts->linktype != -1) { argv = sync_pipe_add_arg(argv, &argc, "-y"); #ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME - g_snprintf(ssnap, ARGV_NUMBER_LEN, "%s",linktype_val_to_name(capture_opts->linktype)); + g_snprintf(sdlt, ARGV_NUMBER_LEN, "%s",linktype_val_to_name(capture_opts->linktype)); #else /* we can't get the type name, just treat it as a number */ - g_snprintf(ssnap, ARGV_NUMBER_LEN, "%d",capture_opts->linktype); + g_snprintf(sdlt, ARGV_NUMBER_LEN, "%d",capture_opts->linktype); #endif - argv = sync_pipe_add_arg(argv, &argc, ssnap); + argv = sync_pipe_add_arg(argv, &argc, sdlt); } if(capture_opts->multi_files_on) { |