giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Afonso Oliveira 2018-09-08 10:27:39 +01:00 committed by GitHub
commit 71250c4f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os/net/ipv6/resolv.c
View File

@ -1017,7 +1017,8 @@ newdata(void)
namemapptr->state = STATE_DONE;
#if RESOLV_SUPPORTS_RECORD_EXPIRATION
namemapptr->expiration = ans->ttl[1] + (ans->ttl[0] << 8);
namemapptr->expiration = (uint32_t) uip_ntohs(ans->ttl[0]) << 16 |
(uint32_t) uip_ntohs(ans->ttl[1]);
namemapptr->expiration += clock_seconds();
#endif /* RESOLV_SUPPORTS_RECORD_EXPIRATION */