chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: also take write queue into consideration in sd_bus_try_close()
[elogind.git]
/
src
/
libsystemd-dhcp
/
test-dhcp-client.c
diff --git
a/src/libsystemd-dhcp/test-dhcp-client.c
b/src/libsystemd-dhcp/test-dhcp-client.c
index d398510745f373049c4e122da48a882b04a377b1..617236b5df6c38ff23c86dd21ad7f1827775845d 100644
(file)
--- a/
src/libsystemd-dhcp/test-dhcp-client.c
+++ b/
src/libsystemd-dhcp/test-dhcp-client.c
@@
-102,10
+102,13
@@
static uint16_t client_checksum(void *buf, int len)
if (len & 0x01) {
odd = buf;
if (len & 0x01) {
odd = buf;
- sum += odd[len];
+ sum += odd[len
- 1
];
}
}
- return ~((sum & 0xffff) + (sum >> 16));
+ while (sum >> 16)
+ sum = (sum & 0xffff) + (sum >> 16);
+
+ return ~sum;
}
static void test_checksum(void)
}
static void test_checksum(void)
@@
-116,13
+119,7
@@
static void test_checksum(void)
0xff, 0xff, 0xff, 0xff
};
0xff, 0xff, 0xff, 0xff
};
- uint8_t check[2] = {
- 0x78, 0xae
- };
-
- uint16_t *val = (uint16_t *)check;
-
- assert(client_checksum(&buf, 20) == *val);
+ assert(client_checksum(&buf, 20) == be16toh(0x78ae));
}
static int check_options(uint8_t code, uint8_t len, const uint8_t *option,
}
static int check_options(uint8_t code, uint8_t len, const uint8_t *option,
@@
-187,6
+184,17
@@
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
return test_fd[0];
}
return test_fd[0];
}
+int dhcp_network_bind_udp_socket(int index, be32_t client_address)
+{
+ return 0;
+}
+
+int dhcp_network_send_udp_socket(int s, be32_t server_address,
+ const void *packet, size_t len)
+{
+ return 0;
+}
+
static void test_discover_message(sd_event *e)
{
sd_dhcp_client *client;
static void test_discover_message(sd_event *e)
{
sd_dhcp_client *client;