--- /sys/src/9/ip/arp.c +++ /sys/src/9/ip/arp.c @@ -40,16 +40,16 @@ struct Arp Arpent *rxmt; Proc *rxmitp; /* neib sol re-transmit proc */ Rendez rxmtq; - Block *dropf, *dropl; + Block *dropf, *dropl; }; char *Ebadarp = "bad arp"; #define haship(s) ((s)[IPaddrlen-1]%NHASH) -extern int ReTransTimer = RETRANS_TIMER; +extern int ReTransTimer = RETRANS_TIMER; -static void rxmitproc(void *v); +static void rxmitproc(void *v); void arpinit(Fs *f) @@ -578,11 +578,11 @@ rxmitsols(Arp *arp) a = arp->rxmt; if(a==nil){ nrxt = 0; - goto dodrops; /* return nrxt; */ + goto dodrops; /* return nrxt; */ } nrxt = a->rtime - NOW; if(nrxt > 3*ReTransTimer/4) - goto dodrops; /* return nrxt; */ + goto dodrops; /* return nrxt; */ for(; a; a = a->nextrxt){ ifc = a->ifc; --- /sys/src/9/ip/devip.c +++ /sys/src/9/ip/devip.c @@ -44,10 +44,10 @@ enum Nfs= 128, }; -#define TYPE(x) ( ((ulong)(x).path) & Masktype ) -#define CONV(x) ( (((ulong)(x).path) >> Shiftconv) & Maskconv ) -#define PROTO(x) ( (((ulong)(x).path) >> Shiftproto) & Maskproto ) -#define QID(p, c, y) ( ((p)<<(Shiftproto)) | ((c)<> Shiftconv) & Maskconv ) +#define PROTO(x) ( (((ulong)(x).path) >> Shiftproto) & Maskproto ) +#define QID(p, c, y) ( ((p)<<(Shiftproto)) | ((c)<perm>>6)) != perm) { if(strcmp(ATTACHER(c), cv->owner) != 0) error(Eperm); - if((perm & cv->perm) != perm) + if((perm & cv->perm) != perm) error(Eperm); } @@ -453,7 +453,7 @@ ipopen(Chan* c, int omode) if((perm & (cv->perm>>6)) != perm) { if(strcmp(ATTACHER(c), cv->owner) != 0) error(Eperm); - if((perm & cv->perm) != perm) + if((perm & cv->perm) != perm) error(Eperm); } --- /sys/src/9/ip/esp.c +++ /sys/src/9/ip/esp.c @@ -145,7 +145,7 @@ struct Espcb struct Algorithm { - char *name; + char *name; int keylen; /* in bits */ void (*init)(Espcb*, char* name, uchar *key, unsigned keylen); }; --- /sys/src/9/ip/ethermedium.c +++ /sys/src/9/ip/ethermedium.c @@ -196,7 +196,7 @@ etherbind(Ipifc *ifc, int argc, char **argv) ifc->mbps = 100; /* - * open arp conversation + * open arp conversation */ snprint(addr, sizeof(addr), "%s!0x806", argv[2]); /* ETARP */ achan = chandial(addr, nil, nil, nil); @@ -308,7 +308,7 @@ etherbwrite(Ipifc *ifc, Block *bp, int version, uchar *ip) memmove(eh->s, ifc->mac, sizeof(eh->s)); memmove(eh->d, mac, sizeof(eh->d)); - switch(version){ + switch(version){ case V4: eh->t[0] = 0x08; eh->t[1] = 0x00; @@ -701,14 +701,14 @@ multicastea(uchar *ea, uchar *ip) ea[4] = ip[14]; ea[5] = ip[15]; break; - case V6: - ea[0] = 0x33; - ea[1] = 0x33; - ea[2] = ip[12]; + case V6: + ea[0] = 0x33; + ea[1] = 0x33; + ea[2] = ip[12]; ea[3] = ip[13]; - ea[4] = ip[14]; - ea[5] = ip[15]; - break; + ea[4] = ip[14]; + ea[5] = ip[15]; + break; } return x; } --- /sys/src/9/ip/icmp.c +++ /sys/src/9/ip/icmp.c @@ -38,8 +38,8 @@ enum { /* Packet Types */ TimestampReply = 14, InfoRequest = 15, InfoReply = 16, - AddrMaskRequest = 17, - AddrMaskReply = 18, + AddrMaskRequest = 17, + AddrMaskReply = 18, Maxtype = 18, }; @@ -63,7 +63,7 @@ char *icmpnames[Maxtype+1] = [InfoRequest] "InfoRequest", [InfoReply] "InfoReply", [AddrMaskRequest] "AddrMaskRequest", -[AddrMaskReply ] "AddrMaskReply ", +[AddrMaskReply] "AddrMaskReply", }; enum { @@ -302,7 +302,7 @@ mkechoreply(Block *bp) q->vihl = IP_VER4; memmove(ip, q->src, sizeof(q->dst)); memmove(q->src, q->dst, sizeof(q->src)); - memmove(q->dst, ip, sizeof(q->dst)); + memmove(q->dst, ip, sizeof(q->dst)); q->type = EchoReply; memset(q->cksum, 0, sizeof(q->cksum)); hnputs(q->cksum, ptclcsum(bp, ICMP_IPSIZE, blocklen(bp) - ICMP_IPSIZE)); --- /sys/src/9/ip/icmp6.c +++ /sys/src/9/ip/icmp6.c @@ -191,7 +191,7 @@ set_cksum(Block *bp) { IPICMP *p = (IPICMP *)(bp->rp); - hnputl(p->vcf, 0); /* borrow IP header as pseudoheader */ + hnputl(p->vcf, 0); /* borrow IP header as pseudoheader */ hnputs(p->ploadlen, blocklen(bp) - IP6HDR); p->proto = 0; p->ttl = ICMPv6; /* ttl gets set later */ @@ -339,9 +339,9 @@ mkechoreply6(Block *bp, Ipifc *ifc) /* * sends out an ICMPv6 neighbor solicitation - * suni == SRC_UNSPEC or SRC_UNI, + * suni == SRC_UNSPEC or SRC_UNI, * tuni == TARG_MULTI => multicast for address resolution, - * and tuni == TARG_UNI => neighbor reachability. + * and tuni == TARG_UNI => neighbor reachability. */ extern void icmpns(Fs *f, uchar* src, int suni, uchar* targ, int tuni, uchar* mac) --- /sys/src/9/ip/ip.c +++ /sys/src/9/ip/ip.c @@ -63,7 +63,7 @@ ip_init_6(Fs *f) v6p->hp.rxmithost = 1000; /* v6 RETRANS_TIMER */ - v6p->cdrouter = -1; + v6p->cdrouter = -1; f->v6p = v6p; } --- /sys/src/9/ip/ip.h +++ /sys/src/9/ip/ip.h @@ -23,8 +23,8 @@ typedef struct Arp Arp; typedef struct Route Route; typedef struct Routerparams Routerparams; -typedef struct Hostparams Hostparams; -typedef struct v6router v6router; +typedef struct Hostparams Hostparams; +typedef struct v6router v6router; typedef struct v6params v6params; #pragma incomplete Arp @@ -52,7 +52,7 @@ enum /* ip versions */ V4= 4, V6= 6, - IP_VER4= 0x40, + IP_VER4= 0x40, IP_VER6= 0x60, IP_HLEN4= 5, /* v4: Header length in words */ IP_DF= 0x4000, /* v4: Don't fragment */ @@ -105,20 +105,20 @@ struct Fragment4 { Block* blist; Fragment4* next; - ulong src; - ulong dst; + ulong src; + ulong dst; ushort id; - ulong age; + ulong age; }; struct Fragment6 { Block* blist; Fragment6* next; - uchar src[IPaddrlen]; - uchar dst[IPaddrlen]; + uchar src[IPaddrlen]; + uchar dst[IPaddrlen]; uint id; - ulong age; + ulong age; }; struct Ipfrag @@ -157,7 +157,7 @@ struct Ip4hdr uchar length[2]; /* packet length */ uchar id[2]; /* ip->identification */ uchar frag[2]; /* Fragment information */ - uchar ttl; /* Time to live */ + uchar ttl; /* Time to live */ uchar proto; /* Protocol */ uchar cksum[2]; /* Header checksum */ uchar src[4]; /* IP source */ @@ -227,7 +227,7 @@ struct Medium int hsize; /* medium header size */ int mintu; /* default min mtu */ int maxtu; /* default max mtu */ - int maclen; /* mac address length */ + int maclen; /* mac address length */ void (*bind)(Ipifc*, int, char**); void (*unbind)(Ipifc*); void (*bwrite)(Ipifc *ifc, Block *b, int version, uchar *ip); @@ -268,8 +268,8 @@ struct Iplifc uchar tentative; /* =1 => v6 dup disc on, =0 => confirmed unique */ uchar onlink; /* =1 => onlink, =0 offlink. */ uchar autoflag; /* v6 autonomous flag */ - long validlt; /* v6 valid lifetime */ - long preflt; /* v6 preferred lifetime */ + long validlt; /* v6 valid lifetime */ + long preflt; /* v6 preferred lifetime */ long origint; /* time when addr was added */ Iplink *link; /* addresses linked to this lifc */ Iplifc *next; @@ -293,7 +293,7 @@ struct Iplink struct Routerparams { int mflag; /* flag: managed address configuration */ int oflag; /* flag: other stateful configuration */ - int maxraint; /* max. router adv interval (ms) */ + int maxraint; /* max. router adv interval (ms) */ int minraint; /* min. router adv interval (ms) */ int linkmtu; /* mtu options */ int reachtime; /* reachable time */ @@ -459,7 +459,7 @@ struct v6params Routerparams rp; /* v6 params, one copy per node now */ Hostparams hp; v6router v6rlist[3]; /* max 3 default routers, currently */ - int cdrouter; /* uses only v6rlist[cdrouter] if */ + int cdrouter; /* uses only v6rlist[cdrouter] if */ /* cdrouter >= 0. */ }; --- /sys/src/9/ip/ipifc.c +++ /sys/src/9/ip/ipifc.c @@ -1236,7 +1236,7 @@ findlocalip(Fs *f, uchar *local, uchar *remote) USED(atypel); qlock(f->ipifc); r = v6lookup(f, remote, nil); - version = (memcmp(remote, v4prefix, IPv4off) == 0)? V4: V6; + version = (memcmp(remote, v4prefix, IPv4off) == 0)? V4: V6; if(r != nil){ ifc = r->ifc; @@ -1481,7 +1481,7 @@ ipifcremmulti(Conv *c, uchar *ma, uchar *ia) multi = *l; if(multi == nil) - return; /* we don't have it open */ + return; /* we don't have it open */ *l = multi->next; --- /sys/src/9/ip/ipmux.c +++ /sys/src/9/ip/ipmux.c @@ -56,7 +56,7 @@ char *ftname[] = { [Tproto] "proto", [Tdata] "data", -[Tiph] "iph", +[Tiph] "iph", [Tdst] "dst", [Tsrc] "src", [Tifc] "ifc", --- /sys/src/9/ip/ipv6.c +++ /sys/src/9/ip/ipv6.c @@ -10,7 +10,7 @@ enum { - IP6FHDR = 8, /* sizeof(Fraghdr6) */ + IP6FHDR = 8, /* sizeof(Fraghdr6) */ }; #define IPV6CLASS(hdr) (((hdr)->vcf[0]&0x0F)<<2 | ((hdr)->vcf[1]&0xF0)>>2) --- /sys/src/9/ip/rudp.c +++ /sys/src/9/ip/rudp.c @@ -564,7 +564,7 @@ rudpiput(Proto *rudp, Ipifc *ifc, Block *bp) /* connection oriented rudp */ if(ipcmp(c->raddr, IPnoaddr) == 0){ /* save the src address in the conversation */ - ipmove(c->raddr, raddr); + ipmove(c->raddr, raddr); c->rport = rport; /* reply with the same ip address (if not broadcast) */ --- /sys/src/9/ip/tcp.c +++ /sys/src/9/ip/tcp.c @@ -27,7 +27,7 @@ enum TcptimerOFF = 0, TcptimerON = 1, TcptimerDONE = 2, - MAX_TIME = (1<<20), /* Forever */ + MAX_TIME = (1<<20), /* Forever */ TCP_ACK = 50, /* Timed ack sequence in ms */ MAXBACKMS = 9*60*1000, /* longest backoff time (ms) before hangup */ @@ -93,9 +93,9 @@ enum /* Must correspond to the enumeration above */ char *tcpstates[] = { - "Closed", "Listen", "Syn_sent", "Syn_received", - "Established", "Finwait1", "Finwait2", "Close_wait", - "Closing", "Last_ack", "Time_wait" + "Closed", "Listen", "Syn_sent", "Syn_received", + "Established", "Finwait1", "Finwait2", "Close_wait", + "Closing", "Last_ack", "Time_wait" }; typedef struct Tcptimer Tcptimer; @@ -383,7 +383,7 @@ typedef struct Tcppriv Tcppriv; struct Tcppriv { /* List of active timers */ - QLock tl; + QLock tl; Tcptimer *timers; /* hash table for matching conversations */ @@ -794,7 +794,7 @@ tcpackproc(void *a) if(loop++ > 10000) panic("tcpackproc1"); tp = t->next; - if(t->state == TcptimerON) { + if(t->state == TcptimerON) { t->count--; if(t->count == 0) { timerstate(priv, t, TcptimerDONE); @@ -1759,7 +1759,7 @@ tcpincoming(Conv *s, Tcp *segp, uchar *src, uchar *dst, uchar version) src, segp->source, lp->raddr, lp->rport, dst, segp->dest, lp->laddr, lp->lport, version, lp->version - ); + ); if(lp->lport != segp->dest || lp->rport != segp->source || lp->version != version) continue; --- /sys/src/9/ip/udp.c +++ /sys/src/9/ip/udp.c @@ -555,7 +555,7 @@ udpadvise(Proto *udp, Block *bp, char *msg) break; default: panic("udpadvise: version %d", version); - return; /* to avoid a warning */ + return; /* to avoid a warning */ } /* Look for a connection */