osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Check the validity of numbers specified in command-line options. 

svn path=/trunk/; revision=3326
This commit is contained in:
Guy Harris 2001-04-18 05:45:58 +00:00
parent 1ae90b3d24
commit d2d999fb74
3 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file.h
View File

@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
* $Id: file.h,v 1.81 2001/02/11 09:28:15 guy Exp $
* $Id: file.h,v 1.82 2001/04/18 05:45:57 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -67,12 +67,12 @@ typedef struct _capture_file {
guint16 cd_t; /* File type of capture file */
int lnk_t; /* Link-layer type with which to save capture */
guint32 vers; /* Version. For tcpdump minor is appended to major */
guint32 count; /* Packet count */
int count; /* Packet count */
gboolean drops_known; /* TRUE if we know how many packets were dropped */
guint32 drops; /* Dropped packets */
guint32 esec; /* Elapsed seconds */
guint32 eusec; /* Elapsed microseconds */
guint32 snap; /* Captured packet length */
int snap; /* Captured packet length */
long progbar_quantum; /* Number of bytes read per progress bar update */
long progbar_nextstep; /* Next point at which to update progress bar */
gchar *iface; /* Interface */

37
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.193 2001/04/15 03:37:16 guy Exp $
* $Id: main.c,v 1.194 2001/04/18 05:45:58 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -736,6 +736,31 @@ show_version(void)
printf("%s %s, %s\n", PACKAGE, VERSION, comp_info_str->str);
}
int
get_positive_int(const char *string, const char *name)
{
long number;
char *p;
number = strtol(string, &p, 10);
if (p == string || *p != '\0') {
fprintf(stderr, "ethereal: The specified %s \"%s\" is not a decimal number\n",
name, string);
exit(1);
}
if (number < 0) {
fprintf(stderr, "ethereal: The specified %s \"%s\" is a negative number\n",
name, string);
exit(1);
}
if (number > INT_MAX) {
fprintf(stderr, "ethereal: The specified %s \"%s\" is too large (greater than %d)\n",
name, string, INT_MAX);
exit(1);
}
return number;
}
/* And now our feature presentation... [ fade to music ] */
int
main(int argc, char *argv[])
@ -942,11 +967,11 @@ main(int argc, char *argv[])
while ((opt = getopt(argc, argv, "B:c:f:hi:km:no:pP:Qr:R:Ss:t:T:w:W:vZ:")) != EOF) {
switch (opt) {
case 'B': /* Byte view pane height */
bv_size = atoi(optarg);
bv_size = get_positive_int(optarg, "byte view pane height");
break;
case 'c': /* Capture xxx packets */
#ifdef HAVE_LIBPCAP
cfile.count = atoi(optarg);
cfile.count = get_positive_int(optarg, "packet count");
#else
capture_option_specified = TRUE;
arg_error = TRUE;
@ -1014,7 +1039,7 @@ main(int argc, char *argv[])
#endif
break;
case 'P': /* Packet list pane height */
pl_size = atoi(optarg);
pl_size = get_positive_int(optarg, "packet list pane height");
break;
case 'Q': /* Quit after capture (just capture to file) */
#ifdef HAVE_LIBPCAP
@ -1036,7 +1061,7 @@ main(int argc, char *argv[])
break;
case 's': /* Set the snapshot (capture) length */
#ifdef HAVE_LIBPCAP
cfile.snap = atoi(optarg);
cfile.snap = get_positive_int(optarg, "snapshot length");
#else
capture_option_specified = TRUE;
arg_error = TRUE;
@ -1068,7 +1093,7 @@ main(int argc, char *argv[])
}
break;
case 'T': /* Tree view pane height */
tv_size = atoi(optarg);
tv_size = get_positive_int(optarg, "tree view pane height");
break;
case 'v': /* Show version and exit */
show_version();

32
tethereal.c
View File

@ -1,6 +1,6 @@
/* tethereal.c
*
* $Id: tethereal.c,v 1.79 2001/04/15 03:37:13 guy Exp $
* $Id: tethereal.c,v 1.80 2001/04/18 05:45:57 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -32,6 +32,7 @@
#include <stdio.h>
#include <string.h>
#include <locale.h>
#include <limits.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@ -168,6 +169,31 @@ print_usage(void)
fprintf(stderr, "\tdefault is libpcap\n");
}
int
get_positive_int(const char *string, const char *name)
{
long number;
char *p;
number = strtol(string, &p, 10);
if (p == string || *p != '\0') {
fprintf(stderr, "tethereal: The specified %s \"%s\" is not a decimal number\n",
name, string);
exit(1);
}
if (number < 0) {
fprintf(stderr, "tethereal: The specified %s \"%s\" is a negative number\n",
name, string);
exit(1);
}
if (number > INT_MAX) {
fprintf(stderr, "tethereal: The specified %s \"%s\" is too large (greater than %d)\n",
name, string, INT_MAX);
exit(1);
}
return number;
}
int
main(int argc, char *argv[])
{
@ -314,7 +340,7 @@ main(int argc, char *argv[])
switch (opt) {
case 'c': /* Capture xxx packets */
#ifdef HAVE_LIBPCAP
packet_count = atoi(optarg);
packet_count = get_positive_int(optarg, "packet count");
#else
capture_option_specified = TRUE;
arg_error = TRUE;
@ -424,7 +450,7 @@ main(int argc, char *argv[])
break;
case 's': /* Set the snapshot (capture) length */
#ifdef HAVE_LIBPCAP
cfile.snap = atoi(optarg);
cfile.snap = get_positive_int(optarg, "snapshot length");
#else
capture_option_specified = TRUE;
arg_error = TRUE;