1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More checks for the presence of a time stamp.

Browse Source 
And make sure we have a pointer to the struct wtap_pkthdr for the packet
before we check it for a time stamp.

Change-Id: I26b205e5467a3a1236e9fd1f7633e86ece5e9040
Reviewed-on: https://code.wireshark.org/review/1762
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-05-23 14:03:42 -07:00
parent 285405a0d7
commit f635efb6a6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editcap.c
View File

@ -192,17 +192,20 @@ abs_time_to_str_with_sec_resolution(const nstime_t *abs_time)
} }
static gchar * static gchar *
fileset_get_filename_by_pattern(guint idx, const nstime_t *time_val, fileset_get_filename_by_pattern(guint idx, const struct wtap_pkthdr *phdr,
gchar *fprefix, gchar *fsuffix) gchar *fprefix, gchar *fsuffix)
{ {
gchar filenum[5+1]; gchar filenum[5+1];
gchar *timestr; gchar *timestr;
gchar *abs_str; gchar *abs_str;
timestr = abs_time_to_str_with_sec_resolution(time_val);
g_snprintf(filenum, sizeof(filenum), "%05u", idx % RINGBUFFER_MAX_NUM_FILES); g_snprintf(filenum, sizeof(filenum), "%05u", idx % RINGBUFFER_MAX_NUM_FILES);
abs_str = g_strconcat(fprefix, "_", filenum, "_", timestr, fsuffix, NULL); if (phdr->presence_flags & WTAP_HAS_TS) {
g_free(timestr); timestr = abs_time_to_str_with_sec_resolution(&phdr->ts);
abs_str = g_strconcat(fprefix, "_", filenum, "_", timestr, fsuffix, NULL);
g_free(timestr);
} else
abs_str = g_strconcat(fprefix, "_", filenum, fsuffix, NULL);
return abs_str; return abs_str;
} }
@ -1186,12 +1189,14 @@ main(int argc, char *argv[])
while (wtap_read(wth, &err, &err_info, &data_offset)) { while (wtap_read(wth, &err, &err_info, &data_offset)) {
read_count++; read_count++;
phdr = wtap_phdr(wth);
if (read_count == 1) { /* the first packet */ if (read_count == 1) { /* the first packet */
if (split_packet_count > 0 || secs_per_block > 0) { if (split_packet_count > 0 || secs_per_block > 0) {
if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix)) if (!fileset_extract_prefix_suffix(argv[optind+1], &fprefix, &fsuffix))
exit(2); exit(2);
filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix); filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
} else { } else {
filename = g_strdup(argv[optind+1]); filename = g_strdup(argv[optind+1]);
} }
@ -1213,7 +1218,6 @@ main(int argc, char *argv[])
} }
} }
phdr = wtap_phdr(wth);
buf = wtap_buf_ptr(wth); buf = wtap_buf_ptr(wth);
/* /*
@ -1238,7 +1242,7 @@ main(int argc, char *argv[])
} }
block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */ block_start.secs = block_start.secs + secs_per_block; /* reset for next interval */
g_free(filename); g_free(filename);
filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix); filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
g_assert(filename); g_assert(filename);
if (verbose) if (verbose)
@ -1267,7 +1271,7 @@ main(int argc, char *argv[])
} }
g_free(filename); g_free(filename);
filename = fileset_get_filename_by_pattern(block_cnt++, &phdr->ts, fprefix, fsuffix); filename = fileset_get_filename_by_pattern(block_cnt++, phdr, fprefix, fsuffix);
g_assert(filename); g_assert(filename);
if (verbose) if (verbose)