mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-27 06:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug #25763: Corrected 4 occurrences of SMEMCPY to MEMCPY; corrected indentation

Browse Source
This commit is contained in:
goldsimon 2009-04-15 14:48:56 +00:00
parent 3587e8481d
commit b3a5d6df0d
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -19,6 +19,9 @@ HISTORY
++ New features:
2009-04-15 Simon Goldschmidt
* sockets.c, ppp.c: bug #25763: corrected 4 occurrences of SMEMCPY to MEMCPY
2009-04-15 Simon Goldschmidt
* sockets.c: bug #26121: set_errno can be overridden

22
src/api/sockets.c
View File

@ -285,17 +285,17 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
* not be NULL if addr is valid.
*/
if (NULL != addr) {
LWIP_ASSERT("addr valid but addrlen NULL", addrlen != NULL);
memset(&sin, 0, sizeof(sin));
sin.sin_len = sizeof(sin);
sin.sin_family = AF_INET;
sin.sin_port = htons(port);
sin.sin_addr.s_addr = naddr.addr;
LWIP_ASSERT("addr valid but addrlen NULL", addrlen != NULL);
memset(&sin, 0, sizeof(sin));
sin.sin_len = sizeof(sin);
sin.sin_family = AF_INET;
sin.sin_port = htons(port);
sin.sin_addr.s_addr = naddr.addr;
if (*addrlen > sizeof(sin))
*addrlen = sizeof(sin);
if (*addrlen > sizeof(sin))
*addrlen = sizeof(sin);
SMEMCPY(addr, &sin, *addrlen);
MEMCPY(addr, &sin, *addrlen);
}
newsock = alloc_socket(newconn);
@ -565,7 +565,7 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags,
*fromlen = sizeof(sin);
}
SMEMCPY(from, &sin, *fromlen);
MEMCPY(from, &sin, *fromlen);
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): addr=", s));
ip_addr_debug_print(SOCKETS_DEBUG, addr);
@ -1140,7 +1140,7 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local)
if (*namelen > sizeof(sin))
*namelen = sizeof(sin);
SMEMCPY(name, &sin, *namelen);
MEMCPY(name, &sin, *namelen);
sock_set_errno(sock, 0);
return 0;
}

2
src/netif/ppp/ppp.c
View File

@ -1056,7 +1056,7 @@ pppWriteOverEthernet(int pd, const u_char *s, int n)
pc->lastXMit = sys_jiffies();
SMEMCPY(pb->payload, s, n);
MEMCPY(pb->payload, s, n);
if(pppoe_xmit(pc->pppoe_sc, pb) != ERR_OK) {
LINK_STATS_INC(link.err);