xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devip: make updating ra6 router parameters atomic

Browse source 
when we fail to parse and validate the command, no update
should take place.
This commit is contained in:
cinap_lenrek 2018-09-23 17:24:59 +02:00
parent 1d4a36c699
commit 259ce5e3de
1 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
sys/src/9/ip/ipifc.c
View file

@ -753,37 +753,42 @@ ipifcconnect(Conv* c, char **argv, int argc)
char* char*
ipifcra6(Ipifc *ifc, char **argv, int argc) ipifcra6(Ipifc *ifc, char **argv, int argc)
{ {
int i, argsleft, vmax = ifc->rp.maxraint, vmin = ifc->rp.minraint; int i, argsleft;
uchar sendra, recvra;
Routerparams rp;
argsleft = argc - 1;
i = 1; i = 1;
argsleft = argc - 1;
if(argsleft % 2 != 0) if((argsleft % 2) != 0)
return Ebadarg; return Ebadarg;
sendra = ifc->sendra6;
recvra = ifc->recvra6;
rp = ifc->rp;
while (argsleft > 1) { while (argsleft > 1) {
if(strcmp(argv[i], "recvra") == 0) if(strcmp(argv[i], "recvra") == 0)
ifc->recvra6 = (atoi(argv[i+1]) != 0); recvra = (atoi(argv[i+1]) != 0);
else if(strcmp(argv[i], "sendra") == 0) else if(strcmp(argv[i], "sendra") == 0)
ifc->sendra6 = (atoi(argv[i+1]) != 0); sendra = (atoi(argv[i+1]) != 0);
else if(strcmp(argv[i], "mflag") == 0) else if(strcmp(argv[i], "mflag") == 0)
ifc->rp.mflag = (atoi(argv[i+1]) != 0); rp.mflag = (atoi(argv[i+1]) != 0);
else if(strcmp(argv[i], "oflag") == 0) else if(strcmp(argv[i], "oflag") == 0)
ifc->rp.oflag = (atoi(argv[i+1]) != 0); rp.oflag = (atoi(argv[i+1]) != 0);
else if(strcmp(argv[i], "maxraint") == 0) else if(strcmp(argv[i], "maxraint") == 0)
ifc->rp.maxraint = atoi(argv[i+1]); rp.maxraint = atoi(argv[i+1]);
else if(strcmp(argv[i], "minraint") == 0) else if(strcmp(argv[i], "minraint") == 0)
ifc->rp.minraint = atoi(argv[i+1]); rp.minraint = atoi(argv[i+1]);
else if(strcmp(argv[i], "linkmtu") == 0) else if(strcmp(argv[i], "linkmtu") == 0)
ifc->rp.linkmtu = atoi(argv[i+1]); rp.linkmtu = atoi(argv[i+1]);
else if(strcmp(argv[i], "reachtime") == 0) else if(strcmp(argv[i], "reachtime") == 0)
ifc->rp.reachtime = atoi(argv[i+1]); rp.reachtime = atoi(argv[i+1]);
else if(strcmp(argv[i], "rxmitra") == 0) else if(strcmp(argv[i], "rxmitra") == 0)
ifc->rp.rxmitra = atoi(argv[i+1]); rp.rxmitra = atoi(argv[i+1]);
else if(strcmp(argv[i], "ttl") == 0) else if(strcmp(argv[i], "ttl") == 0)
ifc->rp.ttl = atoi(argv[i+1]); rp.ttl = atoi(argv[i+1]);
else if(strcmp(argv[i], "routerlt") == 0) else if(strcmp(argv[i], "routerlt") == 0)
ifc->rp.routerlt = atoi(argv[i+1]); rp.routerlt = atoi(argv[i+1]);
else else
return Ebadarg; return Ebadarg;
@ -792,11 +797,13 @@ ipifcra6(Ipifc *ifc, char **argv, int argc)
} }
/* consistency check */ /* consistency check */
if(ifc->rp.maxraint < ifc->rp.minraint) { if(rp.maxraint < rp.minraint)
ifc->rp.maxraint = vmax;
ifc->rp.minraint = vmin;
return Ebadarg; return Ebadarg;
}
ifc->rp = rp;
ifc->sendra6 = sendra;
ifc->recvra6 = recvra;
return nil; return nil;
} }