3838#include " LWIPStack.h"
3939
4040#ifndef LWIP_SOCKET_MAX_MEMBERSHIPS
41- #define LWIP_SOCKET_MAX_MEMBERSHIPS 4
41+ #define LWIP_SOCKET_MAX_MEMBERSHIPS 4
4242#endif
4343
4444void LWIP::socket_callback (struct netconn *nc, enum netconn_evt eh, u16_t len)
@@ -54,8 +54,8 @@ void LWIP::socket_callback(struct netconn *nc, enum netconn_evt eh, u16_t len)
5454
5555 for (int i = 0 ; i < MEMP_NUM_NETCONN; i++) {
5656 if (lwip.arena [i].in_use
57- && lwip.arena [i].conn == nc
58- && lwip.arena [i].cb ) {
57+ && lwip.arena [i].conn == nc
58+ && lwip.arena [i].cb ) {
5959 lwip.arena [i].cb (lwip.arena [i].data );
6060 }
6161 }
@@ -101,15 +101,15 @@ static bool convert_mbed_addr_to_lwip(ip_addr_t *out, const nsapi_addr_t *in)
101101{
102102#if LWIP_IPV6
103103 if (in->version == NSAPI_IPv6) {
104- IP_SET_TYPE (out, IPADDR_TYPE_V6);
105- SMEMCPY (ip_2_ip6 (out), in->bytes , sizeof (ip6_addr_t ));
106- return true ;
104+ IP_SET_TYPE (out, IPADDR_TYPE_V6);
105+ SMEMCPY (ip_2_ip6 (out), in->bytes , sizeof (ip6_addr_t ));
106+ return true ;
107107 }
108108#if !LWIP_IPV4
109109 /* For bind() and other purposes, need to accept "null" of other type */
110110 /* (People use IPv4 0.0.0.0 as a general null) */
111111 if (in->version == NSAPI_UNSPEC ||
112- (in->version == NSAPI_IPv4 && all_zeros (in->bytes , 4 ))) {
112+ (in->version == NSAPI_IPv4 && all_zeros (in->bytes , 4 ))) {
113113 ip_addr_set_zero_ip6 (out);
114114 return true ;
115115 }
@@ -118,14 +118,14 @@ static bool convert_mbed_addr_to_lwip(ip_addr_t *out, const nsapi_addr_t *in)
118118
119119#if LWIP_IPV4
120120 if (in->version == NSAPI_IPv4) {
121- IP_SET_TYPE (out, IPADDR_TYPE_V4);
122- SMEMCPY (ip_2_ip4 (out), in->bytes , sizeof (ip4_addr_t ));
123- return true ;
121+ IP_SET_TYPE (out, IPADDR_TYPE_V4);
122+ SMEMCPY (ip_2_ip4 (out), in->bytes , sizeof (ip4_addr_t ));
123+ return true ;
124124 }
125125#if !LWIP_IPV6
126126 /* For symmetry with above, accept IPv6 :: as a general null */
127127 if (in->version == NSAPI_UNSPEC ||
128- (in->version == NSAPI_IPv6 && all_zeros (in->bytes , 16 ))) {
128+ (in->version == NSAPI_IPv6 && all_zeros (in->bytes , 16 ))) {
129129 ip_addr_set_zero_ip4 (out);
130130 return true ;
131131 }
@@ -273,7 +273,7 @@ nsapi_error_t LWIP::socket_open(nsapi_socket_t *handle, nsapi_protocol_t proto)
273273
274274#if LWIP_IPV6
275275 // Enable IPv6 (or dual-stack)
276- lwip_proto = (enum netconn_type) (lwip_proto | NETCONN_TYPE_IPV6);
276+ lwip_proto = (enum netconn_type)(lwip_proto | NETCONN_TYPE_IPV6);
277277#endif
278278
279279 s->conn = netconn_new_with_callback (lwip_proto, &LWIP::socket_callback);
@@ -485,15 +485,16 @@ nsapi_size_or_error_t LWIP::socket_recvfrom(nsapi_socket_t handle, SocketAddress
485485 return recv;
486486}
487487
488- int32_t LWIP::find_multicast_member (const struct mbed_lwip_socket *s, const nsapi_ip_mreq_t *imr) {
488+ int32_t LWIP::find_multicast_member (const struct mbed_lwip_socket *s, const nsapi_ip_mreq_t *imr)
489+ {
489490 uint32_t count = 0 ;
490491 uint32_t index = 0 ;
491492 // Set upper limit on while loop, should break out when the membership pair is found
492493 while (count < s->multicast_memberships_count ) {
493494 index = next_registered_multicast_member (s, index);
494495
495496 if (memcmp (&s->multicast_memberships [index].imr_multiaddr , &imr->imr_multiaddr , sizeof (nsapi_addr_t )) == 0 &&
496- memcmp (&s->multicast_memberships [index].imr_interface , &imr->imr_interface , sizeof (nsapi_addr_t )) == 0 ) {
497+ memcmp (&s->multicast_memberships [index].imr_interface , &imr->imr_interface , sizeof (nsapi_addr_t )) == 0 ) {
497498 return index;
498499 }
499500 count++;
@@ -522,15 +523,15 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co
522523 return NSAPI_ERROR_UNSUPPORTED;
523524 }
524525
525- s->conn ->pcb .tcp ->keep_idle = *(int *)optval;
526+ s->conn ->pcb .tcp ->keep_idle = *(int *)optval;
526527 return 0 ;
527528
528529 case NSAPI_KEEPINTVL:
529530 if (optlen != sizeof (int ) || NETCONNTYPE_GROUP (s->conn ->type ) != NETCONN_TCP) {
530531 return NSAPI_ERROR_UNSUPPORTED;
531532 }
532533
533- s->conn ->pcb .tcp ->keep_intvl = *(int *)optval;
534+ s->conn ->pcb .tcp ->keep_intvl = *(int *)optval;
534535 return 0 ;
535536#endif
536537
@@ -582,11 +583,11 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co
582583 if (optname == NSAPI_ADD_MEMBERSHIP) {
583584 if (!s->multicast_memberships ) {
584585 // First multicast join on this socket, allocate space for membership tracking
585- s->multicast_memberships = (nsapi_ip_mreq_t *)malloc (sizeof (nsapi_ip_mreq_t ) * LWIP_SOCKET_MAX_MEMBERSHIPS);
586+ s->multicast_memberships = (nsapi_ip_mreq_t *)malloc (sizeof (nsapi_ip_mreq_t ) * LWIP_SOCKET_MAX_MEMBERSHIPS);
586587 if (!s->multicast_memberships ) {
587588 return NSAPI_ERROR_NO_MEMORY;
588589 }
589- } else if (s->multicast_memberships_count == LWIP_SOCKET_MAX_MEMBERSHIPS) {
590+ } else if (s->multicast_memberships_count == LWIP_SOCKET_MAX_MEMBERSHIPS) {
590591 return NSAPI_ERROR_NO_MEMORY;
591592 }
592593
@@ -598,16 +599,16 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co
598599
599600 adaptation.lock ();
600601
601- #if LWIP_IPV4
602+ #if LWIP_IPV4
602603 if (IP_IS_V4 (&if_addr)) {
603604 igmp_err = igmp_joingroup (ip_2_ip4 (&if_addr), ip_2_ip4 (&multi_addr));
604605 }
605- #endif
606- #if LWIP_IPV6
606+ #endif
607+ #if LWIP_IPV6
607608 if (IP_IS_V6 (&if_addr)) {
608609 igmp_err = mld6_joingroup (ip_2_ip6 (&if_addr), ip_2_ip6 (&multi_addr));
609610 }
610- #endif
611+ #endif
611612
612613 adaptation.unlock ();
613614
@@ -626,22 +627,22 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co
626627
627628 adaptation.lock ();
628629
629- #if LWIP_IPV4
630+ #if LWIP_IPV4
630631 if (IP_IS_V4 (&if_addr)) {
631632 igmp_err = igmp_leavegroup (ip_2_ip4 (&if_addr), ip_2_ip4 (&multi_addr));
632633 }
633- #endif
634- #if LWIP_IPV6
634+ #endif
635+ #if LWIP_IPV6
635636 if (IP_IS_V6 (&if_addr)) {
636637 igmp_err = mld6_leavegroup (ip_2_ip6 (&if_addr), ip_2_ip6 (&multi_addr));
637638 }
638- #endif
639+ #endif
639640
640641 adaptation.unlock ();
641642 }
642643
643644 return err_remap (igmp_err);
644- }
645+ }
645646
646647 default :
647648 return NSAPI_ERROR_UNSUPPORTED;
@@ -662,7 +663,8 @@ void LWIP::socket_attach(nsapi_socket_t handle, void (*callback)(void *), void *
662663 s->data = data;
663664}
664665
665- LWIP &LWIP::get_instance () {
666+ LWIP &LWIP::get_instance ()
667+ {
666668 static LWIP lwip;
667669 return lwip;
668670}
@@ -672,7 +674,8 @@ LWIP &LWIP::get_instance() {
672674#define LWIP 0x11991199
673675#if MBED_CONF_NSAPI_DEFAULT_STACK == LWIP
674676#undef LWIP
675- OnboardNetworkStack &OnboardNetworkStack::get_default_instance () {
677+ OnboardNetworkStack &OnboardNetworkStack::get_default_instance ()
678+ {
676679 return LWIP::get_instance ();
677680}
678681#endif
0 commit comments