udp: whitespace fixes
Subsystems (3)
PATCH 1/1 udp: whitespace fixes
The udp code is full of bad indenting, extra whitespace and other style confusion. It makes no sense to declare functions that are used outside the current file (extern) as inline.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/ipv4/udp.c | 402 ++++++++++++++++++++++++++++----------------------------- net/ipv6/udp.c | 175 +++++++++++++----------- 2 files changed, 295 insertions(+), 282 deletions(-)
net/ipv4/udp.c +200 -202
@@ -120,8 +120,8 @@struct hlist_node *node;sk_for_each (sk, node, &udptable[num & (UDP_HTABLE_SIZE -1 )]) -if (sk->sk_hash == num) -return 1 ; +if (sk->sk_hash == num) +return 1 ;return 0 ; }
@@ -136,13 +136,13 @@*/ int __udp_lib_get_port (struct sock *sk,unsigned short snum,struct hlist_head udptable[],int *port_rover, -int (*saddr_comp)(const struct sock *sk1, -const struct sock *sk2 ) ) +int (*saddr_comp) (const struct sock * sk1, +const struct sock * sk2)) {struct hlist_node *node;struct hlist_head *head;struct sock *sk2; -int error =1 ; +int error =1 ;write_lock_bh (&udp_hash_lock);if (snum ==0 ) {
@@ -160,8 +160,9 @@if (hlist_empty (head)) {if (result > sysctl_local_port_range[1 ]) result = sysctl_local_port_range[0 ] + - ((result - sysctl_local_port_range[0 ]) & - (UDP_HTABLE_SIZE -1 )); + ((result - + sysctl_local_port_range[0 ]) & + (UDP_HTABLE_SIZE -1 )); goto gotit; } size =0 ;
@@ -175,12 +176,13 @@ ; } result = best; -for (i =0 ; i < (1 <<16 ) /UDP_HTABLE_SIZE ; i++, result +=UDP_HTABLE_SIZE ) { +for (i =0 ; i < (1 <<16 ) /UDP_HTABLE_SIZE ; + i++, result +=UDP_HTABLE_SIZE ) {if (result > sysctl_local_port_range[1 ]) result = sysctl_local_port_range[0 ] - + ((result - sysctl_local_port_range[0 ]) & - (UDP_HTABLE_SIZE -1 )); -if (!__udp_lib_lport_inuse (result, udptable)) + + ((result - sysctl_local_port_range[0 ]) & + (UDP_HTABLE_SIZE -1 )); +if (!__udp_lib_lport_inuse (result, udptable))break ; }if (i >= (1 <<16 ) /UDP_HTABLE_SIZE )
@@ -191,13 +193,13 @@ head = &udptable[snum & (UDP_HTABLE_SIZE -1 )];sk_for_each (sk2, node, head) -if (sk2->sk_hash == snum && - sk2 != sk && - (!sk2->sk_reuse || !sk->sk_reuse) && - (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if - || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && - (*saddr_comp)(sk, sk2) ) - goto fail; +if (sk2->sk_hash == snum && + sk2 != sk && + (!sk2->sk_reuse || !sk->sk_reuse) && + (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if + || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && + (*saddr_comp) (sk, sk2)) + goto fail; }inet_sk (sk)->num = snum; sk->sk_hash = snum;
@@ -212,19 +214,19 @@return error; } -__inline__int udp_get_port (struct sock *sk,unsigned short snum, -int (*scmp)(const struct sock *,const struct sock *)) +int udp_get_port (struct sock *sk,unsigned short snum, +int (*scmp) (const struct sock *,const struct sock *)) { -return __udp_lib_get_port (sk, snum, udp_hash, &udp_port_rover, scmp); +return __udp_lib_get_port (sk, snum, udp_hash, &udp_port_rover, scmp); } -inline int ipv4_rcv_saddr_equal (const struct sock *sk1,const struct sock *sk2) +int ipv4_rcv_saddr_equal (const struct sock *sk1,const struct sock *sk2) { -struct inet_sock *inet1 =inet_sk (sk1), *inet2 =inet_sk (sk2); +const struct inet_sock *inet1 =inet_sk (sk1), *inet2 =inet_sk (sk2); -return ( !ipv6_only_sock (sk2) && - (!inet1->rcv_saddr || !inet2->rcv_saddr || - inet1->rcv_saddr == inet2->rcv_saddr )); +return !ipv6_only_sock (sk2) && + (!inet1->rcv_saddr || !inet2->rcv_saddr || + inet1->rcv_saddr == inet2->rcv_saddr); }static inline int udp_v4_get_port (struct sock *sk,unsigned short snum)
@@ -253,27 +255,27 @@if (inet->rcv_saddr) {if (inet->rcv_saddr != daddr)continue ; - score+=2 ; + score +=2 ; }if (inet->daddr) {if (inet->daddr != saddr)continue ; - score+=2 ; + score +=2 ; }if (inet->dport) {if (inet->dport != sport)continue ; - score+=2 ; + score +=2 ; }if (sk->sk_bound_dev_if) {if (sk->sk_bound_dev_if != dif)continue ; - score+=2 ; + score +=2 ; } -if (score ==9 ) { +if (score ==9 ) { result = sk;break ; - }else if (score > badness) { + }else if (score > badness) { result = sk; badness = score; }
@@ -297,11 +299,11 @@sk_for_each_from (s, node) {struct inet_sock *inet =inet_sk (s); -if (s->sk_hash != hnum || - (inet->daddr && inet->daddr != rmt_addr) || - (inet->dport != rmt_port && inet->dport) || - (inet->rcv_saddr && inet->rcv_saddr != loc_addr) || -ipv6_only_sock (s) || +if (s->sk_hash != hnum || + (inet->daddr && inet->daddr != rmt_addr) || + (inet->dport != rmt_port && inet->dport) || + (inet->rcv_saddr && inet->rcv_saddr != loc_addr) || +ipv6_only_sock (s) || (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))continue ;if (!ip_mc_sf_allow (s, loc_addr, rmt_addr, dif))
@@ -327,8 +329,8 @@void __udp4_lib_err (struct sk_buff *skb,u32 info,struct hlist_head udptable[]) {struct inet_sock *inet; -struct iphdr *iph = (struct iphdr *)skb->data; -struct udphdr *uh = (struct udphdr *)(skb->data+(iph->ihl<<2 )); +struct iphdr *iph = (struct iphdr *)skb->data; +struct udphdr *uh = (struct udphdr *)(skb->data + (iph->ihl <<2 ));int type = skb->h.icmph->type;int code = skb->h.icmph->code;struct sock *sk;
@@ -336,10 +338,10 @@int err; sk =__udp4_lib_lookup (iph->daddr, uh->dest, iph->saddr, uh->source, - skb->dev->ifindex, udptable ); + skb->dev->ifindex, udptable);if (sk ==NULL ) {ICMP_INC_STATS_BH (ICMP_MIB_INERRORS ); -return ;/* No socket for error */ +return ;/* No socket for error */ } err =0 ;
@@ -358,7 +360,7 @@ harderr =1 ;break ;case ICMP_DEST_UNREACH : -if (code ==ICMP_FRAG_NEEDED ) {/* Path MTU discovery */ +if (code ==ICMP_FRAG_NEEDED ) {/* Path MTU discovery */ if (inet->pmtudisc !=IP_PMTUDISC_DONT ) { err =EMSGSIZE ; harderr =1 ;
@@ -376,21 +378,21 @@/* * RFC1122: OK. Passes ICMP errors back to application, as per -* 4.1.3.3. +* 4.1.3.3. */ if (!inet->recverr) {if (!harderr || sk->sk_state !=TCP_ESTABLISHED ) goto out; }else { -ip_icmp_error (sk, skb, err, uh->dest, info, (u8 *)(uh+1 )); +ip_icmp_error (sk, skb, err, uh->dest, info, (u8 *) (uh +1 )); } sk->sk_err = err; sk->sk_error_report (sk); -out: + out:sock_put (sk); } -__inline__void udp_err (struct sk_buff *skb,u32 info) +void udp_err (struct sk_buff *skb,u32 info) {return __udp4_lib_err (skb, info, udp_hash); }
@@ -416,7 +418,7 @@* (checksum field must be zeroed out) */ static void udp4_hwcsum_outgoing (struct sock *sk,struct sk_buff *skb, -__be32 src,__be32 dst,int len ) +__be32 src,__be32 dst,int len) {unsigned int offset;struct udphdr *uh = skb->h.uh;
@@ -454,7 +456,7 @@*/ static int udp_push_pending_frames (struct sock *sk) { -struct udp_sock *up =udp_sk (sk); +struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk);struct flowi *fl = &inet->cork.fl;struct sk_buff *skb;
@@ -475,25 +477,26 @@ uh->len =htons (up->len); uh->check =0 ; -if (up->pcflag)/* UDP-Lite */ - csum =udplite_csum_outgoing (sk, skb); +if (up->pcflag)/* UDP-Lite */ + csum =udplite_csum_outgoing (sk, skb); -else if (sk->sk_no_check ==UDP_CSUM_NOXMIT ) {/* UDP csum disabled */ +else if (sk->sk_no_check ==UDP_CSUM_NOXMIT ) {/* UDP csum disabled */ skb->ip_summed =CHECKSUM_NONE ; goto send; - }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {/* UDP hardware csum */ + }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {/* UDP hardware csum */ -udp4_hwcsum_outgoing (sk, skb, fl->fl4_src,fl->fl4_dst, up->len); +udp4_hwcsum_outgoing (sk, skb, fl->fl4_src, fl->fl4_dst, + up->len); goto send; - }else /* `normal' UDP */ + }else /* `normal' UDP */ csum =udp_csum_outgoing (sk, skb);/* add protocol-dependent pseudo-header */ uh->check =csum_tcpudp_magic (fl->fl4_src, fl->fl4_dst, up->len, - sk->sk_protocol, csum ); + sk->sk_protocol, csum);if (uh->check ==0 ) uh->check =CSUM_MANGLED_0 ;
@@ -517,19 +520,19 @@int connected =0 ;__be32 daddr, faddr, saddr;__be16 dport; -u8 tos; +u8 tos;int err, is_udplite = up->pcflag; -int corkreq = up->corkflag || msg->msg_flags&MSG_MORE ; -int (*getfrag)(void *,char *,int ,int ,int ,struct sk_buff *); +int corkreq = up->corkflag || msg->msg_flags &MSG_MORE ; +int (*getfrag) (void *,char *,int ,int ,int ,struct sk_buff *);if (len >0xFFFF )return -EMSGSIZE ;/* -* Check the flags. +* Check the flags. */ -if (msg->msg_flags&MSG_OOB )/* Mirror BSD error message compatibility */ +if (msg->msg_flags &MSG_OOB )/* Mirror BSD error message compatibility */ return -EOPNOTSUPP ; ipc.opt =NULL ;
@@ -552,10 +555,10 @@ ulen +=sizeof (struct udphdr );/* -* Get and verify the address. +* Get and verify the address. */ if (msg->msg_name) { -struct sockaddr_in * usin = (struct sockaddr_in *)msg->msg_name; +struct sockaddr_in *usin = (struct sockaddr_in *)msg->msg_name;if (msg->msg_namelen <sizeof (*usin))return -EINVAL ;if (usin->sin_family !=AF_INET ) {
@@ -617,18 +620,17 @@ }if (connected) - rt = (struct rtable *)sk_dst_check (sk,0 ); + rt = (struct rtable *)sk_dst_check (sk,0 );if (rt ==NULL ) { -struct flowi fl = { .oif = ipc.oif, - .nl_u = { .ip4_u = - { .daddr = faddr, - .saddr = saddr, - .tos = tos } }, - .proto = sk->sk_protocol, - .uli_u = { .ports = - { .sport = inet->sport, - .dport = dport } } }; +struct flowi fl = {.oif = ipc.oif, + .nl_u = {.ip4_u = {.daddr = faddr, + .saddr = saddr, + .tos = tos}}, + .proto = sk->sk_protocol, + .uli_u = {.ports = {.sport = inet->sport, + .dport = dport}} + };security_sk_classify_flow (sk, &fl); err =ip_route_output_flow (&rt, &fl, sk,1 );if (err)
@@ -642,7 +644,7 @@sk_dst_set (sk,dst_clone (&rt->u.dst)); } -if (msg->msg_flags&MSG_CONFIRM ) +if (msg->msg_flags &MSG_CONFIRM ) goto do_confirm; back_from_confirm:
@@ -661,7 +663,7 @@ goto out; }/* -* Now cork the socket to pend data. +* Now cork the socket to pend data. */ inet->cork.fl.fl4_dst = daddr; inet->cork.fl.fl_ip_dport = dport;
@@ -671,10 +673,11 @@ do_append_data: up->len += ulen; - getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; + getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; err =ip_append_data (sk, getfrag, msg->msg_iov, ulen, -sizeof (struct udphdr ), &ipc, rt, - corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags); +sizeof (struct udphdr ), &ipc, rt, + corkreq ? msg->msg_flags |MSG_MORE : msg-> + msg_flags);if (err)udp_flush_pending_frames (sk);else if (!corkreq)
@@ -705,7 +708,7 @@ do_confirm:dst_confirm (&rt->u.dst); -if (!(msg->msg_flags&MSG_PROBE ) || len) +if (!(msg->msg_flags &MSG_PROBE ) || len) goto back_from_confirm; err =0 ; goto out;
@@ -718,7 +721,7 @@int ret;if (!up->pending) { -struct msghdr msg = { .msg_flags = flags|MSG_MORE }; +struct msghdr msg = {.msg_flags = flags |MSG_MORE };/* Call udp_sendmsg to specify destination address which * sendpage interface can't pass.
@@ -750,7 +753,7 @@ } up->len += size; -if (!(up->corkflag || (flags&MSG_MORE ))) +if (!(up->corkflag || (flags &MSG_MORE ))) ret =udp_push_pending_frames (sk);if (!ret) ret = size;
@@ -765,15 +768,14 @@int udp_ioctl (struct sock *sk,int cmd,unsigned long arg) { -switch (cmd) - { -case SIOCOUTQ : +switch (cmd) { +case SIOCOUTQ : {int amount =atomic_read (&sk->sk_wmem_alloc);return put_user (amount, (int __user *)arg); } -case SIOCINQ : +case SIOCINQ : {struct sk_buff *skb;unsigned long amount;
@@ -793,10 +795,10 @@return put_user (amount, (int __user *)arg); } -default : -return -ENOIOCTLCMD ; +default : +return -ENOIOCTLCMD ; } -return (0 ); +return 0 ; }/*
@@ -813,10 +815,10 @@int copied, err, copy_only, is_udplite =IS_UDPLITE (sk);/* -* Check any passed addresses +* Check any passed addresses */ if (addr_len) - *addr_len=sizeof (*sin); + *addr_len =sizeof (*sin);if (flags &MSG_ERRQUEUE )return ip_recv_error (sk, msg, len);
@@ -833,15 +835,15 @@ }/* -* Decide whether to checksum and/or copy data. +* Decide whether to checksum and/or copy data. * -* UDP: checksum may have been computed in HW, -* (re-)compute it if message is truncated. -* UDP-Lite: always needs to checksum, no HW support. +* UDP: checksum may have been computed in HW, +* (re-)compute it if message is truncated. +* UDP-Lite: always needs to checksum, no HW support. */ - copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY ); + copy_only = (skb->ip_summed ==CHECKSUM_UNNECESSARY ); -if (is_udplite || (!copy_only && msg->msg_flags&MSG_TRUNC )) { +if (is_udplite || (!copy_only && msg->msg_flags &MSG_TRUNC )) {if (__udp_lib_checksum_complete (skb)) goto csum_copy_err; copy_only =1 ;
@@ -849,10 +851,10 @@if (copy_only) err =skb_copy_datagram_iovec (skb,sizeof (struct udphdr ), - msg->msg_iov, copied ); + msg->msg_iov, copied);else { - err =skb_copy_and_csum_datagram_iovec (skb,sizeof (struct udphdr ), msg->msg_iov); - + err =skb_copy_and_csum_datagram_iovec (skb,sizeof (struct udphdr ), + msg->msg_iov);if (err == -EINVAL ) goto csum_copy_err; }
@@ -863,13 +865,13 @@sock_recv_timestamp (msg, sk, skb);/* Copy the address. */ -if (sin) - { +if (sin) { sin->sin_family =AF_INET ; sin->sin_port = skb->h.uh->source; sin->sin_addr.s_addr = skb->nh.iph->saddr;memset (sin->sin_zero,0 ,sizeof (sin->sin_zero)); } +if (inet->cmsg_flags)ip_cmsg_recv (msg, skb);
@@ -892,12 +894,11 @@ goto try_again; } -int udp_disconnect (struct sock *sk,int flags) {struct inet_sock *inet =inet_sk (sk);/* -* 1003.1g - break association. +* 1003.1g - break association. */ sk->sk_state =TCP_CLOSE ;
@@ -920,7 +921,7 @@* 0 if we should drop this packet * -1 if it should get processed by xfrm4_rcv_encap */ -static int udp_encap_rcv (struct sock * sk,struct sk_buff *skb) +static int udp_encap_rcv (struct sock *sk,struct sk_buff *skb) {#ifndef CONFIG_XFRM return 1 ;
@@ -950,8 +951,8 @@/* Now we can get the pointers */ uh = skb->h.uh; - udpdata = (__u8 *)uh +sizeof (struct udphdr ); - udpdata32 = (__be32 *)udpdata; + udpdata = (__u8 *) uh +sizeof (struct udphdr ); + udpdata32 = (__be32 *) udpdata;switch (encap_type) {default :
@@ -959,7 +960,7 @@/* Check if this is a keepalive packet. If so, eat it. */ if (len ==1 && udpdata[0 ] ==0xff ) {return 0 ; - }else if (len >sizeof (struct ip_esp_hdr ) && udpdata32[0 ] !=0 ) { + }else if (len >sizeof (struct ip_esp_hdr ) && udpdata32[0 ] !=0 ) {/* ESP Packet without Non-ESP header */ len =sizeof (struct udphdr ); }else
@@ -1020,13 +1021,13 @@* Note that in the success and error cases, the skb is assumed to * have either been requeued or freed. */ -int udp_queue_rcv_skb (struct sock * sk,struct sk_buff *skb) +int udp_queue_rcv_skb (struct sock *sk,struct sk_buff *skb) {struct udp_sock *up =udp_sk (sk);int rc;/* -* Charge it to the socket, dropping if the queue is full. +* Charge it to the socket, dropping if the queue is full. */ if (!xfrm4_policy_check (sk,XFRM_POLICY_IN , skb)) goto drop;
@@ -1060,9 +1061,9 @@ }/* -* UDP-Lite specific tests, ignored on UDP sockets +* UDP-Lite specific tests, ignored on UDP sockets */ -if ((up->pcflag &UDPLITE_RECV_CC ) &&UDP_SKB_CB (skb)->partial_cov) { +if ((up->pcflag &UDPLITE_RECV_CC ) &&UDP_SKB_CB (skb)->partial_cov) {/* * MIB statistics other than incrementing the error count are
@@ -1075,10 +1076,10 @@* delivery of packets with coverage values less than a value * provided by the application." */ -if (up->pcrlen ==0 ) {/* full coverage was set */ +if (up->pcrlen ==0 ) {/* full coverage was set */ LIMIT_NETDEBUG (KERN_WARNING "UDPLITE: partial coverage " -"%d while full coverage %d requested\n" , -UDP_SKB_CB (skb)->cscov, skb->len); +"%d while full coverage %d requested\n" , +UDP_SKB_CB (skb)->cscov, skb->len); goto drop; }/* The next case involves violating the min. coverage requested
@@ -1087,10 +1088,10 @@* that it wants x while sender emits packets of smaller size y. * Therefore the above ...()->partial_cov statement is essential. */ -if (UDP_SKB_CB (skb)->cscov < up->pcrlen) { +if (UDP_SKB_CB (skb)->cscov < up->pcrlen) {LIMIT_NETDEBUG (KERN_WARNING -"UDPLITE: coverage %d too small, need min %d\n" , -UDP_SKB_CB (skb)->cscov, up->pcrlen); +"UDPLITE: coverage %d too small, need min %d\n" , +UDP_SKB_CB (skb)->cscov, up->pcrlen); goto drop; } }
@@ -1101,7 +1102,7 @@ skb->ip_summed =CHECKSUM_UNNECESSARY ; } -if ((rc =sock_queue_rcv_skb (sk,skb)) <0 ) { +if ((rc =sock_queue_rcv_skb (sk, skb)) <0 ) {/* Note that an ENOMEM error is charged twice */ if (rc == -ENOMEM )UDP_INC_STATS_BH (UDP_MIB_RCVBUFERRORS , up->pcflag);
@@ -1124,7 +1125,7 @@* so we don't need to lock the hashes. */ static int __udp4_lib_mcast_deliver (struct sk_buff *skb, -struct udphdr *uh, +struct udphdr *uh,__be32 saddr,__be32 daddr,struct hlist_head udptable[]) {
@@ -1143,10 +1144,10 @@ sknext =udp_v4_mcast_next (sk_next (sk), uh->dest, daddr, uh->source, saddr, dif); -if (sknext) +if (sknext) skb1 =skb_clone (skb,GFP_ATOMIC ); -if (skb1) { +if (skb1) {int ret =udp_queue_rcv_skb (sk, skb1);if (ret >0 )/* we should probably re-process instead
@@ -1154,7 +1155,7 @@kfree_skb (skb1); } sk = sknext; - }while (sknext); + }while (sknext); }else kfree_skb (skb);read_unlock (&udp_hash_lock);
@@ -1171,8 +1172,8 @@if (uh->check ==0 ) { skb->ip_summed =CHECKSUM_UNNECESSARY ; }else if (skb->ip_summed ==CHECKSUM_COMPLETE ) { -if (!csum_tcpudp_magic (skb->nh.iph->saddr, skb->nh.iph->daddr, - skb->len,IPPROTO_UDP , skb->csum )) +if (!csum_tcpudp_magic (skb->nh.iph->saddr, skb->nh.iph->daddr, + skb->len,IPPROTO_UDP , skb->csum)) skb->ip_summed =CHECKSUM_UNNECESSARY ; }if (skb->ip_summed !=CHECKSUM_UNNECESSARY )
@@ -1197,7 +1198,7 @@struct sock *sk;struct udphdr *uh = skb->h.uh;unsigned short ulen; -struct rtable *rt = (struct rtable *)skb->dst; +struct rtable *rt = (struct rtable *)skb->dst;__be32 saddr = skb->nh.iph->saddr;__be32 daddr = skb->nh.iph->daddr;
@@ -1205,29 +1206,30 @@* Validate the packet. */ if (!pskb_may_pull (skb,sizeof (struct udphdr ))) - goto drop;/* No space for header. */ + goto drop;/* No space for header. */ ulen =ntohs (uh->len);if (ulen > skb->len) goto short_packet; -if (! is_udplite ) {/* UDP validates ulen. */ +if (!is_udplite) {/* UDP validates ulen. */ if (ulen <sizeof (*uh) ||pskb_trim_rcsum (skb, ulen)) goto short_packet;udp4_csum_init (skb, uh); - }else {/* UDP-Lite validates cscov. */ + }else {/* UDP-Lite validates cscov. */ if (udplite4_csum_init (skb, uh)) goto csum_error; } -if (rt->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) -return __udp4_lib_mcast_deliver (skb, uh, saddr, daddr, udptable); +if (rt->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) +return __udp4_lib_mcast_deliver (skb, uh, saddr, daddr, + udptable); sk =__udp4_lib_lookup (saddr, uh->source, daddr, uh->dest, - skb->dev->ifindex, udptable ); + skb->dev->ifindex, udptable);if (sk !=NULL ) {int ret =udp_queue_rcv_skb (sk, skb);
@@ -1257,16 +1259,13 @@* don't wanna listen. Ignore it. */ kfree_skb (skb); -return (0 ); +return 0 ; short_packet: -LIMIT_NETDEBUG (KERN_DEBUG "UDP%s: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n" , - is_udplite?"-Lite" :"" , -NIPQUAD (saddr), -ntohs (uh->source), - ulen, - skb->len, -NIPQUAD (daddr), +LIMIT_NETDEBUG (KERN_DEBUG +"UDP%s: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n" , + is_udplite ?"-Lite" :"" ,NIPQUAD (saddr), +ntohs (uh->source), ulen, skb->len,NIPQUAD (daddr),ntohs (uh->dest)); goto drop;
@@ -1275,20 +1274,18 @@* RFC1122: OK. Discards the bad packet silently (as far as * the network is concerned, anyway) as per 4.1.3.4 (MUST). */ -LIMIT_NETDEBUG (KERN_DEBUG "UDP%s: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n" , - is_udplite?"-Lite" :"" , -NIPQUAD (saddr), -ntohs (uh->source), -NIPQUAD (daddr), -ntohs (uh->dest), +LIMIT_NETDEBUG (KERN_DEBUG +"UDP%s: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n" , + is_udplite ?"-Lite" :"" ,NIPQUAD (saddr), +ntohs (uh->source),NIPQUAD (daddr),ntohs (uh->dest), ulen); drop:UDP_INC_STATS_BH (UDP_MIB_INERRORS , is_udplite);kfree_skb (skb); -return (0 ); +return 0 ; } -__inline__int udp_rcv (struct sk_buff *skb) +int udp_rcv (struct sk_buff *skb) {return __udp4_lib_rcv (skb, udp_hash,0 ); }
@@ -1305,27 +1302,27 @@* Socket option code for UDP */ int udp_lib_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen, -int (*push_pending_frames)(struct sock *)) +char __user * optval,int optlen, +int (*push_pending_frames) (struct sock *)) {struct udp_sock *up =udp_sk (sk);int val;int err =0 ; -if (optlen<sizeof (int )) +if (optlen <sizeof (int ))return -EINVAL ;if (get_user (val, (int __user *)optval))return -EFAULT ; -switch (optname) { +switch (optname) {case UDP_CORK :if (val !=0 ) { up->corkflag =1 ; }else { up->corkflag =0 ;lock_sock (sk); - (*push_pending_frames)(sk); + (*push_pending_frames) (sk);release_sock (sk); }break ;
@@ -1343,27 +1340,27 @@ }break ; -/* -* UDP-Lite's partial checksum coverage (RFC 3828). -*/ -/* The sender sets actual checksum coverage length via this option. -* The case coverage > packet length is handled by send module. */ +/* +* UDP-Lite's partial checksum coverage (RFC 3828). +*/ +/* The sender sets actual checksum coverage length via this option. +* The case coverage > packet length is handled by send module. */ case UDPLITE_SEND_CSCOV : -if (!up->pcflag)/* Disable the option on UDP sockets */ +if (!up->pcflag)/* Disable the option on UDP sockets */ return -ENOPROTOOPT ; -if (val !=0 && val <8 )/* Illegal coverage: use default (8) */ +if (val !=0 && val <8 )/* Illegal coverage: use default (8) */ val =8 ; up->pcslen = val; up->pcflag |=UDPLITE_SEND_CC ;break ; -/* The receiver specifies a minimum checksum coverage value. To make -* sense, this should be set to at least 8 (as done below). If zero is -* used, this again means full checksum coverage. */ +/* The receiver specifies a minimum checksum coverage value. To make +* sense, this should be set to at least 8 (as done below). If zero is +* used, this again means full checksum coverage. */ case UDPLITE_RECV_CSCOV : -if (!up->pcflag)/* Disable the option on UDP sockets */ +if (!up->pcflag)/* Disable the option on UDP sockets */ return -ENOPROTOOPT ; -if (val !=0 && val <8 )/* Avoid silly minimal values. */ +if (val !=0 && val <8 )/* Avoid silly minimal values. */ val =8 ; up->pcrlen = val; up->pcflag |=UDPLITE_RECV_CC ;
@@ -1372,15 +1369,15 @@default : err = -ENOPROTOOPT ;break ; - }; + }return err; }int udp_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user * optval,int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);return ip_setsockopt (sk, level, optname, optval, optlen);
@@ -1388,9 +1385,9 @@#ifdef CONFIG_COMPAT int compat_udp_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user * optval,int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);return compat_ip_setsockopt (sk, level, optname, optval, optlen);
@@ -1398,20 +1395,20 @@#endif int udp_lib_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) {struct udp_sock *up =udp_sk (sk);int val, len; -if (get_user (len,optlen)) +if (get_user (len, optlen))return -EFAULT ; len = min_t(unsigned int, len, sizeof(int)); -if (len <0 ) +if (len <0 )return -EINVAL ; -switch (optname) { +switch (optname) {case UDP_CORK : val = up->corkflag;break ;
@@ -1420,8 +1417,8 @@ val = up->encap_type;break ; -/* The following two cannot be changed on UDP sockets, the return is -* always 0 (which corresponds to the full checksum coverage of UDP). */ +/* The following two cannot be changed on UDP sockets, the return is +* always 0 (which corresponds to the full checksum coverage of UDP). */ case UDPLITE_SEND_CSCOV : val = up->pcslen;break ;
@@ -1432,28 +1429,28 @@default :return -ENOPROTOOPT ; - }; + } -if (put_user (len, optlen)) +if (put_user (len, optlen))return -EFAULT ; -if (copy_to_user (optval, &val,len)) +if (copy_to_user (optval, &val, len))return -EFAULT ;return 0 ; }int udp_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_getsockopt (sk, level, optname, optval, optlen);return ip_getsockopt (sk, level, optname, optval, optlen); }#ifdef CONFIG_COMPAT int compat_udp_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_getsockopt (sk, level, optname, optval, optlen);return compat_ip_getsockopt (sk, level, optname, optval, optlen); }
@@ -1471,16 +1468,16 @@* but then block when reading it. Add special case code * to work around these arguably broken applications. */ -unsigned int udp_poll (struct file *file,struct socket *sock,poll_table *wait) +unsigned int udp_poll (struct file *file,struct socket *sock,poll_table * wait) {unsigned int mask =datagram_poll (file, sock, wait);struct sock *sk = sock->sk; -int is_lite =IS_UDPLITE (sk); +int is_lite =IS_UDPLITE (sk);/* Check for false positives due to checksum errors */ -if ( (mask &POLLRDNORM ) && - !(file->f_flags &O_NONBLOCK ) && - !(sk->sk_shutdown &RCV_SHUTDOWN )){ +if ((mask &POLLRDNORM ) && + !(file->f_flags &O_NONBLOCK ) && + !(sk->sk_shutdown &RCV_SHUTDOWN )) {struct sk_buff_head *rcvq = &sk->sk_receive_queue;struct sk_buff *skb;
@@ -1538,7 +1535,8 @@struct sock *sk;struct udp_iter_state *state = seq->private; -for (state->bucket =0 ; state->bucket <UDP_HTABLE_SIZE ; ++state->bucket) { +for (state->bucket =0 ; state->bucket <UDP_HTABLE_SIZE ; + ++state->bucket) {struct hlist_node *node;sk_for_each (sk, node, state->hashtable + state->bucket) {if (sk->sk_family == state->family)
@@ -1556,7 +1554,7 @@do { sk =sk_next (sk); -try_again: + try_again: ; }while (sk && sk->sk_family != state->family);
@@ -1572,22 +1570,22 @@struct sock *sk =udp_get_first (seq);if (sk) -while (pos && (sk =udp_get_next (seq, sk)) !=NULL ) +while (pos && (sk =udp_get_next (seq, sk)) !=NULL ) --pos;return pos ?NULL : sk; } -static void *udp_seq_start (struct seq_file *seq,loff_t *pos) +static void *udp_seq_start (struct seq_file *seq,loff_t * pos) {read_lock (&udp_hash_lock); -return *pos ?udp_get_idx (seq, *pos-1 ) : (void *)1 ; +return *pos ?udp_get_idx (seq, *pos -1 ) :SEQ_START_TOKEN ; } -static void *udp_seq_next (struct seq_file *seq,void *v,loff_t *pos) +static void *udp_seq_next (struct seq_file *seq,void *v,loff_t * pos) {struct sock *sk; -if (v == (void *)1 ) +if (v ==SEQ_START_TOKEN ) sk =udp_get_idx (seq,0 );else sk =udp_get_next (seq, v);
@@ -1621,7 +1619,7 @@if (rc) goto out_kfree; - seq = file->private_data; + seq = file->private_data; seq->private = s; out:return rc;
@@ -1638,11 +1636,11 @@if (!afinfo)return -EINVAL ; - afinfo->seq_fops->owner = afinfo->owner; - afinfo->seq_fops->open = udp_seq_open; - afinfo->seq_fops->read = seq_read; - afinfo->seq_fops->llseek = seq_lseek; - afinfo->seq_fops->release = seq_release_private; + afinfo->seq_fops->owner = afinfo->owner; + afinfo->seq_fops->open = udp_seq_open; + afinfo->seq_fops->read = seq_read; + afinfo->seq_fops->llseek = seq_lseek; + afinfo->seq_fops->release = seq_release_private; p =proc_net_fops_create (afinfo->name,S_IRUGO , afinfo->seq_fops);if (p)
@@ -1665,9 +1663,9 @@ {struct inet_sock *inet =inet_sk (sp);__be32 dest = inet->daddr; -__be32 src = inet->rcv_saddr; -__u16 destp =ntohs (inet->dport); -__u16 srcp =ntohs (inet->sport); +__be32 src = inet->rcv_saddr; +__u16 destp =ntohs (inet->dport); +__u16 srcp =ntohs (inet->sport); sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X" " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p",
net/ipv6/udp.c +95 -80
507 lines not on this page · raw message
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Fri, 2 Mar 2007 14:04:49 -0800
Quoted 14 lines
The udp code is full of bad indenting, extra whitespace and other style confusion. It makes no sense to declare functions that are used outside the current file (extern) as inline.
Signed-off-by Stephen Hemminger <[email protected]>--- net/ipv4/udp.c | 402 ++++++++++++++++++++++++++++----------------------------- net/ipv6/udp.c | 175 +++++++++++++----------- 2 files changed, 295 insertions(+), 282 deletions(-)
net/ipv4/udp.c line 124
Quoted 7 lines
net/ipv4/udp.c +2
-2@@ -120,8 +120,8 @@struct hlist_node *node;sk_for_each (sk, node, &udptable[num & (UDP_HTABLE_SIZE -1 )]) -if (sk->sk_hash == num) -return 1 ; +if (sk->sk_hash == num) +return 1 ;
This turns tabs into spaces, it cannot be correct.
Yoshifuji fixed all the whitespace problems under net/ already for 2.6.21
Resend with less garbage...
The udp code is full of bad indenting, extra whitespace and other style confusion. It makes no sense to declare functions that are used outside the current file (extern) as inline.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/ipv4/udp.c | 312 +++++++++++++++++++++++++++------------------------------ net/ipv6/udp.c | 153 +++++++++++++++------------ 2 files changed, 236 insertions(+), 229 deletions(-)
net/ipv4/udp.c +153 -159
@@ -136,13 +136,13 @@*/ int __udp_lib_get_port (struct sock *sk,unsigned short snum,struct hlist_head udptable[],int *port_rover, -int (*saddr_comp)(const struct sock *sk1, -const struct sock *sk2 ) ) +int (*saddr_comp)(const struct sock * sk1, +const struct sock * sk2)) {struct hlist_node *node;struct hlist_head *head;struct sock *sk2; -int error =1 ; +int error =1 ;write_lock_bh (&udp_hash_lock);if (snum ==0 ) {
@@ -160,7 +160,8 @@if (hlist_empty (head)) {if (result > sysctl_local_port_range[1 ]) result = sysctl_local_port_range[0 ] + - ((result - sysctl_local_port_range[0 ]) & + ((result - + sysctl_local_port_range[0 ]) & (UDP_HTABLE_SIZE -1 )); goto gotit; }
@@ -175,12 +176,13 @@ ; } result = best; -for (i =0 ; i < (1 <<16 ) /UDP_HTABLE_SIZE ; i++, result +=UDP_HTABLE_SIZE ) { +for (i =0 ; i < (1 <<16 ) /UDP_HTABLE_SIZE ; + i++, result +=UDP_HTABLE_SIZE ) {if (result > sysctl_local_port_range[1 ]) result = sysctl_local_port_range[0 ] + ((result - sysctl_local_port_range[0 ]) & (UDP_HTABLE_SIZE -1 )); -if (!__udp_lib_lport_inuse (result, udptable)) +if (!__udp_lib_lport_inuse (result, udptable))break ; }if (i >= (1 <<16 ) /UDP_HTABLE_SIZE )
@@ -194,9 +196,8 @@if (sk2->sk_hash == snum && sk2 != sk && (!sk2->sk_reuse || !sk->sk_reuse) && - (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && - (*saddr_comp)(sk, sk2) ) + (*saddr_comp)(sk, sk2)) goto fail; }inet_sk (sk)->num = snum;
@@ -212,19 +213,19 @@return error; } -__inline__int udp_get_port (struct sock *sk,unsigned short snum, -int (*scmp)(const struct sock *,const struct sock *)) +int udp_get_port (struct sock *sk,unsigned short snum, +int (*scmp)(const struct sock *,const struct sock *)) { -return __udp_lib_get_port (sk, snum, udp_hash, &udp_port_rover, scmp); +return __udp_lib_get_port (sk, snum, udp_hash, &udp_port_rover, scmp); } -inline int ipv4_rcv_saddr_equal (const struct sock *sk1,const struct sock *sk2) +int ipv4_rcv_saddr_equal (const struct sock *sk1,const struct sock *sk2) { -struct inet_sock *inet1 =inet_sk (sk1), *inet2 =inet_sk (sk2); +const struct inet_sock *inet1 =inet_sk (sk1), *inet2 =inet_sk (sk2); -return ( !ipv6_only_sock (sk2) && - (!inet1->rcv_saddr || !inet2->rcv_saddr || - inet1->rcv_saddr == inet2->rcv_saddr )); +return !ipv6_only_sock (sk2) && + (!inet1->rcv_saddr || !inet2->rcv_saddr || + inet1->rcv_saddr == inet2->rcv_saddr); }static inline int udp_v4_get_port (struct sock *sk,unsigned short snum)
@@ -253,27 +254,27 @@if (inet->rcv_saddr) {if (inet->rcv_saddr != daddr)continue ; - score+=2 ; + score +=2 ; }if (inet->daddr) {if (inet->daddr != saddr)continue ; - score+=2 ; + score +=2 ; }if (inet->dport) {if (inet->dport != sport)continue ; - score+=2 ; + score +=2 ; }if (sk->sk_bound_dev_if) {if (sk->sk_bound_dev_if != dif)continue ; - score+=2 ; + score +=2 ; } -if (score ==9 ) { +if (score ==9 ) { result = sk;break ; - }else if (score > badness) { + }else if (score > badness) { result = sk; badness = score; }
@@ -327,8 +328,8 @@void __udp4_lib_err (struct sk_buff *skb,u32 info,struct hlist_head udptable[]) {struct inet_sock *inet; -struct iphdr *iph = (struct iphdr *)skb->data; -struct udphdr *uh = (struct udphdr *)(skb->data+(iph->ihl<<2 )); +struct iphdr *iph = (struct iphdr *)skb->data; +struct udphdr *uh = (struct udphdr *)(skb->data + (iph->ihl <<2 ));int type = skb->h.icmph->type;int code = skb->h.icmph->code;struct sock *sk;
@@ -336,10 +337,10 @@int err; sk =__udp4_lib_lookup (iph->daddr, uh->dest, iph->saddr, uh->source, - skb->dev->ifindex, udptable ); + skb->dev->ifindex, udptable);if (sk ==NULL ) {ICMP_INC_STATS_BH (ICMP_MIB_INERRORS ); -return ;/* No socket for error */ +return ;/* No socket for error */ } err =0 ;
@@ -382,7 +383,7 @@if (!harderr || sk->sk_state !=TCP_ESTABLISHED ) goto out; }else { -ip_icmp_error (sk, skb, err, uh->dest, info, (u8 *)(uh+1 )); +ip_icmp_error (sk, skb, err, uh->dest, info, (u8 *)(uh +1 )); } sk->sk_err = err; sk->sk_error_report (sk);
@@ -390,7 +391,7 @@sock_put (sk); } -__inline__void udp_err (struct sk_buff *skb,u32 info) +void udp_err (struct sk_buff *skb,u32 info) {return __udp4_lib_err (skb, info, udp_hash); }
@@ -416,7 +417,7 @@* (checksum field must be zeroed out) */ static void udp4_hwcsum_outgoing (struct sock *sk,struct sk_buff *skb, -__be32 src,__be32 dst,int len ) +__be32 src,__be32 dst,int len) {unsigned int offset;struct udphdr *uh = skb->h.uh;
@@ -454,7 +455,7 @@*/ static int udp_push_pending_frames (struct sock *sk) { -struct udp_sock *up =udp_sk (sk); +struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk);struct flowi *fl = &inet->cork.fl;struct sk_buff *skb;
@@ -475,17 +476,15 @@ uh->len =htons (up->len); uh->check =0 ; -if (up->pcflag)/* UDP-Lite */ - csum =udplite_csum_outgoing (sk, skb); +if (up->pcflag)/* UDP-Lite */ + csum =udplite_csum_outgoing (sk, skb);else if (sk->sk_no_check ==UDP_CSUM_NOXMIT ) {/* UDP csum disabled */ - skb->ip_summed =CHECKSUM_NONE ; goto send; }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {/* UDP hardware csum */ - -udp4_hwcsum_outgoing (sk, skb, fl->fl4_src,fl->fl4_dst, up->len); +udp4_hwcsum_outgoing (sk, skb, fl->fl4_src, fl->fl4_dst, up->len); goto send; }else /* `normal' UDP */
@@ -493,7 +492,7 @@/* add protocol-dependent pseudo-header */ uh->check =csum_tcpudp_magic (fl->fl4_src, fl->fl4_dst, up->len, - sk->sk_protocol, csum ); + sk->sk_protocol, csum);if (uh->check ==0 ) uh->check =CSUM_MANGLED_0 ;
@@ -517,9 +516,9 @@int connected =0 ;__be32 daddr, faddr, saddr;__be16 dport; -u8 tos; +u8 tos;int err, is_udplite = up->pcflag; -int corkreq = up->corkflag || msg->msg_flags&MSG_MORE ; +int corkreq = up->corkflag || msg->msg_flags &MSG_MORE ;int (*getfrag)(void *,char *,int ,int ,int ,struct sk_buff *);if (len >0xFFFF )
@@ -529,7 +528,7 @@* Check the flags. */ -if (msg->msg_flags&MSG_OOB )/* Mirror BSD error message compatibility */ +if (msg->msg_flags &MSG_OOB )/* Mirror BSD error message compatibility */ return -EOPNOTSUPP ; ipc.opt =NULL ;
@@ -555,7 +554,7 @@* Get and verify the address. */ if (msg->msg_name) { -struct sockaddr_in * usin = (struct sockaddr_in *)msg->msg_name; +struct sockaddr_in *usin = (struct sockaddr_in *)msg->msg_name;if (msg->msg_namelen <sizeof (*usin))return -EINVAL ;if (usin->sin_family !=AF_INET ) {
@@ -617,18 +616,17 @@ }if (connected) - rt = (struct rtable *)sk_dst_check (sk,0 ); + rt = (struct rtable *)sk_dst_check (sk,0 );if (rt ==NULL ) { -struct flowi fl = { .oif = ipc.oif, - .nl_u = { .ip4_u = - { .daddr = faddr, - .saddr = saddr, - .tos = tos } }, - .proto = sk->sk_protocol, - .uli_u = { .ports = - { .sport = inet->sport, - .dport = dport } } }; +struct flowi fl = {.oif = ipc.oif, + .nl_u = {.ip4_u = {.daddr = faddr, + .saddr = saddr, + .tos = tos}}, + .proto = sk->sk_protocol, + .uli_u = {.ports = {.sport = inet->sport, + .dport = dport}} + };security_sk_classify_flow (sk, &fl); err =ip_route_output_flow (&rt, &fl, sk,1 );if (err)
@@ -642,7 +640,7 @@sk_dst_set (sk,dst_clone (&rt->u.dst)); } -if (msg->msg_flags&MSG_CONFIRM ) +if (msg->msg_flags &MSG_CONFIRM ) goto do_confirm; back_from_confirm:
@@ -671,10 +669,11 @@ do_append_data: up->len += ulen; - getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; + getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; err =ip_append_data (sk, getfrag, msg->msg_iov, ulen, -sizeof (struct udphdr ), &ipc, rt, - corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags); +sizeof (struct udphdr ), &ipc, rt, + corkreq ? msg->msg_flags |MSG_MORE : msg-> + msg_flags);if (err)udp_flush_pending_frames (sk);else if (!corkreq)
@@ -705,7 +704,7 @@ do_confirm:dst_confirm (&rt->u.dst); -if (!(msg->msg_flags&MSG_PROBE ) || len) +if (!(msg->msg_flags &MSG_PROBE ) || len) goto back_from_confirm; err =0 ; goto out;
@@ -718,7 +717,7 @@int ret;if (!up->pending) { -struct msghdr msg = { .msg_flags = flags|MSG_MORE }; +struct msghdr msg = {.msg_flags = flags |MSG_MORE };/* Call udp_sendmsg to specify destination address which * sendpage interface can't pass.
@@ -750,7 +749,7 @@ } up->len += size; -if (!(up->corkflag || (flags&MSG_MORE ))) +if (!(up->corkflag || (flags &MSG_MORE ))) ret =udp_push_pending_frames (sk);if (!ret) ret = size;
@@ -765,15 +764,14 @@int udp_ioctl (struct sock *sk,int cmd,unsigned long arg) { -switch (cmd) - { -case SIOCOUTQ : +switch (cmd) { +case SIOCOUTQ : {int amount =atomic_read (&sk->sk_wmem_alloc);return put_user (amount, (int __user *)arg); } -case SIOCINQ : +case SIOCINQ : {struct sk_buff *skb;unsigned long amount;
@@ -793,10 +791,10 @@return put_user (amount, (int __user *)arg); } -default : -return -ENOIOCTLCMD ; +default : +return -ENOIOCTLCMD ; } -return (0 ); +return 0 ; }/*
@@ -816,7 +814,7 @@* Check any passed addresses */ if (addr_len) - *addr_len=sizeof (*sin); + *addr_len =sizeof (*sin);if (flags &MSG_ERRQUEUE )return ip_recv_error (sk, msg, len);
@@ -839,9 +837,9 @@* (re-)compute it if message is truncated. * UDP-Lite: always needs to checksum, no HW support. */ - copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY ); + copy_only = (skb->ip_summed ==CHECKSUM_UNNECESSARY ); -if (is_udplite || (!copy_only && msg->msg_flags&MSG_TRUNC )) { +if (is_udplite || (!copy_only && msg->msg_flags &MSG_TRUNC )) {if (__udp_lib_checksum_complete (skb)) goto csum_copy_err; copy_only =1 ;
@@ -849,10 +847,10 @@if (copy_only) err =skb_copy_datagram_iovec (skb,sizeof (struct udphdr ), - msg->msg_iov, copied ); + msg->msg_iov, copied);else { - err =skb_copy_and_csum_datagram_iovec (skb,sizeof (struct udphdr ), msg->msg_iov); - + err =skb_copy_and_csum_datagram_iovec (skb,sizeof (struct udphdr ), + msg->msg_iov);if (err == -EINVAL ) goto csum_copy_err; }
@@ -863,13 +861,13 @@sock_recv_timestamp (msg, sk, skb);/* Copy the address. */ -if (sin) - { +if (sin) { sin->sin_family =AF_INET ; sin->sin_port = skb->h.uh->source; sin->sin_addr.s_addr = skb->nh.iph->saddr;memset (sin->sin_zero,0 ,sizeof (sin->sin_zero)); } +if (inet->cmsg_flags)ip_cmsg_recv (msg, skb);
@@ -892,7 +890,6 @@ goto try_again; } -int udp_disconnect (struct sock *sk,int flags) {struct inet_sock *inet =inet_sk (sk);
@@ -920,7 +917,7 @@* 0 if we should drop this packet * -1 if it should get processed by xfrm4_rcv_encap */ -static int udp_encap_rcv (struct sock * sk,struct sk_buff *skb) +static int udp_encap_rcv (struct sock *sk,struct sk_buff *skb) {#ifndef CONFIG_XFRM return 1 ;
@@ -959,7 +956,7 @@/* Check if this is a keepalive packet. If so, eat it. */ if (len ==1 && udpdata[0 ] ==0xff ) {return 0 ; - }else if (len >sizeof (struct ip_esp_hdr ) && udpdata32[0 ] !=0 ) { + }else if (len >sizeof (struct ip_esp_hdr ) && udpdata32[0 ] !=0 ) {/* ESP Packet without Non-ESP header */ len =sizeof (struct udphdr ); }else
@@ -1020,7 +1017,7 @@* Note that in the success and error cases, the skb is assumed to * have either been requeued or freed. */ -int udp_queue_rcv_skb (struct sock * sk,struct sk_buff *skb) +int udp_queue_rcv_skb (struct sock *sk,struct sk_buff *skb) {struct udp_sock *up =udp_sk (sk);int rc;
@@ -1062,7 +1059,7 @@/* * UDP-Lite specific tests, ignored on UDP sockets */ -if ((up->pcflag &UDPLITE_RECV_CC ) &&UDP_SKB_CB (skb)->partial_cov) { +if ((up->pcflag &UDPLITE_RECV_CC ) &&UDP_SKB_CB (skb)->partial_cov) {/* * MIB statistics other than incrementing the error count are
@@ -1077,8 +1074,8 @@*/ if (up->pcrlen ==0 ) {/* full coverage was set */ LIMIT_NETDEBUG (KERN_WARNING "UDPLITE: partial coverage " -"%d while full coverage %d requested\n" , -UDP_SKB_CB (skb)->cscov, skb->len); +"%d while full coverage %d requested\n" , +UDP_SKB_CB (skb)->cscov, skb->len); goto drop; }/* The next case involves violating the min. coverage requested
@@ -1087,10 +1084,10 @@* that it wants x while sender emits packets of smaller size y. * Therefore the above ...()->partial_cov statement is essential. */ -if (UDP_SKB_CB (skb)->cscov < up->pcrlen) { +if (UDP_SKB_CB (skb)->cscov < up->pcrlen) {LIMIT_NETDEBUG (KERN_WARNING -"UDPLITE: coverage %d too small, need min %d\n" , -UDP_SKB_CB (skb)->cscov, up->pcrlen); +"UDPLITE: coverage %d too small, need min %d\n" , +UDP_SKB_CB (skb)->cscov, up->pcrlen); goto drop; } }
@@ -1101,7 +1098,7 @@ skb->ip_summed =CHECKSUM_UNNECESSARY ; } -if ((rc =sock_queue_rcv_skb (sk,skb)) <0 ) { +if ((rc =sock_queue_rcv_skb (sk, skb)) <0 ) {/* Note that an ENOMEM error is charged twice */ if (rc == -ENOMEM )UDP_INC_STATS_BH (UDP_MIB_RCVBUFERRORS , up->pcflag);
@@ -1124,7 +1121,7 @@* so we don't need to lock the hashes. */ static int __udp4_lib_mcast_deliver (struct sk_buff *skb, -struct udphdr *uh, +struct udphdr *uh,__be32 saddr,__be32 daddr,struct hlist_head udptable[]) {
@@ -1143,10 +1140,10 @@ sknext =udp_v4_mcast_next (sk_next (sk), uh->dest, daddr, uh->source, saddr, dif); -if (sknext) +if (sknext) skb1 =skb_clone (skb,GFP_ATOMIC ); -if (skb1) { +if (skb1) {int ret =udp_queue_rcv_skb (sk, skb1);if (ret >0 )/* we should probably re-process instead
@@ -1154,7 +1151,7 @@kfree_skb (skb1); } sk = sknext; - }while (sknext); + }while (sknext); }else kfree_skb (skb);read_unlock (&udp_hash_lock);
@@ -1171,8 +1168,8 @@if (uh->check ==0 ) { skb->ip_summed =CHECKSUM_UNNECESSARY ; }else if (skb->ip_summed ==CHECKSUM_COMPLETE ) { -if (!csum_tcpudp_magic (skb->nh.iph->saddr, skb->nh.iph->daddr, - skb->len,IPPROTO_UDP , skb->csum )) +if (!csum_tcpudp_magic (skb->nh.iph->saddr, skb->nh.iph->daddr, + skb->len,IPPROTO_UDP , skb->csum)) skb->ip_summed =CHECKSUM_UNNECESSARY ; }if (skb->ip_summed !=CHECKSUM_UNNECESSARY )
@@ -1197,7 +1194,7 @@struct sock *sk;struct udphdr *uh = skb->h.uh;unsigned short ulen; -struct rtable *rt = (struct rtable *)skb->dst; +struct rtable *rt = (struct rtable *)skb->dst;__be32 saddr = skb->nh.iph->saddr;__be32 daddr = skb->nh.iph->daddr;
@@ -1211,23 +1208,23 @@if (ulen > skb->len) goto short_packet; -if (! is_udplite ) {/* UDP validates ulen. */ - +if (!is_udplite) {/* UDP validates ulen. */ if (ulen <sizeof (*uh) ||pskb_trim_rcsum (skb, ulen)) goto short_packet;udp4_csum_init (skb, uh); - }else {/* UDP-Lite validates cscov. */ + }else {/* UDP-Lite validates cscov. */ if (udplite4_csum_init (skb, uh)) goto csum_error; } -if (rt->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) -return __udp4_lib_mcast_deliver (skb, uh, saddr, daddr, udptable); +if (rt->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) +return __udp4_lib_mcast_deliver (skb, uh, saddr, daddr, + udptable); sk =__udp4_lib_lookup (saddr, uh->source, daddr, uh->dest, - skb->dev->ifindex, udptable ); + skb->dev->ifindex, udptable);if (sk !=NULL ) {int ret =udp_queue_rcv_skb (sk, skb);
@@ -1257,16 +1254,13 @@* don't wanna listen. Ignore it. */ kfree_skb (skb); -return (0 ); +return 0 ; short_packet: -LIMIT_NETDEBUG (KERN_DEBUG "UDP%s: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n" , - is_udplite?"-Lite" :"" , -NIPQUAD (saddr), -ntohs (uh->source), - ulen, - skb->len, -NIPQUAD (daddr), +LIMIT_NETDEBUG (KERN_DEBUG +"UDP%s: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n" , + is_udplite ?"-Lite" :"" ,NIPQUAD (saddr), +ntohs (uh->source), ulen, skb->len,NIPQUAD (daddr),ntohs (uh->dest)); goto drop;
@@ -1275,20 +1269,18 @@* RFC1122: OK. Discards the bad packet silently (as far as * the network is concerned, anyway) as per 4.1.3.4 (MUST). */ -LIMIT_NETDEBUG (KERN_DEBUG "UDP%s: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n" , - is_udplite?"-Lite" :"" , -NIPQUAD (saddr), -ntohs (uh->source), -NIPQUAD (daddr), -ntohs (uh->dest), +LIMIT_NETDEBUG (KERN_DEBUG +"UDP%s: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n" , + is_udplite ?"-Lite" :"" ,NIPQUAD (saddr), +ntohs (uh->source),NIPQUAD (daddr),ntohs (uh->dest), ulen); drop:UDP_INC_STATS_BH (UDP_MIB_INERRORS , is_udplite);kfree_skb (skb); -return (0 ); +return 0 ; } -__inline__int udp_rcv (struct sk_buff *skb) +int udp_rcv (struct sk_buff *skb) {return __udp4_lib_rcv (skb, udp_hash,0 ); }
@@ -1305,20 +1297,20 @@* Socket option code for UDP */ int udp_lib_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen, +char __user * optval,int optlen,int (*push_pending_frames)(struct sock *)) {struct udp_sock *up =udp_sk (sk);int val;int err =0 ; -if (optlen<sizeof (int )) +if (optlen <sizeof (int ))return -EINVAL ;if (get_user (val, (int __user *)optval))return -EFAULT ; -switch (optname) { +switch (optname) {case UDP_CORK :if (val !=0 ) { up->corkflag =1 ;
@@ -1343,27 +1335,27 @@ }break ; -/* -* UDP-Lite's partial checksum coverage (RFC 3828). -*/ -/* The sender sets actual checksum coverage length via this option. -* The case coverage > packet length is handled by send module. */ +/* +* UDP-Lite's partial checksum coverage (RFC 3828). +*/ +/* The sender sets actual checksum coverage length via this option. +* The case coverage > packet length is handled by send module. */ case UDPLITE_SEND_CSCOV : -if (!up->pcflag)/* Disable the option on UDP sockets */ +if (!up->pcflag)/* Disable the option on UDP sockets */ return -ENOPROTOOPT ; -if (val !=0 && val <8 )/* Illegal coverage: use default (8) */ +if (val !=0 && val <8 )/* Illegal coverage: use default (8) */ val =8 ; up->pcslen = val; up->pcflag |=UDPLITE_SEND_CC ;break ; -/* The receiver specifies a minimum checksum coverage value. To make -* sense, this should be set to at least 8 (as done below). If zero is -* used, this again means full checksum coverage. */ +/* The receiver specifies a minimum checksum coverage value. To make +* sense, this should be set to at least 8 (as done below). If zero is +* used, this again means full checksum coverage. */ case UDPLITE_RECV_CSCOV : -if (!up->pcflag)/* Disable the option on UDP sockets */ +if (!up->pcflag)/* Disable the option on UDP sockets */ return -ENOPROTOOPT ; -if (val !=0 && val <8 )/* Avoid silly minimal values. */ +if (val !=0 && val <8 )/* Avoid silly minimal values. */ val =8 ; up->pcrlen = val; up->pcflag |=UDPLITE_RECV_CC ;
@@ -1372,15 +1364,15 @@default : err = -ENOPROTOOPT ;break ; - }; + }return err; }int udp_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user * optval,int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);return ip_setsockopt (sk, level, optname, optval, optlen);
@@ -1388,9 +1380,9 @@#ifdef CONFIG_COMPAT int compat_udp_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user * optval,int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);return compat_ip_setsockopt (sk, level, optname, optval, optlen);
@@ -1398,20 +1390,20 @@#endif int udp_lib_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) {struct udp_sock *up =udp_sk (sk);int val, len; -if (get_user (len,optlen)) +if (get_user (len, optlen))return -EFAULT ; len = min_t(unsigned int, len, sizeof(int)); -if (len <0 ) +if (len <0 )return -EINVAL ; -switch (optname) { +switch (optname) {case UDP_CORK : val = up->corkflag;break ;
@@ -1420,8 +1412,8 @@ val = up->encap_type;break ; -/* The following two cannot be changed on UDP sockets, the return is -* always 0 (which corresponds to the full checksum coverage of UDP). */ +/* The following two cannot be changed on UDP sockets, the return is +* always 0 (which corresponds to the full checksum coverage of UDP). */ case UDPLITE_SEND_CSCOV : val = up->pcslen;break ;
@@ -1432,28 +1424,28 @@default :return -ENOPROTOOPT ; - }; + } -if (put_user (len, optlen)) +if (put_user (len, optlen))return -EFAULT ; -if (copy_to_user (optval, &val,len)) +if (copy_to_user (optval, &val, len))return -EFAULT ;return 0 ; }int udp_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_getsockopt (sk, level, optname, optval, optlen);return ip_getsockopt (sk, level, optname, optval, optlen); }#ifdef CONFIG_COMPAT int compat_udp_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user * optval,int __user * optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE )return udp_lib_getsockopt (sk, level, optname, optval, optlen);return compat_ip_getsockopt (sk, level, optname, optval, optlen); }
@@ -1471,16 +1463,16 @@* but then block when reading it. Add special case code * to work around these arguably broken applications. */ -unsigned int udp_poll (struct file *file,struct socket *sock,poll_table *wait) +unsigned int udp_poll (struct file *file,struct socket *sock,poll_table * wait) {unsigned int mask =datagram_poll (file, sock, wait);struct sock *sk = sock->sk; -int is_lite =IS_UDPLITE (sk); +int is_lite =IS_UDPLITE (sk);/* Check for false positives due to checksum errors */ -if ( (mask &POLLRDNORM ) && - !(file->f_flags &O_NONBLOCK ) && - !(sk->sk_shutdown &RCV_SHUTDOWN )){ +if ((mask &POLLRDNORM ) && + !(file->f_flags &O_NONBLOCK ) && + !(sk->sk_shutdown &RCV_SHUTDOWN )) {struct sk_buff_head *rcvq = &sk->sk_receive_queue;struct sk_buff *skb;
@@ -1538,7 +1530,8 @@struct sock *sk;struct udp_iter_state *state = seq->private; -for (state->bucket =0 ; state->bucket <UDP_HTABLE_SIZE ; ++state->bucket) { +for (state->bucket =0 ; state->bucket <UDP_HTABLE_SIZE ; + ++state->bucket) {struct hlist_node *node;sk_for_each (sk, node, state->hashtable + state->bucket) {if (sk->sk_family == state->family)
@@ -1572,22 +1565,22 @@struct sock *sk =udp_get_first (seq);if (sk) -while (pos && (sk =udp_get_next (seq, sk)) !=NULL ) +while (pos && (sk =udp_get_next (seq, sk)) !=NULL ) --pos;return pos ?NULL : sk; } -static void *udp_seq_start (struct seq_file *seq,loff_t *pos) +static void *udp_seq_start (struct seq_file *seq,loff_t * pos) {read_lock (&udp_hash_lock); -return *pos ?udp_get_idx (seq, *pos-1 ) : (void *)1 ; +return *pos ?udp_get_idx (seq, *pos -1 ) :SEQ_START_TOKEN ; } -static void *udp_seq_next (struct seq_file *seq,void *v,loff_t *pos) +static void *udp_seq_next (struct seq_file *seq,void *v,loff_t * pos) {struct sock *sk; -if (v == (void *)1 ) +if (v ==SEQ_START_TOKEN ) sk =udp_get_idx (seq,0 );else sk =udp_get_next (seq, v);
@@ -1621,7 +1614,7 @@if (rc) goto out_kfree; - seq = file->private_data; + seq = file->private_data; seq->private = s; out:return rc;
@@ -1638,6 +1631,7 @@if (!afinfo)return -EINVAL ; + afinfo->seq_fops->owner = afinfo->owner; afinfo->seq_fops->open = udp_seq_open; afinfo->seq_fops->read = seq_read;
@@ -1666,8 +1660,8 @@struct inet_sock *inet =inet_sk (sp);__be32 dest = inet->daddr;__be32 src = inet->rcv_saddr; -__u16 destp =ntohs (inet->dport); -__u16 srcp =ntohs (inet->sport); +__u16 dest =ntohs (inet->dport); +__u16 srcp =ntohs (inet->sport); sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X" " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p",
net/ipv6/udp.c +83 -70
450 lines not on this page · raw message
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Fri, 2 Mar 2007 16:47:19 -0800
Quoted 7 lines
Resend with less garbage...
The udp code is full of bad indenting, extra whitespace and other style confusion. It makes no sense to declare functions that are used outside the current file (extern) as inline.
Signed-off-by Stephen Hemminger <[email protected]>
Looks good, I'll try to apply this when I cut the net-2.6.22 tree.
Thanks.