osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Jose Pedro Oliveira: Fix typos 

svn path=/trunk/; revision=41330
This commit is contained in:
Anders Broman 2012-03-03 16:17:20 +00:00
parent 104bab54f1
commit ad6640344f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dumpcap.c
View File

@ -710,7 +710,7 @@ get_capture_device_open_failure_messages(const char *open_err_str,
static const char ppamsg[] = "can't find PPA for ";
/* If we got a "can't find PPA for X" message, warn the user (who
is running dumcap on HP-UX) that they don't have a version of
is running dumpcap on HP-UX) that they don't have a version of
libpcap that properly handles HP-UX (libpcap 0.6.x and later
versions, which properly handle HP-UX, say "can't find /dev/dlpi
PPA for X" rather than "can't find PPA for X"). */
@ -2342,7 +2342,7 @@ capture_loop_open_input(capture_options *capture_opts, loop_data *ld,
if ((use_threads == FALSE) &&
(capture_opts->ifaces->len > 1)) {
g_snprintf(errmsg, (gulong) errmsg_len,
"Using threads is required for capturing on mulitple interfaces!");
"Using threads is required for capturing on multiple interfaces!");
return FALSE;
}
@ -2607,7 +2607,7 @@ capture_loop_init_output(capture_options *capture_opts, loop_data *ld, char *err
if ((capture_opts->use_pcapng == FALSE) &&
(capture_opts->ifaces->len > 1)) {
g_snprintf(errmsg, errmsg_len,
"Using PCAPNG is required for capturing on mulitple interfaces! Use the -n option.");
"Using PCAPNG is required for capturing on multiple interfaces! Use the -n option.");
return FALSE;
}
@ -3232,7 +3232,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
/* init the input filter from the network interface (capture pipe will do nothing) */
/*
* When remote capturing WinPCap crashes when the capture filter
* is NULL. This might be a bug in WPCap. Therefore we provide an emtpy
* is NULL. This might be a bug in WPCap. Therefore we provide an empty
* string.
*/
switch (capture_loop_init_filter(pcap_opts->pcap_h, pcap_opts->from_cap_pipe,

18
wiretap/pcapng.c
View File

@ -268,7 +268,7 @@ typedef struct wtapng_section_s {
* if_filter 11 The filter (e.g. "capture only TCP traffic") used to capture traffic. The first byte of the Option Data keeps a code of the filter used (e.g. if this is a libpcap string, or BPF bytecode, and more). More details about this format will be presented in Appendix XXX (TODO). (TODO: better use different options for different fields? e.g. if_filter_pcap, if_filter_bpf, ...) 00 "tcp port 23 and host 10.0.0.5"
* if_os 12 A UTF-8 string containing the name of the operating system of the machine in which this interface is installed. This can be different from the same information that can be contained by the Section Header Block (Section 3.1 (Section Header Block (mandatory))) because the capture can have been done on a remote machine. "Windows XP SP2" / "openSUSE 10.2" / ...
* if_fcslen 13 An integer value that specified the length of the Frame Check Sequence (in bits) for this interface. For link layers whose FCS length can change during time, the Packet Block Flags Word can be used (see Appendix A (Packet Block Flags Word)). 4
* if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps. The time zone of the offset can be specified with the option if_tzone. TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly syncronized capture systems? 1234
* if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps. The time zone of the offset can be specified with the option if_tzone. TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly synchronized capture systems? 1234
*/
typedef struct wtapng_if_descr_s {
@ -379,8 +379,8 @@ typedef struct interface_data_s {
} interface_data_t;
typedef struct {
gboolean shb_read; /**< Set when fisrt SHB read, second read will fail */
gboolean read_idbs; /**< Idicates that it is the first read after a SHB, atl east one IDB is expected */
gboolean shb_read; /**< Set when first SHB read, second read will fail */
gboolean read_idbs; /**< Indicates that it is the first read after a SHB, at least one IDB is expected */
gboolean byte_swapped;
guint16 version_major;
guint16 version_minor;
@ -695,7 +695,7 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn,
wblock->data.if_descr.snap_len);
if (wblock->data.if_descr.snap_len > WTAP_MAX_PACKET_SIZE) {
/* This is unrealisitic, but text2pcap currently uses 102400.
/* This is unrealistic, but text2pcap currently uses 102400.
* We do not use this value, maybe we should check the
* snap_len of the packets against it. For now, only warn.
*/
@ -860,7 +860,7 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn,
* if_tsoffset 14 A 64 bits integer value that specifies an offset (in seconds) that must be added to the timestamp of each packet
* to obtain the absolute timestamp of a packet. If the option is missing, the timestamps stored in the packet must be considered absolute timestamps.
* The time zone of the offset can be specified with the option if_tzone.
* TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly syncronized capture systems? 1234
* TODO: won't a if_tsoffset_low for fractional second offsets be useful for highly synchronized capture systems? 1234
*/
default:
pcapng_debug2("pcapng_read_if_descr_block: unknown option %u - ignoring %u bytes",
@ -1899,7 +1899,7 @@ pcapng_open(wtap *wth, int *err, gchar **err_info)
wth->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
wth->number_of_interfaces = 0;
/* Loop ower all IDB:s that appear before any packets */
/* Loop over all IDB:s that appear before any packets */
while(1){
bytes_read = pcapng_read_block(wth->fh, FALSE, &pn, &wblock, err, err_info);
wth->data_offset += bytes_read;
@ -2176,7 +2176,7 @@ pcapng_write_section_header_block(wtap_dumper *wdh, int *err)
options_total_length = options_total_length + shb_user_appl_len + shb_user_appl_pad_len + 4 /* options tag */ ;
}
if (have_options) {
/* End-of-optios tag */
/* End-of-options tag */
options_total_length += 4;
}
}
@ -2433,7 +2433,7 @@ pcapng_write_if_descr_block(wtap_dumper *wdh, wtapng_if_descr_t *int_data, int *
*/
if (have_options) {
/* End-of-optios tag */
/* End-of-options tag */
options_total_length += 4;
}
@ -3160,7 +3160,7 @@ int pcapng_dump_can_write_encap(int wtap_encap)
wtap_encap,
wtap_encap_string(wtap_encap));
/* Per-packet encapsulations is supported. */
/* Per-packet encapsulation is supported. */
if (wtap_encap == WTAP_ENCAP_PER_PACKET)
return 0;