chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
74e2238
)
libsystemd-dhcp: Rename function to be clearer that options are parsed
author
Patrik Flykt
<patrik.flykt@linux.intel.com>
Fri, 31 Jan 2014 09:31:21 +0000
(11:31 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 31 Jan 2014 11:04:51 +0000
(12:04 +0100)
src/libsystemd-dhcp/sd-dhcp-client.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-dhcp/sd-dhcp-client.c
b/src/libsystemd-dhcp/sd-dhcp-client.c
index 8115b7f769f8e20e1149d55c41fae95682a732c5..130a61d6f8d6dceff59516259905d077e87e571b 100644
(file)
--- a/
src/libsystemd-dhcp/sd-dhcp-client.c
+++ b/
src/libsystemd-dhcp/sd-dhcp-client.c
@@
-726,7
+726,7
@@
static int client_timeout_t1(sd_event_source *s, uint64_t usec, void *userdata)
return client_initialize_events(client, usec);
}
return client_initialize_events(client, usec);
}
-static int client_parse_o
ffer
(uint8_t code, uint8_t len, const uint8_t *option,
+static int client_parse_o
ptions
(uint8_t code, uint8_t len, const uint8_t *option,
void *user_data) {
DHCPLease *lease = user_data;
be32_t val;
void *user_data) {
DHCPLease *lease = user_data;
be32_t val;
@@
-876,7
+876,7
@@
static int client_receive_offer(sd_dhcp_client *client, DHCPPacket *offer,
return -ENOMEM;
len = len - DHCP_IP_UDP_SIZE;
return -ENOMEM;
len = len - DHCP_IP_UDP_SIZE;
- r = dhcp_option_parse(&offer->dhcp, len, client_parse_o
ffer
,
+ r = dhcp_option_parse(&offer->dhcp, len, client_parse_o
ptions
,
lease);
if (r != DHCP_OFFER)
return -ENOMSG;
lease);
if (r != DHCP_OFFER)
return -ENOMSG;
@@
-919,7
+919,7
@@
static int client_receive_ack(sd_dhcp_client *client, const uint8_t *buf,
if (!lease)
return -ENOMEM;
if (!lease)
return -ENOMEM;
- r = dhcp_option_parse(dhcp, len, client_parse_o
ffer
, lease);
+ r = dhcp_option_parse(dhcp, len, client_parse_o
ptions
, lease);
if (r == DHCP_NAK)
return DHCP_EVENT_NO_LEASE;
if (r == DHCP_NAK)
return DHCP_EVENT_NO_LEASE;