mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-11 06:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

igmp related: renamed netif pointers from 'interface' to 'netif' to not use keywords (or at least my editor highlights it as one...)

Browse Source
This commit is contained in:
goldsimon 2010-01-28 18:42:40 +00:00
parent ea3b8f52d5
commit 32c16fad42
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/api_lib.c
View File

@ -538,7 +538,7 @@ netconn_close(struct netconn *conn)
* *
* @param conn the UDP netconn for which to change multicast addresses * @param conn the UDP netconn for which to change multicast addresses
* @param multiaddr IP address of the multicast group to join or leave * @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 * the igmp message
* @param join_or_leave flag whether to send a join- or leave-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 * @return ERR_OK if the action was taken, any err_t on error
@ -546,7 +546,7 @@ netconn_close(struct netconn *conn)
err_t err_t
netconn_join_leave_group(struct netconn *conn, netconn_join_leave_group(struct netconn *conn,
struct ip_addr *multiaddr, struct ip_addr *multiaddr,
struct ip_addr *interface, struct ip_addr *netif_addr,
enum netconn_igmp join_or_leave) enum netconn_igmp join_or_leave)
{ {
struct api_msg msg; struct api_msg msg;
@ -557,7 +557,7 @@ netconn_join_leave_group(struct netconn *conn,
msg.function = do_join_leave_group; msg.function = do_join_leave_group;
msg.msg.conn = conn; msg.msg.conn = conn;
msg.msg.msg.jl.multiaddr = multiaddr; 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; msg.msg.msg.jl.join_or_leave = join_or_leave;
err = TCPIP_APIMSG(&msg); err = TCPIP_APIMSG(&msg);

4
src/api/api_msg.c
View File

@ -1291,9 +1291,9 @@ do_join_leave_group(struct api_msg_msg *msg)
if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) { if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
#if LWIP_UDP #if LWIP_UDP
if (msg->msg.jl.join_or_leave == NETCONN_JOIN) { 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 { } 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 */ #endif /* LWIP_UDP */
#if (LWIP_TCP || LWIP_RAW) #if (LWIP_TCP || LWIP_RAW)

2
src/include/lwip/api.h
View File

@ -206,7 +206,7 @@ err_t netconn_close(struct netconn *conn);
#if LWIP_IGMP #if LWIP_IGMP
err_t netconn_join_leave_group(struct netconn *conn, struct ip_addr *multiaddr, 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 */ #endif /* LWIP_IGMP */
#if LWIP_DNS #if LWIP_DNS
err_t netconn_gethostbyname(const char *name, struct ip_addr *addr); err_t netconn_gethostbyname(const char *name, struct ip_addr *addr);

2
src/include/lwip/api_msg.h
View File

@ -93,7 +93,7 @@ struct api_msg_msg {
/** used for do_join_leave_group */ /** used for do_join_leave_group */
struct { struct {
struct ip_addr *multiaddr; struct ip_addr *multiaddr;
struct ip_addr *interface; struct ip_addr *netif_addr;
enum netconn_igmp join_or_leave; enum netconn_igmp join_or_leave;
} jl; } jl;
#endif /* LWIP_IGMP */ #endif /* LWIP_IGMP */