fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 12:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

n-dhcp4: re-import git-subtree for 'src/n-dhcp4'

Browse source 
git subtree pull --prefix src/n-dhcp4 git@github.com:nettools/n-dhcp4.git master --squash
This commit is contained in:
Thomas Haller 2022-04-13 10:57:57 +02:00
commit 2fff437955
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/n-dhcp4/src/libndhcp4.sym
View file

@ -35,6 +35,7 @@ global:
n_dhcp4_client_lease_unref;
n_dhcp4_client_lease_get_yiaddr;
n_dhcp4_client_lease_get_siaddr;
n_dhcp4_client_lease_get_basetime;
n_dhcp4_client_lease_get_lifetime;
n_dhcp4_client_lease_get_server_identifier;
n_dhcp4_client_lease_get_file;

16
src/n-dhcp4/src/n-dhcp4-c-lease.c
View file

@ -251,7 +251,7 @@ _c_public_ void n_dhcp4_client_lease_get_lifetime(NDhcp4ClientLease *lease, uint
*
* Return: 0 on success,
* N_DHCP4_E_UNSET if the lease doesn't contain a server-identifier, or
* N_DCHP4_E_INTERNAL if the server-identifier is not valid.
* N_DHCP4_E_INTERNAL if the server-identifier is not valid.
*/
_c_public_ int n_dhcp4_client_lease_get_server_identifier(NDhcp4ClientLease *lease, struct in_addr *addr) {
uint8_t *data;
@ -279,25 +279,25 @@ _c_public_ int n_dhcp4_client_lease_get_server_identifier(NDhcp4ClientLease *lea
*
* Return: 0 on success,
* N_DHCP4_E_UNSET if the lease does not contain a file name, or
* N_DCHP4_E_INTERNAL if the file name is invalid.
* N_DHCP4_E_INTERNAL if the file name is invalid.
*/
_c_public_ int n_dhcp4_client_lease_get_file(NDhcp4ClientLease *lease, const char **file) {
NDhcp4Message *message;
if (lease->message->options[N_DHCP4_OPTION_OVERLOAD].size > 0
&& ((*lease->message->options[N_DHCP4_OPTION_OVERLOAD].value) & N_DHCP4_OVERLOAD_FILE)) {
/* The field is overloaded to contain other options */
return N_DHCP4_E_UNSET;
/* The field is overloaded to contain other options */
return N_DHCP4_E_UNSET;
}
message = &lease->message->message;
if (message->file[0] == '\0')
return N_DHCP4_E_UNSET;
return N_DHCP4_E_UNSET;
if (!memchr(message->file, '\0', sizeof(message->file))) {
/* The field is NULL-terminated (RFC 2131 section 2) */
return N_DHCP4_E_INTERNAL;
/* The field is NULL-terminated (RFC 2131 section 2) */
return N_DHCP4_E_INTERNAL;
}
*file = (const char *) message->file;
@ -316,7 +316,7 @@ _c_public_ int n_dhcp4_client_lease_get_file(NDhcp4ClientLease *lease, const cha
* be queried, and only options that were explicitly requested can be queried.
*
* Return: 0 on success,
* N_DCHP4_E_INTERNAL if an invalid option is queried,
* N_DHCP4_E_INTERNAL if an invalid option is queried,
* N_DHCP4_E_UNSET if the lease did not contain the option, or
* a negative error code on failure.
*/

1
src/n-dhcp4/src/test-api.c
View file

@ -107,6 +107,7 @@ static void test_api_functions(void) {
(void *)n_dhcp4_client_lease_get_siaddr,
(void *)n_dhcp4_client_lease_get_lifetime,
(void *)n_dhcp4_client_lease_get_server_identifier,
(void *)n_dhcp4_client_lease_get_file,
(void *)n_dhcp4_client_lease_query,
(void *)n_dhcp4_client_lease_select,
(void *)n_dhcp4_client_lease_accept,