mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2025-02-06 00:39:59 +00:00
igmp related: renamed netif pointers from 'interface' to 'netif' to not use keywords (or at least my editor highlights it as one...)
This commit is contained in:
parent
ea3b8f52d5
commit
32c16fad42
@ -538,7 +538,7 @@ netconn_close(struct netconn *conn)
|
||||
*
|
||||
* @param conn the UDP netconn for which to change multicast addresses
|
||||
* @param multiaddr IP address of the multicast group to join or leave
|
||||
* @param interface the IP address of the network interface on which to send
|
||||
* @param netif_addr the IP address of the network interface on which to send
|
||||
* the igmp message
|
||||
* @param join_or_leave flag whether to send a join- or leave-message
|
||||
* @return ERR_OK if the action was taken, any err_t on error
|
||||
@ -546,7 +546,7 @@ netconn_close(struct netconn *conn)
|
||||
err_t
|
||||
netconn_join_leave_group(struct netconn *conn,
|
||||
struct ip_addr *multiaddr,
|
||||
struct ip_addr *interface,
|
||||
struct ip_addr *netif_addr,
|
||||
enum netconn_igmp join_or_leave)
|
||||
{
|
||||
struct api_msg msg;
|
||||
@ -557,7 +557,7 @@ netconn_join_leave_group(struct netconn *conn,
|
||||
msg.function = do_join_leave_group;
|
||||
msg.msg.conn = conn;
|
||||
msg.msg.msg.jl.multiaddr = multiaddr;
|
||||
msg.msg.msg.jl.interface = interface;
|
||||
msg.msg.msg.jl.netif_addr = netif_addr;
|
||||
msg.msg.msg.jl.join_or_leave = join_or_leave;
|
||||
err = TCPIP_APIMSG(&msg);
|
||||
|
||||
|
@ -1291,9 +1291,9 @@ do_join_leave_group(struct api_msg_msg *msg)
|
||||
if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
|
||||
#if LWIP_UDP
|
||||
if (msg->msg.jl.join_or_leave == NETCONN_JOIN) {
|
||||
msg->err = igmp_joingroup(msg->msg.jl.interface, msg->msg.jl.multiaddr);
|
||||
msg->err = igmp_joingroup(msg->msg.jl.netif_addr, msg->msg.jl.multiaddr);
|
||||
} else {
|
||||
msg->err = igmp_leavegroup(msg->msg.jl.interface, msg->msg.jl.multiaddr);
|
||||
msg->err = igmp_leavegroup(msg->msg.jl.netif_addr, msg->msg.jl.multiaddr);
|
||||
}
|
||||
#endif /* LWIP_UDP */
|
||||
#if (LWIP_TCP || LWIP_RAW)
|
||||
|
@ -206,7 +206,7 @@ err_t netconn_close(struct netconn *conn);
|
||||
|
||||
#if LWIP_IGMP
|
||||
err_t netconn_join_leave_group(struct netconn *conn, struct ip_addr *multiaddr,
|
||||
struct ip_addr *interface, enum netconn_igmp join_or_leave);
|
||||
struct ip_addr *netif_addr, enum netconn_igmp join_or_leave);
|
||||
#endif /* LWIP_IGMP */
|
||||
#if LWIP_DNS
|
||||
err_t netconn_gethostbyname(const char *name, struct ip_addr *addr);
|
||||
|
@ -93,7 +93,7 @@ struct api_msg_msg {
|
||||
/** used for do_join_leave_group */
|
||||
struct {
|
||||
struct ip_addr *multiaddr;
|
||||
struct ip_addr *interface;
|
||||
struct ip_addr *netif_addr;
|
||||
enum netconn_igmp join_or_leave;
|
||||
} jl;
|
||||
#endif /* LWIP_IGMP */
|
||||
|
Loading…
x
Reference in New Issue
Block a user