]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: fix warning of compilation when using bgp_trace
authorPhilippe Guibert <philippe.guibert@6wind.com>
Fri, 8 Nov 2024 08:48:11 +0000 (09:48 +0100)
committerPhilippe Guibert <philippe.guibert@6wind.com>
Mon, 30 Dec 2024 14:13:37 +0000 (15:13 +0100)
The following warning can be seen:
> In file included from ./bgpd/bgp_trace.h:21,
>                  from bgpd/bgp_io.c:27:
> bgpd/bgp_io.c: In function ‘read_ibuf_work’:
> bgpd/bgp_io.c:202:53: warning: passing argument 1 of ‘lttng_ust_tracepoint_cb_frr_bgp___packet_read’ from incompatible pointer type [-Wincompatible-pointer-types]
>   202 |         frrtrace(2, frr_bgp, packet_read, connection->peer, pkt);
>       |                                           ~~~~~~~~~~^~~~~~
>       |                                                     |
>       |                                                     struct peer *
> bgpd/bgp_io.c:202:9: note: in expansion of macro ‘frrtrace’
>   202 |         frrtrace(2, frr_bgp, packet_read, connection->peer, pkt);
>       |         ^~~~~~~~
> In file included from ./bgpd/bgp_trace.h:21,
>                  from bgpd/bgp_io.c:27:
> ./bgpd/bgp_trace.h:57:43: note: expected ‘struct peer_connection *’ but argument is of type ‘struct peer *’
>    57 |         TP_ARGS(struct peer_connection *, connection, struct stream *, pkt),
>       |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~

Use the appropriate connection parameter when calling the trace.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
bgpd/bgp_io.c

index 9e9251c85459ac0c4d8e6a92627d98b9ebf4a156..5d0f14cc5c966cc3a0d39650b920c5d9309c2261 100644 (file)
@@ -199,7 +199,7 @@ static int read_ibuf_work(struct peer_connection *connection)
        assert(ringbuf_get(ibw, pkt->data, pktsize) == pktsize);
        stream_set_endp(pkt, pktsize);
 
-       frrtrace(2, frr_bgp, packet_read, connection->peer, pkt);
+       frrtrace(2, frr_bgp, packet_read, connection, pkt);
        frr_with_mutex (&connection->io_mtx) {
                stream_fifo_push(connection->ibuf, pkt);
        }