diff options
Diffstat (limited to 'plugins/profinet/packet-dcom-cba-acco.c')
-rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 4e28c25a52..5f6a92fa70 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -508,7 +508,7 @@ cba_pdev_add(packet_info *pinfo, const address *addr) /* not found, create a new */ pdev = (cba_pdev_t *)wmem_alloc(wmem_file_scope(), sizeof(cba_pdev_t)); memcpy( (void *) (pdev->ip), addr->data, 4); - pdev->first_packet = pinfo->fd->num; + pdev->first_packet = pinfo->num; pdev->ldevs = NULL; pdev->object = NULL; cba_pdevs = g_list_append(cba_pdevs, pdev); @@ -574,7 +574,7 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name) /* not found, create a new */ ldev = (cba_ldev_t *)wmem_alloc(wmem_file_scope(), sizeof(cba_ldev_t)); ldev->name = wmem_strdup(wmem_file_scope(), name); - ldev->first_packet = pinfo->fd->num; + ldev->first_packet = pinfo->num; ldev->ldev_object = NULL; ldev->acco_object = NULL; ldev->parent = pdev; @@ -658,16 +658,16 @@ cba_packet_in_range(packet_info *pinfo, guint packet_connect, guint packet_disco { if (packet_connect == 0) { - g_warning("cba_packet_in_range#%u: packet_connect not set?", pinfo->fd->num); + g_warning("cba_packet_in_range#%u: packet_connect not set?", pinfo->num); } - if (packet_connect == 0 || pinfo->fd->num < packet_connect) { + if (packet_connect == 0 || pinfo->num < packet_connect) { return FALSE; } - if (packet_disconnect != 0 && pinfo->fd->num > packet_disconnect) { + if (packet_disconnect != 0 && pinfo->num > packet_disconnect) { return FALSE; } - if (packet_disconnectme != 0 && pinfo->fd->num > packet_disconnectme) { + if (packet_disconnectme != 0 && pinfo->num > packet_disconnectme) { return FALSE; } @@ -752,7 +752,7 @@ cba_frame_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *prov_ld frame->consparent = cons_ldev; frame->provparent = prov_ldev; - frame->packet_connect = pinfo->fd->num; + frame->packet_connect = pinfo->num; frame->packet_disconnect = 0; frame->packet_disconnectme = 0; frame->packet_first = 0; @@ -782,12 +782,12 @@ cba_frame_disconnect(packet_info *pinfo, cba_frame_t *frame) { if (frame->packet_disconnect == 0) { - frame->packet_disconnect = pinfo->fd->num; + frame->packet_disconnect = pinfo->num; } - if (frame->packet_disconnect != pinfo->fd->num) { + if (frame->packet_disconnect != pinfo->num) { g_warning("cba_frame_disconnect#%u: frame already disconnected in #%u", - pinfo->fd->num, frame->packet_disconnect); + pinfo->num, frame->packet_disconnect); } } @@ -808,12 +808,12 @@ cba_frame_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_ cba_frame_info(tvb, pinfo, tree, frame); if (frame->packet_disconnectme == 0) { - frame->packet_disconnectme = pinfo->fd->num; + frame->packet_disconnectme = pinfo->num; } - if (frame->packet_disconnectme != pinfo->fd->num) { + if (frame->packet_disconnectme != pinfo->num) { g_warning("cba_frame_disconnectme#%u: frame already disconnectme'd in #%u", - pinfo->fd->num, frame->packet_disconnectme); + pinfo->num, frame->packet_disconnectme); } } } @@ -886,12 +886,12 @@ static void cba_frame_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_frame_t *frame) { if (frame->packet_first == 0) { - frame->packet_first = pinfo->fd->num; + frame->packet_first = pinfo->num; } - if ( pinfo->fd->num > frame->packet_last && + if ( pinfo->num > frame->packet_last && cba_packet_in_range(pinfo, frame->packet_connect, frame->packet_disconnect, frame->packet_disconnectme)) { - frame->packet_last = pinfo->fd->num; + frame->packet_last = pinfo->num; } } @@ -987,7 +987,7 @@ cba_connection_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *pr conn->provparentacco = prov_ldev; conn->parentframe = cons_frame; - conn->packet_connect = pinfo->fd->num; + conn->packet_connect = pinfo->num; conn->packet_disconnect = 0; conn->packet_disconnectme = 0; conn->packet_first = 0; @@ -1024,10 +1024,10 @@ cba_connection_disconnect(packet_info *pinfo, cba_connection_t *conn) { /* XXX - detect multiple disconnects? */ if (conn->packet_disconnect == 0) { - conn->packet_disconnect = pinfo->fd->num; + conn->packet_disconnect = pinfo->num; } - if (conn->packet_disconnect != pinfo->fd->num) { + if (conn->packet_disconnect != pinfo->num) { g_warning("connection_disconnect#%u: already disconnected", conn->packet_disconnect); } @@ -1050,10 +1050,10 @@ cba_connection_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_connection_info(tvb, pinfo, tree, conn); if (conn->packet_disconnectme == 0) { - conn->packet_disconnectme = pinfo->fd->num; + conn->packet_disconnectme = pinfo->num; } - if (conn->packet_disconnectme != pinfo->fd->num) { + if (conn->packet_disconnectme != pinfo->num) { g_warning("connection_disconnectme#%u: already disconnectme'd", conn->packet_disconnectme); } @@ -1084,12 +1084,12 @@ static void cba_connection_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_connection_t *conn) { if (conn->packet_first == 0) { - conn->packet_first = pinfo->fd->num; + conn->packet_first = pinfo->num; } - if ( pinfo->fd->num > conn->packet_last && + if ( pinfo->num > conn->packet_last && cba_packet_in_range(pinfo, conn->packet_connect, conn->packet_disconnect, conn->packet_disconnectme)) { - conn->packet_last = pinfo->fd->num; + conn->packet_last = pinfo->num; } } |