github
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

extmod/modlwip.c: Codestyle whitespace changes. 

With MicroPython codestyle, with pointer casts, "*" packs with primary type
without space. Few other similar changes too (git diff -b -w is null).
pull/1545/head
Paul Sokolovsky 9 years ago
parent
a13d22f921
commit
76217064ac
1 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      extmod/modlwip.c

80
extmod/modlwip.c
View File

@ -65,11 +65,11 @@ typedef struct _lwip_slip_obj_t {
STATIC lwip_slip_obj_t lwip_slip_obj;
// Declare these early.
void mod_lwip_register_poll(void (* poll)(void *arg), void *poll_arg);
void mod_lwip_deregister_poll(void (* poll)(void *arg), void *poll_arg);
void mod_lwip_register_poll(void (*poll)(void *arg), void *poll_arg);
void mod_lwip_deregister_poll(void (*poll)(void *arg), void *poll_arg);
STATIC void slip_lwip_poll(void *netif) {
slipif_poll((struct netif *)netif);
slipif_poll((struct netif*)netif);
}
STATIC const mp_obj_type_t lwip_slip_type;
@ -206,13 +206,13 @@ typedef struct _lwip_socket_obj_t {
// Callback for incoming UDP packets. We simply stash the packet and the source address,
// in case we need it for recvfrom.
STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port) {
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
if (socket->incoming != NULL) {
// That's why they call it "unreliable". No room in the inn, drop the packet.
pbuf_free(p);
} else {
socket->incoming = (void *)p;
socket->incoming = (void*)p;
socket->peer_port = (mp_uint_t)port;
memcpy(&(socket->peer), addr, 4);
}
@ -220,7 +220,7 @@ STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p,
// Callback for general tcp errors.
STATIC void _lwip_tcp_error(void *arg, err_t err) {
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
// Pass the error code back via the connection variable.
socket->connected = err;
@ -230,7 +230,7 @@ STATIC void _lwip_tcp_error(void *arg, err_t err) {
// Callback for tcp connection requests. Error code err is unused. (See tcp.h)
STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
socket->connected = 2;
return ERR_OK;
@ -238,21 +238,21 @@ STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
// Callback for incoming tcp connections.
STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
if (socket->incoming != NULL) {
// We need to handle this better. This single-level structure makes the
// backlog setting kind of pointless. FIXME
return ERR_BUF;
} else {
socket->incoming = (void *)newpcb;
socket->incoming = (void*)newpcb;
return ERR_OK;
}
}
// Callback for inbound tcp packets.
STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) {
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
if (p == NULL) {
// Other side has closed connection.
@ -262,7 +262,7 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
// No room in the inn, let LWIP know it's still responsible for delivery later
return ERR_BUF;
}
socket->incoming = (void *)p;
socket->incoming = (void*)p;
return ERR_OK;
}
@ -301,11 +301,11 @@ STATIC mp_uint_t lwip_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
err_t err;
if (ip == NULL) {
err = udp_send((struct udp_pcb *)socket->pcb, p);
err = udp_send((struct udp_pcb*)socket->pcb, p);
} else {
ip_addr_t dest;
IP4_ADDR(&dest, ip[0], ip[1], ip[2], ip[3]);
err = udp_sendto((struct udp_pcb *)socket->pcb, p, &dest, port);
err = udp_sendto((struct udp_pcb*)socket->pcb, p, &dest, port);
}
pbuf_free(p);
@ -343,7 +343,7 @@ STATIC mp_uint_t lwip_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
*port = socket->peer_port;
}
struct pbuf *p = (struct pbuf *)socket->incoming;
struct pbuf *p = (struct pbuf*)socket->incoming;
u16_t result = pbuf_copy_partial(p, buf, ((p->tot_len > len) ? len : p->tot_len), 0);
pbuf_free(p);
@ -433,9 +433,9 @@ STATIC mp_obj_t lwip_socket_make_new(mp_obj_t type_in, mp_uint_t n_args,
}
switch (socket->type) {
case MOD_NETWORK_SOCK_STREAM: socket->pcb = (void *)tcp_new(); break;
case MOD_NETWORK_SOCK_DGRAM: socket->pcb = (void *)udp_new(); break;
//case MOD_NETWORK_SOCK_RAW: socket->pcb = (void *)raw_new(); break;
case MOD_NETWORK_SOCK_STREAM: socket->pcb = (void*)tcp_new(); break;
case MOD_NETWORK_SOCK_DGRAM: socket->pcb = (void*)udp_new(); break;
//case MOD_NETWORK_SOCK_RAW: socket->pcb = (void*)raw_new(); break;
default: nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
}
@ -446,15 +446,15 @@ STATIC mp_obj_t lwip_socket_make_new(mp_obj_t type_in, mp_uint_t n_args,
switch (socket->type) {
case MOD_NETWORK_SOCK_STREAM: {
// Register the socket object as our callback argument.
tcp_arg((struct tcp_pcb *)socket->pcb, (void *)socket);
tcp_arg((struct tcp_pcb*)socket->pcb, (void*)socket);
// Register our error callback.
tcp_err((struct tcp_pcb *)socket->pcb, _lwip_tcp_error);
tcp_err((struct tcp_pcb*)socket->pcb, _lwip_tcp_error);
break;
}
case MOD_NETWORK_SOCK_DGRAM: {
// Register our receive callback now. Since UDP sockets don't require binding or connection
// before use, there's no other good time to do it.
udp_recv((struct udp_pcb *)socket->pcb, _lwip_udp_incoming, (void *)socket);
udp_recv((struct udp_pcb*)socket->pcb, _lwip_udp_incoming, (void*)socket);
break;
}
}
@ -475,24 +475,24 @@ STATIC mp_obj_t lwip_socket_close(mp_obj_t self_in) {
}
switch (socket->type) {
case MOD_NETWORK_SOCK_STREAM: {
if (((struct tcp_pcb *)socket->pcb)->state == LISTEN) {
if (((struct tcp_pcb*)socket->pcb)->state == LISTEN) {
socket_is_listener = true;
}
if (tcp_close((struct tcp_pcb *)socket->pcb) != ERR_OK) {
tcp_abort((struct tcp_pcb *)socket->pcb);
if (tcp_close((struct tcp_pcb*)socket->pcb) != ERR_OK) {
tcp_abort((struct tcp_pcb*)socket->pcb);
}
break;
}
case MOD_NETWORK_SOCK_DGRAM: udp_remove((struct udp_pcb *)socket->pcb); break;
//case MOD_NETWORK_SOCK_RAW: raw_remove((struct raw_pcb *)socket->pcb); break;
case MOD_NETWORK_SOCK_DGRAM: udp_remove((struct udp_pcb*)socket->pcb); break;
//case MOD_NETWORK_SOCK_RAW: raw_remove((struct raw_pcb*)socket->pcb); break;
}
socket->pcb = NULL;
socket->connected = -16; // EBADF
if (socket->incoming != NULL) {
if (!socket_is_listener) {
pbuf_free((struct pbuf *)socket->incoming);
pbuf_free((struct pbuf*)socket->incoming);
} else {
tcp_abort((struct tcp_pcb *)socket->incoming);
tcp_abort((struct tcp_pcb*)socket->incoming);
}
socket->incoming = NULL;
}
@ -513,11 +513,11 @@ STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
err_t err = ERR_ARG;
switch (socket->type) {
case MOD_NETWORK_SOCK_STREAM: {
err = tcp_bind((struct tcp_pcb *)socket->pcb, &bind_addr, port);
err = tcp_bind((struct tcp_pcb*)socket->pcb, &bind_addr, port);
break;
}
case MOD_NETWORK_SOCK_DGRAM: {
err = udp_bind((struct udp_pcb *)socket->pcb, &bind_addr, port);
err = udp_bind((struct udp_pcb*)socket->pcb, &bind_addr, port);
break;
}
}
@ -541,11 +541,11 @@ STATIC mp_obj_t lwip_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EOPNOTSUPP)));
}
struct tcp_pcb *new_pcb = tcp_listen_with_backlog((struct tcp_pcb *)socket->pcb, (u8_t)backlog);
struct tcp_pcb *new_pcb = tcp_listen_with_backlog((struct tcp_pcb*)socket->pcb, (u8_t)backlog);
if (new_pcb == NULL) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOMEM)));
}
socket->pcb = (void *)new_pcb;
socket->pcb = (void*)new_pcb;
tcp_accept(new_pcb, _lwip_tcp_accept);
return mp_const_none;
@ -562,7 +562,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EOPNOTSUPP)));
}
// I need to do this because "tcp_accepted", later, is a macro.
struct tcp_pcb *listener = (struct tcp_pcb *)socket->pcb;
struct tcp_pcb *listener = (struct tcp_pcb*)socket->pcb;
if (listener->state != LISTEN) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
}
@ -599,16 +599,16 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
socket2->timeout = socket->timeout;
socket2->connected = 2;
socket2->leftover_count = 0;
tcp_arg((struct tcp_pcb *)socket2->pcb, (void *)socket2);
tcp_err((struct tcp_pcb *)socket2->pcb, _lwip_tcp_error);
tcp_recv((struct tcp_pcb *)socket2->pcb, _lwip_tcp_recv);
tcp_arg((struct tcp_pcb*)socket2->pcb, (void*)socket2);
tcp_err((struct tcp_pcb*)socket2->pcb, _lwip_tcp_error);
tcp_recv((struct tcp_pcb*)socket2->pcb, _lwip_tcp_recv);
tcp_accepted(listener);
// make the return value
uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
memcpy(ip, &(((struct tcp_pcb *)socket2->pcb)->remote_ip), 4);
mp_uint_t port = (mp_uint_t) ((struct tcp_pcb *)socket2->pcb)->remote_port;
memcpy(ip, &(((struct tcp_pcb*)socket2->pcb)->remote_ip), 4);
mp_uint_t port = (mp_uint_t)((struct tcp_pcb*)socket2->pcb)->remote_port;
mp_obj_tuple_t *client = mp_obj_new_tuple(2, NULL);
client->items[0] = socket2;
client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
@ -642,10 +642,10 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
}
}
// Register our recieve callback.
tcp_recv((struct tcp_pcb *)socket->pcb, _lwip_tcp_recv);
tcp_recv((struct tcp_pcb*)socket->pcb, _lwip_tcp_recv);
// Mark us as "connecting"
socket->connected = 1;
err = tcp_connect((struct tcp_pcb *)socket->pcb, &dest, port, _lwip_tcp_connected);
err = tcp_connect((struct tcp_pcb*)socket->pcb, &dest, port, _lwip_tcp_connected);
if (err != ERR_OK) {
socket->connected = 0;
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_lookup_table[-err])));
@ -674,7 +674,7 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
break;
}
case MOD_NETWORK_SOCK_DGRAM: {
err = udp_connect((struct udp_pcb *)socket->pcb, &dest, port);
err = udp_connect((struct udp_pcb*)socket->pcb, &dest, port);
break;
}
}

Write Preview
Loading…
Cancel
Save