abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-05 14:04:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reformat api_msg.c using astylerc

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-09-17 17:42:30 +02:00
parent 30152cea78
commit 2b977a4a6a
1 changed files with 264 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/api/api_msg.c
View File

@ -90,17 +90,16 @@ const u8_t netconn_reset = 0;
const u8_t netconn_closed = 0; const u8_t netconn_closed = 0;
/** Translate an error to a unique void* passed via an mbox */ /** Translate an error to a unique void* passed via an mbox */
static void* static void *
lwip_netconn_err_to_msg(err_t err) lwip_netconn_err_to_msg(err_t err)
{ {
switch(err) switch (err) {
{
case ERR_ABRT: case ERR_ABRT:
return LWIP_CONST_CAST(void*, &netconn_aborted); return LWIP_CONST_CAST(void *, &netconn_aborted);
case ERR_RST: case ERR_RST:
return LWIP_CONST_CAST(void*, &netconn_reset); return LWIP_CONST_CAST(void *, &netconn_reset);
case ERR_CLSD: case ERR_CLSD:
return LWIP_CONST_CAST(void*, &netconn_closed); return LWIP_CONST_CAST(void *, &netconn_closed);
default: default:
LWIP_ASSERT("unhandled error", err == ERR_OK); LWIP_ASSERT("unhandled error", err == ERR_OK);
return NULL; return NULL;
@ -247,7 +246,7 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
#if LWIP_NETBUF_RECVINFO #if LWIP_NETBUF_RECVINFO
if (conn->flags & NETCONN_FLAG_PKTINFO) { if (conn->flags & NETCONN_FLAG_PKTINFO) {
/* get the UDP header - always in the first pbuf, ensured by udp_input */ /* get the UDP header - always in the first pbuf, ensured by udp_input */
const struct udp_hdr* udphdr = (const struct udp_hdr*)ip_next_header_ptr(); const struct udp_hdr *udphdr = (const struct udp_hdr *)ip_next_header_ptr();
buf->flags = NETBUF_FLAG_DESTADDR; buf->flags = NETBUF_FLAG_DESTADDR;
ip_addr_set(&buf->toaddr, ip_current_dest_addr()); ip_addr_set(&buf->toaddr, ip_current_dest_addr());
buf->toport_chksum = udphdr->dest; buf->toport_chksum = udphdr->dest;
@ -310,7 +309,7 @@ recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
msg = p; msg = p;
len = p->tot_len; len = p->tot_len;
} else { } else {
msg = LWIP_CONST_CAST(void*, &netconn_closed); msg = LWIP_CONST_CAST(void *, &netconn_closed);
len = 0; len = 0;
} }
@ -467,7 +466,7 @@ err_tcp(void *arg, err_t err)
SET_NONBLOCKING_CONNECT(conn, 0); SET_NONBLOCKING_CONNECT(conn, 0);
if (!was_nonblocking_connect) { if (!was_nonblocking_connect) {
sys_sem_t* op_completed_sem; sys_sem_t *op_completed_sem;
/* set error return code */ /* set error return code */
LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL); LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
if (old_state == NETCONN_CLOSE) { if (old_state == NETCONN_CLOSE) {
@ -563,7 +562,7 @@ accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
/* When returning != ERR_OK, the pcb is aborted in tcp_process(), /* When returning != ERR_OK, the pcb is aborted in tcp_process(),
so do nothing here! */ so do nothing here! */
/* remove all references to this netconn from the pcb */ /* remove all references to this netconn from the pcb */
struct tcp_pcb* pcb = newconn->pcb.tcp; struct tcp_pcb *pcb = newconn->pcb.tcp;
tcp_arg(pcb, NULL); tcp_arg(pcb, NULL);
tcp_recv(pcb, NULL); tcp_recv(pcb, NULL);
tcp_sent(pcb, NULL); tcp_sent(pcb, NULL);
@ -600,13 +599,13 @@ pcb_new(struct api_msg *msg)
#if LWIP_IPV6 && LWIP_IPV4 #if LWIP_IPV6 && LWIP_IPV4
/* IPv6: Dual-stack by default, unless netconn_set_ipv6only() is called */ /* IPv6: Dual-stack by default, unless netconn_set_ipv6only() is called */
if(NETCONNTYPE_ISIPV6(netconn_type(msg->conn))) { if (NETCONNTYPE_ISIPV6(netconn_type(msg->conn))) {
iptype = IPADDR_TYPE_ANY; iptype = IPADDR_TYPE_ANY;
} }
#endif #endif
/* Allocate a PCB for this connection */ /* Allocate a PCB for this connection */
switch(NETCONNTYPE_GROUP(msg->conn->type)) { switch (NETCONNTYPE_GROUP(msg->conn->type)) {
#if LWIP_RAW #if LWIP_RAW
case NETCONN_RAW: case NETCONN_RAW:
msg->conn->pcb.raw = raw_new_ip_type(iptype, msg->msg.n.proto); msg->conn->pcb.raw = raw_new_ip_type(iptype, msg->msg.n.proto);
@ -665,7 +664,7 @@ pcb_new(struct api_msg *msg)
void void
lwip_netconn_do_newconn(void *m) lwip_netconn_do_newconn(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
msg->err = ERR_OK; msg->err = ERR_OK;
if (msg->conn->pcb.tcp == NULL) { if (msg->conn->pcb.tcp == NULL) {
@ -687,7 +686,7 @@ lwip_netconn_do_newconn(void *m)
* @return a newly allocated struct netconn or * @return a newly allocated struct netconn or
* NULL on memory error * NULL on memory error
*/ */
struct netconn* struct netconn *
netconn_alloc(enum netconn_type t, netconn_callback callback) netconn_alloc(enum netconn_type t, netconn_callback callback)
{ {
struct netconn *conn; struct netconn *conn;
@ -704,7 +703,7 @@ netconn_alloc(enum netconn_type t, netconn_callback callback)
conn->pcb.tcp = NULL; conn->pcb.tcp = NULL;
/* If all sizes are the same, every compiler should optimize this switch to nothing */ /* If all sizes are the same, every compiler should optimize this switch to nothing */
switch(NETCONNTYPE_GROUP(t)) { switch (NETCONNTYPE_GROUP(t)) {
#if LWIP_RAW #if LWIP_RAW
case NETCONN_RAW: case NETCONN_RAW:
size = DEFAULT_RAW_RECVMBOX_SIZE; size = DEFAULT_RAW_RECVMBOX_SIZE;
@ -820,7 +819,7 @@ netconn_drain(struct netconn *conn)
if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP) { if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP) {
err_t err; err_t err;
if (!lwip_netconn_is_err_msg(mem, &err)) { if (!lwip_netconn_is_err_msg(mem, &err)) {
p = (struct pbuf*)mem; p = (struct pbuf *)mem;
/* pcb might be set to NULL already by err_tcp() */ /* pcb might be set to NULL already by err_tcp() */
if (conn->pcb.tcp != NULL) { if (conn->pcb.tcp != NULL) {
tcp_recved(conn->pcb.tcp, p->tot_len); tcp_recved(conn->pcb.tcp, p->tot_len);
@ -875,7 +874,7 @@ lwip_netconn_do_close_internal(struct netconn *conn WRITE_DELAYED_PARAM)
err_t err; err_t err;
u8_t shut, shut_rx, shut_tx, shut_close; u8_t shut, shut_rx, shut_tx, shut_close;
u8_t close_finished = 0; u8_t close_finished = 0;
struct tcp_pcb* tpcb; struct tcp_pcb *tpcb;
#if LWIP_SO_LINGER #if LWIP_SO_LINGER
u8_t linger_wait_required = 0; u8_t linger_wait_required = 0;
#endif /* LWIP_SO_LINGER */ #endif /* LWIP_SO_LINGER */
@ -1008,7 +1007,7 @@ lwip_netconn_do_close_internal(struct netconn *conn WRITE_DELAYED_PARAM)
} }
if (close_finished) { if (close_finished) {
/* Closing done (succeeded, non-memory error, nonblocking error or timeout) */ /* Closing done (succeeded, non-memory error, nonblocking error or timeout) */
sys_sem_t* op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg); sys_sem_t *op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
conn->current_msg->err = err; conn->current_msg->err = err;
conn->current_msg = NULL; conn->current_msg = NULL;
conn->state = NETCONN_NONE; conn->state = NETCONN_NONE;
@ -1065,7 +1064,7 @@ lwip_netconn_do_close_internal(struct netconn *conn WRITE_DELAYED_PARAM)
void void
lwip_netconn_do_delconn(void *m) lwip_netconn_do_delconn(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
enum netconn_state state = msg->conn->state; enum netconn_state state = msg->conn->state;
LWIP_ASSERT("netconn state error", /* this only happens for TCP netconns */ LWIP_ASSERT("netconn state error", /* this only happens for TCP netconns */
@ -1076,7 +1075,7 @@ lwip_netconn_do_delconn(void *m)
if ((state == NETCONN_WRITE) || if ((state == NETCONN_WRITE) ||
((state == NETCONN_CONNECT) && !IN_NONBLOCKING_CONNECT(msg->conn))) { ((state == NETCONN_CONNECT) && !IN_NONBLOCKING_CONNECT(msg->conn))) {
/* close requested, abort running write/connect */ /* close requested, abort running write/connect */
sys_sem_t* op_completed_sem; sys_sem_t *op_completed_sem;
LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL); LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL);
op_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg); op_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg);
msg->conn->current_msg->err = ERR_CLSD; msg->conn->current_msg->err = ERR_CLSD;
@ -1164,7 +1163,7 @@ lwip_netconn_do_delconn(void *m)
void void
lwip_netconn_do_bind(void *m) lwip_netconn_do_bind(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err; err_t err;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
@ -1204,8 +1203,8 @@ lwip_netconn_do_bind(void *m)
void void
lwip_netconn_do_bind_if(void *m) lwip_netconn_do_bind_if(void *m)
{ {
struct netif* netif; struct netif *netif;
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err; err_t err;
netif = netif_get_by_index(msg->msg.bc.if_idx); netif = netif_get_by_index(msg->msg.bc.if_idx);
@ -1251,7 +1250,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
{ {
struct netconn *conn; struct netconn *conn;
int was_blocking; int was_blocking;
sys_sem_t* op_completed_sem = NULL; sys_sem_t *op_completed_sem = NULL;
LWIP_UNUSED_ARG(pcb); LWIP_UNUSED_ARG(pcb);
@ -1298,7 +1297,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
void void
lwip_netconn_do_connect(void *m) lwip_netconn_do_connect(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err; err_t err;
if (msg->conn->pcb.tcp == NULL) { if (msg->conn->pcb.tcp == NULL) {
@ -1351,7 +1350,9 @@ lwip_netconn_do_connect(void *m)
break; break;
#endif /* LWIP_TCP */ #endif /* LWIP_TCP */
default: default:
LWIP_ERROR("Invalid netconn type", 0, do{ err = ERR_VAL; }while(0)); LWIP_ERROR("Invalid netconn type", 0, do {
err = ERR_VAL;
} while (0));
break; break;
} }
} }
@ -1371,7 +1372,7 @@ lwip_netconn_do_connect(void *m)
void void
lwip_netconn_do_disconnect(void *m) lwip_netconn_do_disconnect(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
#if LWIP_UDP #if LWIP_UDP
if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) { if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
@ -1395,13 +1396,13 @@ lwip_netconn_do_disconnect(void *m)
void void
lwip_netconn_do_listen(void *m) lwip_netconn_do_listen(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err; err_t err;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) { if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) {
if (msg->conn->state == NETCONN_NONE) { if (msg->conn->state == NETCONN_NONE) {
struct tcp_pcb* lpcb; struct tcp_pcb *lpcb;
if (msg->conn->pcb.tcp->state != CLOSED) { if (msg->conn->pcb.tcp->state != CLOSED) {
/* connection is not closed, cannot listen */ /* connection is not closed, cannot listen */
err = ERR_VAL; err = ERR_VAL;
@ -1455,8 +1456,7 @@ lwip_netconn_do_listen(void *m)
/* already listening, allow updating of the backlog */ /* already listening, allow updating of the backlog */
err = ERR_OK; err = ERR_OK;
tcp_backlog_set(msg->conn->pcb.tcp, msg->msg.lb.backlog); tcp_backlog_set(msg->conn->pcb.tcp, msg->msg.lb.backlog);
} } else {
else {
err = ERR_CONN; err = ERR_CONN;
} }
} else { } else {
@ -1479,7 +1479,7 @@ lwip_netconn_do_listen(void *m)
void void
lwip_netconn_do_send(void *m) lwip_netconn_do_send(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err = netconn_err(msg->conn); err_t err = netconn_err(msg->conn);
if (err == ERR_OK) { if (err == ERR_OK) {
@ -1536,7 +1536,7 @@ lwip_netconn_do_send(void *m)
void void
lwip_netconn_do_recv(void *m) lwip_netconn_do_recv(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
msg->err = ERR_OK; msg->err = ERR_OK;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
@ -1561,7 +1561,7 @@ lwip_netconn_do_recv(void *m)
void void
lwip_netconn_do_accepted(void *m) lwip_netconn_do_accepted(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
msg->err = ERR_OK; msg->err = ERR_OK;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
@ -1622,7 +1622,7 @@ lwip_netconn_do_writemore(struct netconn *conn WRITE_DELAYED_PARAM)
#endif /* LWIP_SO_SNDTIMEO */ #endif /* LWIP_SO_SNDTIMEO */
{ {
do { do {
dataptr = (const u8_t*)conn->current_msg->msg.w.vector->ptr + conn->current_msg->msg.w.vector_off; dataptr = (const u8_t *)conn->current_msg->msg.w.vector->ptr + conn->current_msg->msg.w.vector_off;
diff = conn->current_msg->msg.w.vector->len - conn->current_msg->msg.w.vector_off; diff = conn->current_msg->msg.w.vector->len - conn->current_msg->msg.w.vector_off;
if (diff > 0xffffUL) { /* max_u16_t */ if (diff > 0xffffUL) { /* max_u16_t */
len = 0xffff; len = 0xffff;
@ -1731,7 +1731,7 @@ err_mem:
if (write_finished) { if (write_finished) {
/* everything was written: set back connection state /* everything was written: set back connection state
and back to application task */ and back to application task */
sys_sem_t* op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg); sys_sem_t *op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
conn->current_msg->err = err; conn->current_msg->err = err;
conn->current_msg = NULL; conn->current_msg = NULL;
conn->state = NETCONN_NONE; conn->state = NETCONN_NONE;
@ -1760,7 +1760,7 @@ err_mem:
void void
lwip_netconn_do_write(void *m) lwip_netconn_do_write(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
err_t err = netconn_err(msg->conn); err_t err = netconn_err(msg->conn);
if (err == ERR_OK) { if (err == ERR_OK) {
@ -1814,7 +1814,7 @@ lwip_netconn_do_write(void *m)
void void
lwip_netconn_do_getaddr(void *m) lwip_netconn_do_getaddr(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
if (msg->conn->pcb.ip != NULL) { if (msg->conn->pcb.ip != NULL) {
if (msg->msg.ad.local) { if (msg->msg.ad.local) {
@ -1881,7 +1881,7 @@ lwip_netconn_do_getaddr(void *m)
void void
lwip_netconn_do_close(void *m) lwip_netconn_do_close(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
#if LWIP_TCP #if LWIP_TCP
enum netconn_state state = msg->conn->state; enum netconn_state state = msg->conn->state;
@ -1898,7 +1898,7 @@ lwip_netconn_do_close(void *m)
#if LWIP_NETCONN_FULLDUPLEX #if LWIP_NETCONN_FULLDUPLEX
if (msg->msg.sd.shut & NETCONN_SHUT_WR) { if (msg->msg.sd.shut & NETCONN_SHUT_WR) {
/* close requested, abort running write */ /* close requested, abort running write */
sys_sem_t* write_completed_sem; sys_sem_t *write_completed_sem;
LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL); LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL);
write_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg); write_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg);
msg->conn->current_msg->err = ERR_CLSD; msg->conn->current_msg->err = ERR_CLSD;
@ -1957,7 +1957,7 @@ lwip_netconn_do_close(void *m)
void void
lwip_netconn_do_join_leave_group(void *m) lwip_netconn_do_join_leave_group(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
msg->err = ERR_CONN; msg->err = ERR_CONN;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
@ -1972,8 +1972,7 @@ lwip_netconn_do_join_leave_group(void *m)
msg->err = mld6_leavegroup(ip_2_ip6(API_EXPR_REF(msg->msg.jl.netif_addr)), msg->err = mld6_leavegroup(ip_2_ip6(API_EXPR_REF(msg->msg.jl.netif_addr)),
ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr))); ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr)));
} }
} } else
else
#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */ #endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
{ {
#if LWIP_IGMP #if LWIP_IGMP
@ -2004,7 +2003,7 @@ lwip_netconn_do_join_leave_group(void *m)
void void
lwip_netconn_do_join_leave_group_netif(void *m) lwip_netconn_do_join_leave_group_netif(void *m)
{ {
struct api_msg *msg = (struct api_msg*)m; struct api_msg *msg = (struct api_msg *)m;
struct netif *netif; struct netif *netif;
netif = netif_get_by_index(msg->msg.jl.if_idx); netif = netif_get_by_index(msg->msg.jl.if_idx);
@ -2026,8 +2025,7 @@ lwip_netconn_do_join_leave_group_netif(void *m)
msg->err = mld6_leavegroup_netif(netif, msg->err = mld6_leavegroup_netif(netif,
ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr))); ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr)));
} }
} } else
else
#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */ #endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
{ {
#if LWIP_IGMP #if LWIP_IGMP
@ -2062,7 +2060,7 @@ done:
static void static void
lwip_netconn_do_dns_found(const char *name, const ip_addr_t *ipaddr, void *arg) lwip_netconn_do_dns_found(const char *name, const ip_addr_t *ipaddr, void *arg)
{ {
struct dns_api_msg *msg = (struct dns_api_msg*)arg; struct dns_api_msg *msg = (struct dns_api_msg *)arg;
/* we trust the internal implementation to be correct :-) */ /* we trust the internal implementation to be correct :-) */
LWIP_UNUSED_ARG(name); LWIP_UNUSED_ARG(name);
@ -2088,7 +2086,7 @@ lwip_netconn_do_dns_found(const char *name, const ip_addr_t *ipaddr, void *arg)
void void
lwip_netconn_do_gethostbyname(void *arg) lwip_netconn_do_gethostbyname(void *arg)
{ {
struct dns_api_msg *msg = (struct dns_api_msg*)arg; struct dns_api_msg *msg = (struct dns_api_msg *)arg;
u8_t addrtype = u8_t addrtype =
#if LWIP_IPV4 && LWIP_IPV6 #if LWIP_IPV4 && LWIP_IPV6
msg->dns_addrtype; msg->dns_addrtype;