X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Ftest-dhcp6-client.c;h=26b28a20e848b53b387815dd7e0ce33ab8f49015;hb=1ccda9b7168e89141b60290295170e07e760efeb;hp=40fd8f5faf3b1be86ba6c8882a0c21cc86d55521;hpb=5e256ea7d3d556b3a1fb5c1faa94ec6a8833e53e;p=elogind.git diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index 40fd8f5fa..26b28a20e 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -49,7 +49,6 @@ static int test_index = 42; static int test_client_message_num; static be32_t test_iaid = 0; static uint8_t test_duid[14] = { }; -static sd_event *e_solicit; static int test_client_basic(sd_event *e) { sd_dhcp6_client *client; @@ -67,7 +66,16 @@ static int test_client_basic(sd_event *e) { assert_se(sd_dhcp6_client_set_index(client, -1) == 0); assert_se(sd_dhcp6_client_set_index(client, 42) >= 0); - assert_se(sd_dhcp6_client_set_mac(client, &mac_addr) >= 0); + assert_se(sd_dhcp6_client_set_mac(client, (const uint8_t *) &mac_addr, + sizeof (mac_addr), + ARPHRD_ETHER) >= 0); + + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_CLIENTID) == -EINVAL); + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_DNS_SERVERS) == -EEXIST); + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_NTP_SERVER) == -EEXIST); + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_SNTP_SERVERS) == 0); + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_DOMAIN_LIST) == -EEXIST); + assert_se(sd_dhcp6_client_set_request_option(client, 10) == -EINVAL); assert_se(sd_dhcp6_client_set_callback(client, NULL, NULL) >= 0); @@ -171,12 +179,37 @@ static uint8_t msg_advertise[198] = { 0x53, 0x00, 0x07, 0x00, 0x01, 0x00 }; +static uint8_t msg_reply[173] = { + 0x07, 0xf7, 0x4e, 0x57, 0x00, 0x02, 0x00, 0x0e, + 0x00, 0x01, 0x00, 0x01, 0x19, 0x40, 0x5c, 0x53, + 0x78, 0x2b, 0xcb, 0xb3, 0x6d, 0x53, 0x00, 0x01, + 0x00, 0x0e, 0x00, 0x01, 0x00, 0x01, 0x1a, 0x6b, + 0xf3, 0x30, 0x3c, 0x97, 0x0e, 0xcf, 0xa3, 0x7d, + 0x00, 0x03, 0x00, 0x4a, 0x0e, 0xcf, 0xa3, 0x7d, + 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x78, + 0x00, 0x05, 0x00, 0x18, 0x20, 0x01, 0x0d, 0xb8, + 0xde, 0xad, 0xbe, 0xef, 0x78, 0xee, 0x1c, 0xf3, + 0x09, 0x3c, 0x55, 0xad, 0x00, 0x00, 0x00, 0x96, + 0x00, 0x00, 0x00, 0xb4, 0x00, 0x0d, 0x00, 0x1e, + 0x00, 0x00, 0x41, 0x6c, 0x6c, 0x20, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, + 0x77, 0x65, 0x72, 0x65, 0x20, 0x61, 0x73, 0x73, + 0x69, 0x67, 0x6e, 0x65, 0x64, 0x2e, 0x00, 0x17, + 0x00, 0x10, 0x20, 0x01, 0x0d, 0xb8, 0xde, 0xad, + 0xbe, 0xef, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x18, 0x00, 0x0b, 0x03, 0x6c, + 0x61, 0x62, 0x05, 0x69, 0x6e, 0x74, 0x72, 0x61, + 0x00, 0x00, 0x1f, 0x00, 0x10, 0x20, 0x01, 0x0d, + 0xb8, 0xde, 0xad, 0xbe, 0xef, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01 +}; + static int test_advertise_option(sd_event *e) { _cleanup_dhcp6_lease_free_ sd_dhcp6_lease *lease = NULL; DHCP6Message *advertise = (DHCP6Message *)msg_advertise; - uint8_t *optval, *opt = &msg_advertise[sizeof(DHCP6Message)]; + uint8_t *optval, *opt = msg_advertise + sizeof(DHCP6Message); uint16_t optcode; - size_t optlen, len = sizeof(msg_advertise); + size_t optlen, len = sizeof(msg_advertise) - sizeof(DHCP6Message); be32_t val; uint8_t preference = 255; struct in6_addr addr; @@ -238,6 +271,11 @@ static int test_advertise_option(sd_event *e) { *optval) >= 0); break; + case DHCP6_OPTION_ELAPSED_TIME: + assert_se(optlen == 2); + + break; + default: break; } @@ -307,6 +345,20 @@ int dhcp6_network_bind_udp_socket(int index, struct in6_addr *local_address) { } static int test_client_send_reply(DHCP6Message *request) { + DHCP6Message reply; + + reply.transaction_id = request->transaction_id; + reply.type = DHCP6_REPLY; + + memcpy(msg_reply, &reply.transaction_id, 4); + + memcpy(&msg_reply[26], test_duid, sizeof(test_duid)); + + memcpy(&msg_reply[44], &test_iaid, sizeof(test_iaid)); + + assert_se(write(test_dhcp_fd[1], msg_reply, sizeof(msg_reply)) + == sizeof(msg_reply)); + return 0; } @@ -316,7 +368,8 @@ static int test_client_verify_request(DHCP6Message *request, uint8_t *option, uint8_t *optval; uint16_t optcode; size_t optlen; - bool found_clientid = false, found_iana = false, found_serverid = false; + bool found_clientid = false, found_iana = false, found_serverid = false, + found_elapsed_time = false; int r; struct in6_addr addr; be32_t val; @@ -364,12 +417,21 @@ static int test_client_verify_request(DHCP6Message *request, uint8_t *option, assert_se(optlen == 14); assert_se(!memcmp(&msg_advertise[179], optval, optlen)); + break; + + case DHCP6_OPTION_ELAPSED_TIME: + assert_se(!found_elapsed_time); + found_elapsed_time = true; + + assert_se(optlen == 2); + break; } } assert_se(r == -ENOMSG); - assert_se(found_clientid && found_iana && found_serverid); + assert_se(found_clientid && found_iana && found_serverid && + found_elapsed_time); assert_se(sd_dhcp6_lease_get_first_address(lease, &addr, <_pref, <_valid) >= 0); @@ -380,8 +442,6 @@ static int test_client_verify_request(DHCP6Message *request, uint8_t *option, assert_se(sd_dhcp6_lease_get_next_address(lease, &addr, <_pref, <_valid) == -ENOMSG); - sd_event_exit(e_solicit, 0); - return 0; } @@ -409,7 +469,8 @@ static int test_client_verify_solicit(DHCP6Message *solicit, uint8_t *option, uint8_t *optval; uint16_t optcode; size_t optlen; - bool found_clientid = false, found_iana = false; + bool found_clientid = false, found_iana = false, + found_elapsed_time = false; int r; assert_se(solicit->type == DHCP6_SOLICIT); @@ -434,12 +495,20 @@ static int test_client_verify_solicit(DHCP6Message *solicit, uint8_t *option, memcpy(&test_iaid, optval, sizeof(test_iaid)); + break; + + case DHCP6_OPTION_ELAPSED_TIME: + assert_se(!found_elapsed_time); + found_elapsed_time = true; + + assert_se(optlen == 2); + break; } } assert_se(r == -ENOMSG); - assert_se(found_clientid && found_iana); + assert_se(found_clientid && found_iana && found_elapsed_time); return 0; } @@ -482,6 +551,9 @@ static void test_client_solicit_cb(sd_dhcp6_client *client, int event, sd_event *e = userdata; assert_se(e); + assert_se(event == DHCP6_EVENT_IP_ACQUIRE); + + assert_se(sd_dhcp6_client_set_request_option(client, DHCP6_OPTION_DNS_SERVERS) == -EBUSY); if (verbose) printf(" got DHCPv6 event %d\n", event); @@ -491,7 +563,7 @@ static void test_client_solicit_cb(sd_dhcp6_client *client, int event, static int test_client_solicit(sd_event *e) { sd_dhcp6_client *client; - usec_t time_now = now(CLOCK_MONOTONIC); + usec_t time_now = now(clock_boottime_or_monotonic()); if (verbose) printf("* %s\n", __FUNCTION__); @@ -502,17 +574,17 @@ static int test_client_solicit(sd_event *e) { assert_se(sd_dhcp6_client_attach_event(client, e, 0) >= 0); assert_se(sd_dhcp6_client_set_index(client, test_index) == 0); - assert_se(sd_dhcp6_client_set_mac(client, &mac_addr) >= 0); + assert_se(sd_dhcp6_client_set_mac(client, (const uint8_t *) &mac_addr, + sizeof (mac_addr), + ARPHRD_ETHER) >= 0); assert_se(sd_dhcp6_client_set_callback(client, test_client_solicit_cb, e) >= 0); - assert_se(sd_event_add_time(e, &hangcheck, CLOCK_MONOTONIC, + assert_se(sd_event_add_time(e, &hangcheck, clock_boottime_or_monotonic(), time_now + 2 * USEC_PER_SEC, 0, test_hangcheck, NULL) >= 0); - e_solicit = e; - assert_se(sd_dhcp6_client_start(client) >= 0); sd_event_loop(e);