projects
/
project
/
odhcp6c.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix odhcp6c_find_entry
[project/odhcp6c.git]
/
src
/
odhcp6c.c
diff --git
a/src/odhcp6c.c
b/src/odhcp6c.c
index 8b5cb54308c8f7224e37c3dbd7d5e1571981d53e..4c534c17b518a66d74688f9131123b2351c9ecc9 100644
(file)
--- a/
src/odhcp6c.c
+++ b/
src/odhcp6c.c
@@
-445,7
+445,7
@@
static int usage(void)
" -e Write logmessages to stderr\n"
" -v Increase logging verbosity\n"
" -h Show this help\n\n";
" -e Write logmessages to stderr\n"
" -v Increase logging verbosity\n"
" -h Show this help\n\n";
-
write(STDERR_FILENO, buf, sizeof(buf)
);
+
fputs(buf, stderr
);
return 1;
}
return 1;
}
@@
-553,9
+553,9
@@
void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
}
}
-struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
+st
atic st
ruct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
{
{
- size_t len, cmplen = offsetof(struct odhcp6c_entry, target) +
new->length / 8
;
+ size_t len, cmplen = offsetof(struct odhcp6c_entry, target) +
((new->length + 7) / 8)
;
struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
struct odhcp6c_entry *x = NULL;
struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
struct odhcp6c_entry *x = NULL;
@@
-584,14
+584,12
@@
bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
new->valid - x->valid < min_update_interval &&
new->preferred >= x->preferred &&
new->preferred != UINT32_MAX &&
new->valid - x->valid < min_update_interval &&
new->preferred >= x->preferred &&
new->preferred != UINT32_MAX &&
- new->preferred - x->preferred < min_update_interval &&
- x->class == new->class)
+ new->preferred - x->preferred < min_update_interval)
return false;
x->valid = new->valid;
x->preferred = new->preferred;
x->t1 = new->t1;
x->t2 = new->t2;
return false;
x->valid = new->valid;
x->preferred = new->preferred;
x->t1 = new->t1;
x->t2 = new->t2;
- x->class = new->class;
x->iaid = new->iaid;
} else {
odhcp6c_add_state(state, new, sizeof(*new));
x->iaid = new->iaid;
} else {
odhcp6c_add_state(state, new, sizeof(*new));
@@
-654,9
+652,9
@@
uint32_t odhcp6c_elapsed(void)
}
}
-
void
odhcp6c_random(void *buf, size_t len)
+
int
odhcp6c_random(void *buf, size_t len)
{
{
- read(urandom_fd, buf, len);
+ re
turn re
ad(urandom_fd, buf, len);
}
bool odhcp6c_is_bound(void)
}
bool odhcp6c_is_bound(void)