Re: [Minios-devel] [UNIKRAFT/LWIP PATCH 3/3] netinet/in.h: Add several missing IPV6 & IP defines and structures

["felipehuici ." <felipehuici@xxxxxxxxx>]

Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>

On Tue, Mar 31, 2020 at 4:40 PM Vlad-Andrei BĂDOIU
<vlad_andrei.badoiu@xxxxxxxxxxxxxxx> wrote:
>
> Our in.h header is missing several defines and structures. We
> import their definition from musl.
>
> Signed-off-by: Vlad-Andrei BĂDOIU <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
> ---
>  include/netinet/in.h | 112 ++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 111 insertions(+), 1 deletion(-)
>
> diff --git a/include/netinet/in.h b/include/netinet/in.h
> index 18ee075..00d7fd4 100644
> --- a/include/netinet/in.h
> +++ b/include/netinet/in.h
> @@ -2,7 +2,6 @@
>  #define _NETINET_IN_H_
>
>  #include <uk/config.h>
> -
>  #ifdef CONFIG_LWIP_SOCKET
>  #include <lwip/sockets.h>
>  /* Taken from musl's netinet/in.h */
> @@ -17,6 +16,104 @@
>  #include_next <netinet/in.h>
>  #endif
>
> +#define IP_ADD_SOURCE_MEMBERSHIP  39
> +#define IP_DROP_SOURCE_MEMBERSHIP 40
> +
> +#define MCAST_JOIN_GROUP   42
> +#define MCAST_BLOCK_SOURCE 43
> +#define MCAST_UNBLOCK_SOURCE      44
> +#define MCAST_LEAVE_GROUP  45
> +#define MCAST_JOIN_SOURCE_GROUP   46
> +#define MCAST_LEAVE_SOURCE_GROUP  47
> +#define MCAST_MSFILTER     48
> +
> +struct ip_mreq_source {
> +       struct in_addr imr_multiaddr;
> +       struct in_addr imr_interface;
> +       struct in_addr imr_sourceaddr;
> +};
> +
> +struct group_source_req {
> +       uint32_t gsr_interface;
> +       struct sockaddr_storage gsr_group;
> +       struct sockaddr_storage gsr_source;
> +};
> +
> +
> +#ifdef CONFIG_LWIP_IPV6
> +#define IPV6_ADDRFORM           1
> +#define IPV6_2292PKTINFO        2
> +#define IPV6_2292HOPOPTS        3
> +#define IPV6_2292DSTOPTS        4
> +#define IPV6_2292RTHDR          5
> +#define IPV6_2292PKTOPTIONS     6
> +#define IPV6_CHECKSUM           7
> +#define IPV6_2292HOPLIMIT       8
> +#define IPV6_NEXTHOP            9
> +#define IPV6_AUTHHDR            10
> +#define IPV6_UNICAST_HOPS       16
> +#define IPV6_MULTICAST_IF       17
> +#define IPV6_MULTICAST_HOPS     18
> +#define IPV6_MULTICAST_LOOP     19
> +#define IPV6_ROUTER_ALERT       22
> +#define IPV6_MTU_DISCOVER       23
> +#define IPV6_MTU                24
> +#define IPV6_RECVERR            25
> +#define IPV6_JOIN_ANYCAST       27
> +#define IPV6_LEAVE_ANYCAST      28
> +#define IPV6_MULTICAST_ALL      29
> +#define IPV6_ROUTER_ALERT_ISOLATE 30
> +#define IPV6_IPSEC_POLICY       34
> +#define IPV6_XFRM_POLICY        35
> +#define IPV6_HDRINCL            36
> +
> +#define IPV6_RECVPKTINFO        49
> +#define IPV6_PKTINFO            50
> +#define IPV6_RECVHOPLIMIT       51
> +#define IPV6_HOPLIMIT           52
> +#define IPV6_RECVHOPOPTS        53
> +#define IPV6_HOPOPTS            54
> +#define IPV6_RTHDRDSTOPTS       55
> +#define IPV6_RECVRTHDR          56
> +#define IPV6_RTHDR              57
> +#define IPV6_RECVDSTOPTS        58
> +#define IPV6_DSTOPTS            59
> +#define IPV6_RECVPATHMTU        60
> +#define IPV6_PATHMTU            61
> +#define IPV6_DONTFRAG           62
> +#define IPV6_RECVTCLASS         66
> +#define IPV6_TCLASS             67
> +#define IPV6_AUTOFLOWLABEL      70
> +#define IPV6_ADDR_PREFERENCES   72
> +#define IPV6_MINHOPCOUNT        73
> +#define IPV6_ORIGDSTADDR        74
> +#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
> +#define IPV6_TRANSPARENT        75
> +#define IPV6_UNICAST_IF         76
> +#define IPV6_RECVFRAGSIZE       77
> +#define IPV6_FREEBIND           78
> +
> +#define IPV6_PMTUDISC_DONT      0
> +#define IPV6_PMTUDISC_WANT      1
> +#define IPV6_PMTUDISC_DO        2
> +#define IPV6_PMTUDISC_PROBE     3
> +#define IPV6_PMTUDISC_INTERFACE 4
> +#define IPV6_PMTUDISC_OMIT      5
> +
> +#define IPV6_PREFER_SRC_TMP            0x0001
> +#define IPV6_PREFER_SRC_PUBLIC         0x0002
> +#define IPV6_PREFER_SRC_PUBTMP_DEFAULT 0x0100
> +#define IPV6_PREFER_SRC_COA            0x0004
> +#define IPV6_PREFER_SRC_HOME           0x0400
> +#define IPV6_PREFER_SRC_CGA            0x0008
> +#define IPV6_PREFER_SRC_NONCGA         0x0800
> +
> +#define IPV6_RTHDR_LOOSE        0
> +#define IPV6_RTHDR_STRICT       1
> +
> +#define IPV6_RTHDR_TYPE_0       0
> +#endif
> +
>  #define IN6_IS_ADDR_UNSPECIFIED(a) \
>          (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \
>           ((uint32_t *) (a))[2] == 0 && ((uint32_t *) (a))[3] == 0)
> @@ -68,4 +165,17 @@ struct ip_mreqn {
>  };
>  #endif /* defined(_GNU_SOURCE) || defined(_BSD_SOURCE) */
>
> +
> +#ifdef CONFIG_LWIP_IPV6
> +struct in6_pktinfo {
> +       struct in6_addr ipi6_addr;
> +       unsigned ipi6_ifindex;
> +};
> +
> +struct ip6_mtuinfo {
> +       struct sockaddr_in6 ip6m_addr;
> +       uint32_t ip6m_mtu;
> +};
> +#endif
> +
>  #endif /* _NETINET_IN_H_ */
> --
> 2.20.1
>
>
> _______________________________________________
> Minios-devel mailing list
> Minios-devel@xxxxxxxxxxxxxxxxxxxx
> https://lists.xenproject.org/mailman/listinfo/minios-devel

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel