net/atlas-probe/patches/006-Cast-sockaddr_in6-to-sockaddr-to-mute-compilation-wa.patch

   1 From dba9e1b7707c9cc9f5804b7a5cbda32a08e9e18f Mon Sep 17 00:00:00 2001
   2 From: Christian Marangi <ansuelsmth@gmail.com>
   3 Date: Mon, 17 Oct 2022 20:00:24 +0200
   4 Subject: [PATCH] Cast sockaddr_in6 to sockaddr to mute compilation warning
   5
   6 Cast sockaddr_in6 to sockaddr to mute compilation warning as
   7 documentation say for getsockname.
   8
   9 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  10 ---
  11  eperd/evtdig.c      |  3 ++-
  12  eperd/httpget.c     |  3 ++-
  13  eperd/ntp.c         |  4 ++--
  14  eperd/ping.c        | 12 ++++++++----
  15  eperd/sslgetcert.c  |  3 ++-
  16  eperd/traceroute.c  |  2 +-
  17  networking/rptra6.c |  2 +-
  18  7 files changed, 18 insertions(+), 11 deletions(-)
  19
  20 --- a/eperd/evtdig.c
  21 +++ b/eperd/evtdig.c
  22 @@ -1612,7 +1612,8 @@ static void tcp_connected(struct tu_env
  23         }
  24         else
  25         {
  26 -               getsockname(bufferevent_getfd(bev), &qry->loc_sin6, &qry->loc_socklen);
  27 +               getsockname(bufferevent_getfd(bev),
  28 +                       (struct sockaddr *)&qry->loc_sin6, &qry->loc_socklen);
  29                 if (qry->response_out)
  30                 {
  31                         write_response(qry->resp_file, RESP_SOCKNAME,
  32 --- a/eperd/httpget.c
  33 +++ b/eperd/httpget.c
  34 @@ -2103,7 +2103,8 @@ static void connected(struct tu_env *env
  35         else
  36         {
  37                 getsockname(bufferevent_getfd(bev),
  38 -                       &state->loc_sin6, &state->loc_socklen);
  39 +                       (struct sockaddr *)&state->loc_sin6,
  40 +                       &state->loc_socklen);
  41                 if (state->response_out)
  42                 {
  43                         write_response(state->resp_file, RESP_SOCKNAME,
  44 --- a/eperd/ntp.c
  45 +++ b/eperd/ntp.c
  46 @@ -1218,13 +1218,13 @@ static int create_socket(struct ntpstate
  47
  48                 len= sizeof(state->loc_sin6);
  49                 read_response(state->socket, RESP_SOCKNAME,
  50 -                       &len, &state->loc_sin6);
  51 +                       &len, (struct sockaddr *)&state->loc_sin6);
  52                 state->loc_socklen= len;
  53         }
  54         else
  55         {
  56                 if (getsockname(state->socket,
  57 -                       &state->loc_sin6,
  58 +                       (struct sockaddr*)&state->loc_sin6,
  59                         &state->loc_socklen) == -1)
  60                 {
  61                         crondlog(DIE9 "getsockname failed");
  62 --- a/eperd/ping.c
  63 +++ b/eperd/ping.c
  64 @@ -703,7 +703,8 @@ static void ping_xmit(struct pingstate *
  65                 }
  66                 else
  67                 {
  68 -                       getsockname(host->socket, &host->loc_sin6,
  69 +                       getsockname(host->socket,
  70 +                               (struct sockaddr *)&host->loc_sin6,
  71                                 &host->loc_socklen);
  72                         if (host->resp_file_out)
  73                         {
  74 @@ -735,7 +736,8 @@ static void ping_xmit(struct pingstate *
  75                         host->include_probe_id);
  76
  77                 host->loc_socklen= sizeof(host->loc_sin6);
  78 -               getsockname(host->socket, &host->loc_sin6, &host->loc_socklen);
  79 +               getsockname(host->socket, (struct sockaddr *)&host->loc_sin6,
  80 +                       &host->loc_socklen);
  81
  82                 if (host->response_in)
  83                 {
  84 @@ -1567,7 +1569,8 @@ static void ping_start2(void *state)
  85         }
  86
  87         if (!pingstate->response_in &&
  88 -               connect(pingstate->socket, &pingstate->sin6,
  89 +               connect(pingstate->socket,
  90 +               (struct sockaddr *)&pingstate->sin6,
  91                 pingstate->socklen) == -1)
  92         {
  93                 snprintf(line, sizeof(line),
  94 @@ -1592,7 +1595,8 @@ static void ping_start2(void *state)
  95         }
  96         else
  97         {
  98 -               getsockname(pingstate->socket, &pingstate->loc_sin6,
  99 +               getsockname(pingstate->socket,
 100 +                       (struct sockaddr *)&pingstate->loc_sin6,
 101                         &pingstate->loc_socklen);
 102                 if (pingstate->resp_file_out)
 103                 {
 104 --- a/eperd/sslgetcert.c
 105 +++ b/eperd/sslgetcert.c
 106 @@ -1801,7 +1801,8 @@ static void connected(struct tu_env *env
 107         else
 108         {
 109                 getsockname(bufferevent_getfd(bev),
 110 -                       &state->loc_sin6, &state->loc_socklen);
 111 +                       (struct sockaddr *)&state->loc_sin6,
 112 +                       &state->loc_socklen);
 113                 if (state->response_out)
 114                 {
 115                         write_response(state->resp_file, RESP_SOCKNAME,
 116 --- a/eperd/traceroute.c
 117 +++ b/eperd/traceroute.c
 118 @@ -4631,7 +4631,7 @@ static int create_socket(struct trtstate
 119         {
 120                 state->loc_socklen= sizeof(state->loc_sin6);
 121                 if (!state->response_in && getsockname(state->socket_icmp,
 122 -                       &state->loc_sin6,
 123 +                       (struct sockaddr *)&state->loc_sin6,
 124                         &state->loc_socklen) == -1)
 125                 {
 126                         crondlog(DIE9 "getsockname failed");
 127 --- a/networking/rptra6.c
 128 +++ b/networking/rptra6.c
 129 @@ -441,7 +441,7 @@ static int send_sol(int sock)
 130         inet_pton(AF_INET6, "FF02::2", &sin6.sin6_addr);
 131         sin6.sin6_family= AF_INET6;
 132
 133 -       sendto(sock, &pkt, sizeof(pkt), 0, &sin6, sizeof(sin6));
 134 +       sendto(sock, &pkt, sizeof(pkt), 0, (struct sockaddr*)&sin6, sizeof(sin6));
 135
 136         alarm(RTR_SOLICITATION_INTERVAL);
 137