Skip to content

Commit b678bbb

Browse files
author
=
committed
removed option NMEA time offset
1 parent da4b998 commit b678bbb

File tree

2 files changed

+13
-23
lines changed

2 files changed

+13
-23
lines changed

hcxpcapngtool.c

-9
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ static uint64_t timestampmax;
343343
static uint64_t timestampdiff;
344344
static uint64_t eaptimegapmax;
345345
static uint64_t captimestampold;
346-
static time_t nmeaoffset;
347346

348347
static uint64_t eapoltimeoutvalue;
349348
static uint64_t ncvalue;
@@ -680,7 +679,6 @@ static int c;
680679
static uint8_t i;
681680
static uint16_t p;
682681

683-
if(nmeagoodcscount > 0) fprintf(stdout, "NMEA time offset (seconds)...............: %ld\n", nmeaoffset);
684682
if(nmeagoodcscount > 0) fprintf(stdout, "NMEA with good CS........................: %ld\n", nmeagoodcscount);
685683
if(nmeabadcscount > 0) fprintf(stdout, "NMEA with bad CS.........................: %ld\n", nmeabadcscount);
686684
if(nmeagbscount > 0) fprintf(stdout, "NMEA GBS.................................: %ld\n", nmeagbscount);
@@ -6281,7 +6279,6 @@ fprintf(stdout, "long options:\n"
62816279
"--nmea-in=<file> : input NME 0183 file\n"
62826280
" to convert gpx to NMEA 0183, use GPSBabel:\n"
62836281
" gpsbabel -w -t -i gpx -f in_file.gpx -o nmea -F out_file.nmea\n"
6284-
"--nmea-offset=<file> : time offset between NMEA 0183 file and dump file in seconds\n"
62856282
"--nmea-out=<file> : output GPS data in NMEA 0183 format\n"
62866283
" format: NMEA 0183 $GPGGA, $GPRMC, $GPWPL\n"
62876284
" to convert it to gpx, use GPSBabel:\n"
@@ -6441,7 +6438,6 @@ static const struct option long_options[] =
64416438
{"ignore-ie", no_argument, NULL, HCX_IE},
64426439
{"max-essids", required_argument, NULL, HCX_ESSIDS},
64436440
{"nmea-in", required_argument, NULL, HCX_NMEA_IN},
6444-
{"nmea-offset", required_argument, NULL, HCX_NMEA_OFFSET},
64456441
{"nmea-out", required_argument, NULL, HCX_NMEA_OUT},
64466442
{"csv", required_argument, NULL, HCX_CSV_OUT},
64476443
{"raw-out", required_argument, NULL, HCX_RAW_OUT},
@@ -6519,7 +6515,6 @@ fh_pmkideapoljtrdeprecated = NULL;
65196515
fh_pmkiddeprecated = NULL;
65206516
fh_hccapxdeprecated = NULL;
65216517
fh_hccapdeprecated = NULL;
6522-
nmeaoffset = 0;
65236518
gzipstat = 0;
65246519
capstat = 0;
65256520
pcapngstat = 0;
@@ -6605,10 +6600,6 @@ while((auswahl = getopt_long (argc, argv, short_options, long_options, &index))
66056600
nmeainname = optarg;
66066601
break;
66076602

6608-
case HCX_NMEA_OFFSET:
6609-
nmeaoffset = strtol(optarg, NULL, 10);
6610-
break;
6611-
66126603
case HCX_NMEA_OUT:
66136604
nmeaoutname = optarg;
66146605
break;

include/hcxpcapngtool.h

+13-14
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@
88
#define HCX_EAPMD5_JOHN_OUT 8
99
#define HCX_TACACSP_OUT 9
1010
#define HCX_NMEA_IN 10
11-
#define HCX_NMEA_OFFSET 11
12-
#define HCX_NMEA_OUT 12
13-
#define HCX_CSV_OUT 13
14-
#define HCX_RAW_OUT 14
15-
#define HCX_RAW_IN 15
16-
#define HCX_LTS 16
17-
#define HCX_LOG_OUT 17
18-
#define HCX_PMKID_CLIENT_OUT 18
19-
#define HCX_PMKID_OUT_DEPRECATED 19
20-
#define HCX_HCCAPX_OUT_DEPRECATED 20
21-
#define HCX_HCCAP_OUT_DEPRECATED 21
22-
#define HCX_PMKIDEAPOLJTR_OUT_DEPRECATED 22
23-
#define HCX_PREFIX_OUT 23
24-
#define HCX_ADD_TIMESTAMP 24
11+
#define HCX_NMEA_OUT 11
12+
#define HCX_CSV_OUT 12
13+
#define HCX_RAW_OUT 13
14+
#define HCX_RAW_IN 14
15+
#define HCX_LTS 15
16+
#define HCX_LOG_OUT 16
17+
#define HCX_PMKID_CLIENT_OUT 17
18+
#define HCX_PMKID_OUT_DEPRECATED 18
19+
#define HCX_HCCAPX_OUT_DEPRECATED 19
20+
#define HCX_HCCAP_OUT_DEPRECATED 20
21+
#define HCX_PMKIDEAPOLJTR_OUT_DEPRECATED 21
22+
#define HCX_PREFIX_OUT 22
23+
#define HCX_ADD_TIMESTAMP 23
2524
#define HCX_PMKIDEAPOL_OUT 'o'
2625
#define HCX_ESSID_OUT 'E'
2726
#define HCX_ESSIDPROBEREQUEST_OUT 'R'

0 commit comments

Comments
 (0)