Other LDP enhancements
PPP OSI Network Layer Control Protocol [RFC1377]
Fix dissecting of CLNS Protocols over Cisco HDLC
- PWE3 Interface parameter additions and miscelaneous updates
+ PWE3 Interface parameter additions and miscellaneous updates
from various IETF PWE3 drafts
MPLS PW Control Channel Header
Multiprotocol Label Switching Echo [draft-ietf-mpls-lsp-ping-05]
}
Per Liedberg <per.liedberg[AT]ericsson.com> {
- RoHC dissection improvments
+ RoHC dissection improvements
}
Gaurav Tungatkar <gauravstt[AT]gmail.com> {
wmem_tree.h
- A balanced binary tree (red-black tree) implementation.
-2.2.4 Miscellanious Utilities
+2.2.4 Miscellaneous Utilities
wmem_miscutl.h
- Misc. utility functions like memdup.
fairly common in Lua APIs, although having a mixture of both in the same API
probably isn't. There is even a third model in use: pre-loading the member
fields of the class table with the values, instead of waiting for the Lua
-script to access a particular one to retrieve it; for exmaple the Listener tap
+script to access a particular one to retrieve it; for example the Listener tap
extractors table is pre-populated (see files 'wslua_listener.c' and 'taps'
which through the make-taps.pl perl script creates 'taps_wslua.c'). The
downside of that approach is the performance impact, filling fields the Lua
WSLUA_ERROR - this C macro takes arguments, and expands to call luaL_error()
using them, and returns 0. The arguments it takes is the full function name
and a string describing the error. For documentation, it uses the string
-arguement and displays it with the function it's associated to.
+argument and displays it with the function it's associated to.
Example:
if (!wtap_dump_can_write_encap(filetype, encap))
===================================================================
Follow: tcp,ascii
- Filter: (ommitted for readability)
+ Filter: (omitted for readability)
Node 0: 200.57.7.197:32891
Node 1: 200.57.7.198:2906
38
frame[-4:] == 0.1.2.3
-A slice is alwasy compared against either a string or a byte sequence.
+A slice is always compared against either a string or a byte sequence.
As a special case, when the slice is only 1 byte wide, you can compare
it against a hex integer that 0xff or less (which means it fits inside
one byte). This is not allowed for byte sequences greater than one byte,
<note><title>Note!</title>
<para>
Before reporting any problems, please make sure you have installed the
- latest version of Wireshark. Reports on older maintainance releases are
+ latest version of Wireshark. Reports on older maintenance releases are
usually met with an upgrade request.
</para>
</note>
url_template=http://${language}.wikipedia.org/wiki/${PATH}
# Substitution data for the location template.
-# Each occurence of the keys below in the location template will be
+# Each occurrence of the keys below in the location template will be
# substituted with their corresponding values. For example, "${license}"
# in the URL template above will be replaced with the value of "license"
# below.
<para>
At the top, the check-box allows this window to include RLC PDUs found
- withing MAC PDUs or not. This will affect both the PDUs counted as well
+ within MAC PDUs or not. This will affect both the PDUs counted as well
as the display filters generated (see below).
</para>
# causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
return;
}
- dispatcher_err(ECHLD_ERR_UNKNOWN_PID, "Unkown child pid: %d", pid);
+ dispatcher_err(ECHLD_ERR_UNKNOWN_PID, "Unknown child pid: %d", pid);
dispatcher->reqh_id = reqh_id_save;
}
echld_dispatcher_start(to_disp,from_disp,init->argv0,init->main);
- PARENT_FATAL((SHOULD_HAVE_EXITED_BEFORE,"This shoudln't happen"));
+ PARENT_FATAL((SHOULD_HAVE_EXITED_BEFORE,"This shouldn't happen"));
} else {
/* parent code */
#ifdef PARENT_THREADS
* in strict chronologically increasing order (which is NOT
* always the case!!).
*
- * The fd_hash[] table was deliberatly created large (1,000,000).
+ * The fd_hash[] table was deliberately created large (1,000,000).
* Looking for time related duplicates in large trace files with
* non-fractional dup time window values can potentially take
* a long time to complete.
gboolean try_desegment = FALSE;
if (dcerpc_cn_desegment && pinfo->can_desegment &&
!tvb_bytes_exist(tvb, offset, sizeof(e_dce_cn_common_hdr_t))) {
- /* look for a previous occurence of the DCE-RPC protocol */
+ /* look for a previous occurrence of the DCE-RPC protocol */
wmem_list_frame_t *cur;
cur = wmem_list_frame_prev(wmem_list_tail(pinfo->layers));
while (cur != NULL) {
---------------------
The following is a short description of the capture filter language syntax. For a further reference, have a look at: http://www.tcpdump.org/tcpdump_man.html
-A capture filter takes the form of a series of primitive expressions, connected by conjunctions (and/or) and optionally preceeded by not:
+A capture filter takes the form of a series of primitive expressions, connected by conjunctions (and/or) and optionally preceded by not:
[not] primitive [and|or [not] primitive ...]
[src|dst] host <host>
-This primitive allows you to filter on a host IP address or name. You can optionally preceed the primitive with the keyword src|dst to specify that you are only interested in source or destination addresses. If these are not present, packets where the specified address appears as either the source or the destination address will be selected.
+This primitive allows you to filter on a host IP address or name. You can optionally precede the primitive with the keyword src|dst to specify that you are only interested in source or destination addresses. If these are not present, packets where the specified address appears as either the source or the destination address will be selected.
ether [src|dst] host <ehost>
[src|dst] net <net> [{mask <mask>}|{len <len>}]
-This primitive allows you to filter on network numbers. You can optionally preceed this primitive with the keyword src|dst to specify that you are only interested in a source or destination network. If neither of these are present, packets will be selected that have the specified network in either the source or destination address. In addition, you can specify either the netmask or the CIDR (Classless Inter-Domain Routing) prefix for the network if they are different from your own.
+This primitive allows you to filter on network numbers. You can optionally precede this primitive with the keyword src|dst to specify that you are only interested in a source or destination network. If neither of these are present, packets will be selected that have the specified network in either the source or destination address. In addition, you can specify either the netmask or the CIDR (Classless Inter-Domain Routing) prefix for the network if they are different from your own.
[tcp|udp] [src|dst] port <port>
-This primitive allows you to filter on TCP and UDP port numbers. You can optionally preceed this primitive with the keywords src|dst and tcp|udp which allow you to specify that you are only interested in source or destination ports and TCP or UDP packets respectively. The keywords tcp|udp must appear before src|dst.
+This primitive allows you to filter on TCP and UDP port numbers. You can optionally precede this primitive with the keywords src|dst and tcp|udp which allow you to specify that you are only interested in source or destination ports and TCP or UDP packets respectively. The keywords tcp|udp must appear before src|dst.
If these are not specified, packets will be selected for both the TCP and UDP protocols and when the specified address appears in either the source or destination port field.
less|greater <length>
The display filter will not affect the data captured, it will only select which packets of the captured data are displayed on the screen.
-Everytime you change the filter string, all packets will be reread from the capture file (or from memory), and processed by the display filter "machine". Packet by packet, this "machine" is asked, if this particular packet should be shown or not.
+Every time you change the filter string, all packets will be reread from the capture file (or from memory), and processed by the display filter "machine". Packet by packet, this "machine" is asked, if this particular packet should be shown or not.
Wireshark offers a very powerful display filter language for this. It can be used for a wide range of purposes, from simply: "show only packets from a specific IP address", or on the other hand, to very complex filters like: "find all packets where a special application specific flag is set".
# And, what's worse, at least with the version of Xcode that comes
# with Leopard, /usr/include/ffi/fficonfig.h doesn't define MACOSX,
# which causes the build of GLib to fail. If we don't find
- # "#define.*MACOSX" in /usr/include/ffi/fficonfig.h, explictly
+ # "#define.*MACOSX" in /usr/include/ffi/fficonfig.h, explicitly
# define it.
#
# While we're at it, suppress -Wformat-nonliteral to avoid a case
/* Detect ongoing package hits, special behavior if start is set to 0 */
if((cs->last_hit||(compare_start==0))&&(cs->start_ongoing_hits<compare_start||(compare_start==0))){
if((compare_start==0)&&(cs->start_ongoing_hits!=0)){
- /* start from the first packet so allready set */
+ /* start from the first packet so already set */
} else {
cs->start_ongoing_hits++;
/* Take the lower number */
const gchar *statis_string;
guint32 first_file_amount, second_file_amount;
- /* inital steps, clear all data before start*/
+ /* initial steps, clear all data before start*/
cs->zebra_time.secs=0;
cs->zebra_time.nsecs=1;
nstime_set_unset(&cs->current_time);
/*
* This TAP enables extraction of most important diameter fields in text format.
* - much more performance than -T text and -T pdml
- * - more powerfull than -T field and -z proto,colinfo
+ * - more powerful than -T field and -z proto,colinfo
* - exacltly one text line per diameter message
* - multiple diameter messages in one frame supported
* E.g. one device watchdog answer and two credit control answers
void * contextp
)
{
- static const char seperator[] =
+ static const char separator[] =
"===================================================================\n";
follow_t * fp = (follow_t *)contextp;
port[1] = fp->port[0];
}
- printf("\n%s", seperator);
+ printf("\n%s", separator);
printf("Follow: %s,%s\n", followStrType(fp), followStrMode(fp));
printf("Filter: %s\n", followStrFilter(fp));
done:
- printf("%s", seperator);
+ printf("%s", separator);
followFileClose(fp);
}
* the window to be redrawn, return 1 and (*draw) will be called sometime
* later.
*
- * We didnt apply a filter when we registered so we will be called for
+ * We didn't apply a filter when we registered so we will be called for
* ALL packets and not just the ones we are collecting stats for.
*
*/
continue;
}
/* 2. data chunk overlaps the first part of free_chunk */
- /* -> free chunk shrinks from the beggining */
+ /* -> free chunk shrinks from the beginning */
if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
file->data_gathered += chunk_end_offset-current_free_chunk->start_offset+1;
current_free_chunk->start_offset=chunk_end_offset+1;
* In order to parse header, we duplicate data and tokenize lines.
* We aren't interested in actual data, so use g_strndup instead of memcpy
* to (possibly) copy fewer bytes (e.g., if a nul byte exists in data)
- * This also ensures that we have a terminated string for futher processing.
+ * This also ensures that we have a terminated string for further
+ * processing.
*/
tmp = copy = g_strndup(data, len);
if (!tmp) {
#include "ui/gtk/old-gtk-compat.h"
-/* From colorize convertion */
+/* From colorize conversion */
#define COLOR_N 1
/* For checksum */
/* Detect ongoing package hits, special behavior if start is set to 0 */
if((cs->last_hit||(compare_start==0))&&(cs->start_ongoing_hits<compare_start||(compare_start==0))){
if((compare_start==0)&&(cs->start_ongoing_hits!=0)){
- /* start from the first packet so allready set */
+ /* start from the first packet so already set */
} else {
cs->start_ongoing_hits++;
/* Take the lower number */
frame_info *fInfo;
guint32 first_file_amount, second_file_amount;
- /* inital steps, clear all data before start*/
+ /* initial steps, clear all data before start*/
cs->zebra_time.secs=0;
cs->zebra_time.nsecs=1;
nstime_set_unset(&cs->current_time);
/* searching for the next one we are only interested in those
that sorts alphabetically after the current one */
if(strcmp(current_uuid_value->name, v->name) >= 0){
- /* this one doesnt so just skip it */
+ /* this one doesn't so just skip it */
return;
}
* so we know how large arrays we need to malloc()
*/
num_time_intervals = user_data->dlg.dialog_graph.num_items;
- /* if there isnt anything to do, just return */
+ /* if there isn't anything to do, just return */
if (num_time_intervals == 0) {
return;
}
return;
}
- /* With the new packetlists "lazy columns" it's neccesary to reread the frame */
+ /* With the new packetlists "lazy columns" it's necessary to reread the frame */
if (!cf_read_frame(&cfile, fd)) {
/* error reading the frame */
return;
gtk_widget_show(col_link_lb);
row++;
- /* create "Promiscous Mode" label and button */
+ /* create "Promiscuous Mode" label and button */
col_pmode_cb = gtk_check_button_new();
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_pmode_cb, 0, row, 1, 1);
if (!prefs.capture_columns || prefs_capture_options_dialog_column_is_visible("PMODE"))
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_pmode_cb), FALSE);
gtk_widget_show(col_pmode_cb);
- col_pmode_lb = gtk_label_new("Promiscous Mode");
+ col_pmode_lb = gtk_label_new("Promiscuous Mode");
ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_pmode_lb, 1, row, 1, 1);
gtk_misc_set_alignment(GTK_MISC(col_pmode_lb), 0, 0.5f);
gtk_widget_show(col_pmode_lb);
* so we know how large arrays we need to malloc()
*/
num_time_intervals = user_data->dlg.dialog_graph.num_items;
- /* if there isnt anything to do, just return */
+ /* if there isn't anything to do, just return */
if (num_time_intervals == 0) {
return;
}
PaError err;
GtkWidget *dialog;
- /* Stop the channels if necesary */
+ /* Stop the channels if necessary */
if(rtp_channels && (!rtp_channels->stop)){
stop_channels();
}
/* Define fixed column indexes */
#define NODEPTR_COLUMN 0 /* Always first column */
-#define N_RESERVED_COL 1 /* Number of columns for internal use - added before visable cols */
+#define N_RESERVED_COL 1 /* Number of columns for internal use - added before visible cols */
static void
}
/* check if there is an LRQ/LCF that match this Setup */
- /* TODO: we are just checking the DialedNumer in LRQ/LCF agains the Setup
+ /* TODO: we are just checking the DialedNumer in LRQ/LCF against the Setup
we should also check if the h225 signaling IP and port match the destination
Setup ip and port */
list = g_list_first(tapinfo->callsinfo_list);
* @param fmt column format
* @param title column title
* @param custom_field column custom field
- * @param custom_occurrence custom occurence
+ * @param custom_occurrence custom occurrence
*/
void column_prefs_add_custom(gint fmt, const gchar *title,
const gchar *custom_field,
hassnap = capture_dev_user_hassnap_find(device.name);
snaplen = capture_dev_user_snaplen_find(device.name);
if(snaplen != -1 && hassnap != -1) {
- /* Default snap lenght set in preferences */
+ /* Default snap length set in preferences */
device.snaplen = snaplen;
device.has_snaplen = hassnap;
} else {
</column>
<column>
<property name="text">
- <string>Field occurence</string>
+ <string>Field occurrence</string>
</property>
</column>
</widget>
type_desc.append("16");
break;
default:
- type_desc.append(tr("unkown"));
+ type_desc.append(tr("unknown"));
}
item->setText(type_col_, type_desc);
}
case 9: result = 4; break; // 9.5 -> 1.9 substep
}
}
- // if mantissa fraction isnt 0.0 or 0.5, don't bother finding good sub tick marks, leave default
+ // if mantissa fraction isn't 0.0 or 0.5, don't bother finding good sub tick marks, leave default
}
return result;
if (mCachedMarginValid)
return mCachedMargin;
- // run through similar steps as QCPAxis::draw, and caluclate margin needed to fit axis and its labels
+ // run through similar steps as QCPAxis::draw, and calculate margin needed to fit axis and its labels
int margin = 0;
if (mVisible)
the viewport with the provided \a painter. The scaled version is buffered in
mScaledBackgroundPixmap to prevent expensive rescaling at every redraw. It is only updated, when
the axis rect has changed in a way that requires a rescale of the background pixmap (this is
- dependant on the \ref setBackgroundScaledMode), or when a differend axis backgroud pixmap was
+ dependent on the \ref setBackgroundScaledMode), or when a different axis background pixmap was
set.
Note that this function does not draw a fill with the background brush (\ref setBackground(const
the axis rect with the provided \a painter. The scaled version is buffered in
mScaledBackgroundPixmap to prevent expensive rescaling at every redraw. It is only updated, when
the axis rect has changed in a way that requires a rescale of the background pixmap (this is
- dependant on the \ref setBackgroundScaledMode), or when a differend axis backgroud pixmap was
+ dependent on the \ref setBackgroundScaledMode), or when a different axis background pixmap was
set.
\see setBackground, setBackgroundScaled, setBackgroundScaledMode
Event handler for mouse wheel events. If rangeZoom is Qt::Horizontal, Qt::Vertical or both, the
ranges of the axes defined as rangeZoomHorzAxis and rangeZoomVertAxis are scaled. The center of
the scaling operation is the current cursor position inside the axis rect. The scaling factor is
- dependant on the mouse wheel delta (which direction the wheel was rotated) to provide a natural
+ dependent on the mouse wheel delta (which direction the wheel was rotated) to provide a natural
zooming feel. The Strength of the zoom can be controlled via \ref setRangeZoomFactor.
Note, that event->delta() is usually +/-120 for single rotation steps. However, if the mouse
/*!
Adds \a item to the legend, if it's not present already.
- Returns true on sucess, i.e. if the item wasn't in the list already and has been successfuly added.
+ Returns true on success, i.e. if the item wasn't in the list already and has been successfuly added.
The legend takes ownership of the item.
*/
<translation type="unfinished"></translation>
</message>
<message>
- <source>Field occurence</source>
+ <source>Field occurrence</source>
<translation type="unfinished"></translation>
</message>
</context>
</message>
<message>
<location filename="column_preferences_frame.ui" line="50"/>
- <source>Field occurence</source>
+ <source>Field occurrence</source>
<translation type="unfinished"></translation>
</message>
</context>
int nstreams; /**< number of streams in the list */
GList* strinfo_list; /**< list with all streams */
int npackets; /**< total number of rtp packets of all streams */
- /* used while tapping. user shouldnt modify these */
+ /* used while tapping. user shouldn't modify these */
tap_mode_t mode;
rtp_stream_info_t* filter_stream_fwd; /**< used as filter in some tap modes */
rtp_stream_info_t* filter_stream_rev; /**< used as filter in some tap modes */
/* If the first one is 65535 we wrap */
else if ( (statinfo->seq_num == 65535) && (rtpinfo->info_seq_num == 0) )
statinfo->seq_num = rtpinfo->info_seq_num;
- /* Lost packets. If the prev seq is enourmously larger than the cur seq
+ /* Lost packets. If the prev seq is enormously larger than the cur seq
* we assume that instead of being massively late we lost the packet(s)
* that would have indicated the sequence number wrapping. An imprecise
* heuristic at best, but it seems to work well enough.
timecode = timecode_default;
ts_usec = 0;
- /* Ensure preamble has more than two chars before atempting to parse.
+ /* Ensure preamble has more than two chars before attempting to parse.
* This should cover line breaks etc that get counted.
*/
if ( strlen(packet_preamble) > 2 ) {
{
int fd;
int ret = -1;
- /* Ugly hack to avoid incuding wireless.h */
+ /* Ugly hack to avoid including wireless.h */
struct {
char name1[IFNAMSIZ];
__s32 m;
git.samba.org / metze / wireshark / wip.git / commitdiff