# include "config.h"
#endif
-#include "frame_data.h"
-#include "packet.h"
-#include "emem.h"
-#include "timestamp.h"
+#include <wiretap/wtap.h>
+#include <epan/frame_data.h>
+#include <epan/packet.h>
+#include <epan/emem.h>
+#include <epan/timestamp.h>
+#include "cfile.h"
#include <glib.h>
}
-
void
p_add_proto_data(frame_data *fd, int proto, void *proto_data)
{
frame_proto_data *p1 = se_alloc(sizeof(frame_proto_data));
- g_assert(p1 != NULL);
-
- p1 -> proto = proto;
- p1 -> proto_data = proto_data;
+ p1->proto = proto;
+ p1->proto_data = proto_data;
/* Add it to the GSLIST */
fd -> pfd = g_slist_insert_sorted(fd -> pfd,
- (gpointer *)p1,
- p_compare);
-
+ (gpointer *)p1,
+ p_compare);
}
void *
gint
frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field)
{
- switch (field) {
- case COL_NUMBER:
- return COMPARE_FRAME_NUM();
+ switch (field) {
+ case COL_NUMBER:
+ return COMPARE_FRAME_NUM();
+
+ case COL_CLS_TIME:
+ switch (timestamp_get_type()) {
+ case TS_ABSOLUTE:
+ case TS_ABSOLUTE_WITH_DATE:
+ case TS_EPOCH:
+ return COMPARE_TS(abs_ts);
- case COL_CLS_TIME:
- switch (timestamp_get_type()) {
- case TS_ABSOLUTE:
- case TS_ABSOLUTE_WITH_DATE:
- case TS_EPOCH:
- return COMPARE_TS(abs_ts);
+ case TS_RELATIVE:
+ return COMPARE_TS(rel_ts);
- case TS_RELATIVE:
- return COMPARE_TS(rel_ts);
+ case TS_DELTA:
+ return COMPARE_TS(del_cap_ts);
- case TS_DELTA:
- return COMPARE_TS(del_cap_ts);
+ case TS_DELTA_DIS:
+ return COMPARE_TS(del_dis_ts);
- case TS_DELTA_DIS:
- return COMPARE_TS(del_dis_ts);
+ case TS_NOT_SET:
+ return 0;
+ }
+ return 0;
- case TS_NOT_SET:
- return 0;
- }
- return 0;
+ case COL_ABS_TIME:
+ case COL_ABS_DATE_TIME:
+ return COMPARE_TS(abs_ts);
- case COL_ABS_TIME:
- case COL_ABS_DATE_TIME:
- return COMPARE_TS(abs_ts);
+ case COL_REL_TIME:
+ return COMPARE_TS(rel_ts);
- case COL_REL_TIME:
- return COMPARE_TS(rel_ts);
+ case COL_DELTA_TIME:
+ return COMPARE_TS(del_cap_ts);
- case COL_DELTA_TIME:
- return COMPARE_TS(del_cap_ts);
+ case COL_DELTA_TIME_DIS:
+ return COMPARE_TS(del_dis_ts);
- case COL_DELTA_TIME_DIS:
- return COMPARE_TS(del_dis_ts);
+ case COL_PACKET_LENGTH:
+ return COMPARE_NUM(pkt_len);
+
+ case COL_CUMULATIVE_BYTES:
+ return COMPARE_NUM(cum_bytes);
+
+ }
+ g_return_val_if_reached(0);
+}
- case COL_PACKET_LENGTH:
- return COMPARE_NUM(pkt_len);
+void
+frame_data_init(frame_data *fdata, guint32 num,
+ const struct wtap_pkthdr *phdr, gint64 offset,
+ guint32 cum_bytes)
+{
+ fdata->next = NULL;
+ fdata->prev = NULL;
+ fdata->pfd = NULL;
+ fdata->num = num;
+ fdata->pkt_len = phdr->len;
+ fdata->cum_bytes = cum_bytes + phdr->len;
+ fdata->cap_len = phdr->caplen;
+ fdata->file_off = offset;
+ /* To save some memory, we coerce it into a gint16 */
+ g_assert(phdr->pkt_encap <= G_MAXINT16);
+ fdata->lnk_t = (gint16) phdr->pkt_encap;
+ fdata->abs_ts.secs = phdr->ts.secs;
+ fdata->abs_ts.nsecs = phdr->ts.nsecs;
+ fdata->flags.passed_dfilter = 0;
+ fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
+ fdata->flags.visited = 0;
+ fdata->flags.marked = 0;
+ fdata->flags.ref_time = 0;
+ fdata->flags.ignored = 0;
+ fdata->color_filter = NULL;
+#ifdef NEW_PACKET_LIST
+ fdata->col_text_len = NULL;
+ fdata->col_text = NULL;
+#endif
+}
- case COL_CUMULATIVE_BYTES:
- return COMPARE_NUM(cum_bytes);
+void
+frame_data_set_before_dissect(frame_data *fdata,
+ nstime_t *elapsed_time,
+ nstime_t *first_ts,
+ nstime_t *prev_dis_ts,
+ nstime_t *prev_cap_ts)
+{
+ /* If we don't have the time stamp of the first packet in the
+ capture, it's because this is the first packet. Save the time
+ stamp of this packet as the time stamp of the first packet. */
+ if (nstime_is_unset(first_ts))
+ *first_ts = fdata->abs_ts;
+
+ /* if this frames is marked as a reference time frame, reset
+ firstsec and firstusec to this frame */
+ if(fdata->flags.ref_time)
+ *first_ts = fdata->abs_ts;
+
+ /* If we don't have the time stamp of the previous captured packet,
+ it's because this is the first packet. Save the time
+ stamp of this packet as the time stamp of the previous captured
+ packet. */
+ if (nstime_is_unset(prev_cap_ts))
+ *prev_cap_ts = fdata->abs_ts;
+
+ /* Get the time elapsed between the first packet and this packet. */
+ nstime_delta(&fdata->rel_ts, &fdata->abs_ts, first_ts);
+
+ /* If it's greater than the current elapsed time, set the elapsed time
+ to it (we check for "greater than" so as not to be confused by
+ time moving backwards). */
+ if ((gint32)elapsed_time->secs < fdata->rel_ts.secs
+ || ((gint32)elapsed_time->secs == fdata->rel_ts.secs && (gint32)elapsed_time->nsecs < fdata->rel_ts.nsecs)) {
+ *elapsed_time = fdata->rel_ts;
+ }
+
+ /* Get the time elapsed between the previous displayed packet and
+ this packet. */
+ if (nstime_is_unset(prev_dis_ts))
+ /* If we don't have the time stamp of the previous displayed packet,
+ it's because we have no displayed packets prior to this.
+ Set the delta time to zero. */
+ nstime_set_zero(&fdata->del_dis_ts);
+ else
+ nstime_delta(&fdata->del_dis_ts, &fdata->abs_ts, prev_dis_ts);
+
+ /* Get the time elapsed between the previous captured packet and
+ this packet. */
+ nstime_delta(&fdata->del_cap_ts, &fdata->abs_ts, prev_cap_ts);
+ *prev_cap_ts = fdata->abs_ts;
+}
+
+void
+frame_data_set_after_dissect(frame_data *fdata,
+ guint32 *cum_bytes,
+ nstime_t *prev_dis_ts)
+{
+ /* This frame either passed the display filter list or is marked as
+ a time reference frame. All time reference frames are displayed
+ even if they dont pass the display filter */
+ if(fdata->flags.ref_time){
+ /* if this was a TIME REF frame we should reset the cul bytes field */
+ *cum_bytes = fdata->pkt_len;
+ fdata->cum_bytes = *cum_bytes;
+ } else {
+ /* increase cum_bytes with this packets length */
+ *cum_bytes += fdata->pkt_len;
+ fdata->cum_bytes = *cum_bytes;
+ }
+
+ /* Set the time of the previous displayed frame to the time of this
+ frame. */
+ *prev_dis_ts = fdata->abs_ts;
+}
+
+void
+frame_data_cleanup(frame_data *fdata)
+{
+ if (fdata->pfd)
+ g_slist_free(fdata->pfd);
- }
- g_return_val_if_reached(0);
+ fdata->pfd = NULL;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff