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

Rewrite this dissector's NTP-to-nstime routine to take a TVB and an offset 

instead of a pointer into the TVB.  Then use the standard accessor functions
to get data out of the TVB.


svn path=/trunk/; revision=35885
This commit is contained in:
Jeff Morriss 2011-02-09 02:54:12 +00:00
parent 69b78fc118
commit 5d3a4a06bc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-netflow.c
View File

@ -1494,9 +1494,11 @@ ntptime_to_nstime(ntptime_t *ntpt, nstime_t *nst) {
#endif
static void
ntptime_buf_to_nstime(const guint8 *ntptime_buf, nstime_t *nstime) {
nstime->secs = pntohl(&ntptime_buf[0]) - NTP_BASETIME;
nstime->nsecs = (int)((pntohl(&ntptime_buf[4])*1000000000.0)/FLOAT_DENOM);
ntptime_to_nstime(tvbuff_t *tvb, gint offset, nstime_t *nstime) {
nstime->secs = tvb_get_ntohl(tvb, offset);
if (nstime->secs)
nstime->secs -= NTP_BASETIME;
nstime->nsecs = (int)(1000000000*tvb_get_ntohl(tvb, offset+4)/FLOAT_DENOM);
}
/* ------------------------------------ */
@ -2639,28 +2641,28 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 154: /* flowStartMicroseconds: 64-bit NTP format */
offset_s[rev] = offset;
ntptime_buf_to_nstime(tvb_get_ptr(tvb, offset, 8), &ts_start[rev]);
ntptime_to_nstime(tvb, offset, &ts_start[rev]);
goto timestamp_common;
break;
case 155: /* flowEndMicroseconds: 64-bit NTP format */
/* XXX: Not tested ... */
offset_e[rev] = offset;
ntptime_buf_to_nstime(tvb_get_ptr(tvb, offset, 8), &ts_end[rev]);
ntptime_to_nstime(tvb, offset, &ts_end[rev]);
goto timestamp_common;
break;
case 156: /* flowStartNanoseconds: 64-bit NTP format */
/* XXX: Not tested ... */
offset_s[rev] = offset;
ntptime_buf_to_nstime(tvb_get_ptr(tvb, offset, 8), &ts_start[rev]);
ntptime_to_nstime(tvb, offset, &ts_start[rev]);
goto timestamp_common;
break;
case 157: /* flowEndNanoseconds: 64-bit NTP format */
/* XXX: Not tested ... */
offset_e[rev] = offset;
ntptime_buf_to_nstime(tvb_get_ptr(tvb, offset, 8), &ts_end[rev]);
ntptime_to_nstime(tvb, offset, &ts_end[rev]);
goto timestamp_common;
break;