picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-ipv4ll: fix namespacing

Browse source 
Prefix all exported constants with SD_IPV4LL_* to avoid namespacing
conflicts.
This commit is contained in:
David Herrmann 2015-09-22 15:08:28 +02:00
parent 2237aa02f3
commit be19c5b5e0
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libsystemd-network/sd-ipv4ll.c
View file

@ -298,21 +298,21 @@ void ipv4ll_on_acd(sd_ipv4acd *acd, int event, void *userdata) {
switch (event) {
case SD_IPV4ACD_EVENT_STOP:
ipv4ll_client_notify(ll, IPV4LL_EVENT_STOP);
ipv4ll_client_notify(ll, SD_IPV4LL_EVENT_STOP);
ll->claimed_address = 0;
break;
case SD_IPV4ACD_EVENT_BIND:
ll->claimed_address = ll->address;
ipv4ll_client_notify(ll, IPV4LL_EVENT_BIND);
ipv4ll_client_notify(ll, SD_IPV4LL_EVENT_BIND);
break;
case SD_IPV4ACD_EVENT_CONFLICT:
/* if an address was already bound we must call up to the
user to handle this, otherwise we just try again */
if (ll->claimed_address != 0) {
ipv4ll_client_notify(ll, IPV4LL_EVENT_CONFLICT);
ipv4ll_client_notify(ll, SD_IPV4LL_EVENT_CONFLICT);
ll->claimed_address = 0;
} else {
@ -333,5 +333,5 @@ void ipv4ll_on_acd(sd_ipv4acd *acd, int event, void *userdata) {
return;
error:
ipv4ll_client_notify(ll, IPV4LL_EVENT_STOP);
ipv4ll_client_notify(ll, SD_IPV4LL_EVENT_STOP);
}

6
src/libsystemd-network/test-ipv4ll-manual.c
View file

@ -45,13 +45,13 @@ static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
assert_se(in_addr_to_string(AF_INET, (const union in_addr_union*) &addr, &address) >= 0);
switch (event) {
case IPV4LL_EVENT_BIND:
case SD_IPV4LL_EVENT_BIND:
log_info("bound %s", strna(address));
break;
case IPV4LL_EVENT_CONFLICT:
case SD_IPV4LL_EVENT_CONFLICT:
log_info("conflict on %s", strna(address));
break;
case IPV4LL_EVENT_STOP:
case SD_IPV4LL_EVENT_STOP:
log_error("the client was stopped with address %s", strna(address));
break;
default:

4
src/libsystemd-network/test-ipv4ll.c
View file

@ -44,10 +44,10 @@ static void basic_request_handler(sd_ipv4ll *ll, int event, void *userdata) {
assert_se(userdata == basic_request_handler_userdata);
switch(event) {
case IPV4LL_EVENT_STOP:
case SD_IPV4LL_EVENT_STOP:
basic_request_handler_stop = 1;
break;
case IPV4LL_EVENT_BIND:
case SD_IPV4LL_EVENT_BIND:
basic_request_handler_bind = 1;
break;
default:

6
src/network/networkd-ipv4ll.c
View file

@ -179,15 +179,15 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){
return;
switch(event) {
case IPV4LL_EVENT_STOP:
case IPV4LL_EVENT_CONFLICT:
case SD_IPV4LL_EVENT_STOP:
case SD_IPV4LL_EVENT_CONFLICT:
r = ipv4ll_address_lost(link);
if (r < 0) {
link_enter_failed(link);
return;
}
break;
case IPV4LL_EVENT_BIND:
case SD_IPV4LL_EVENT_BIND:
r = ipv4ll_address_claimed(ll, link);
if (r < 0) {
link_enter_failed(link);

6
src/systemd/sd-ipv4ll.h
View file

@ -29,9 +29,9 @@
#include "sd-event.h"
enum {
IPV4LL_EVENT_STOP = 0,
IPV4LL_EVENT_BIND = 1,
IPV4LL_EVENT_CONFLICT = 2,
SD_IPV4LL_EVENT_STOP = 0,
SD_IPV4LL_EVENT_BIND = 1,
SD_IPV4LL_EVENT_CONFLICT = 2,
};
typedef struct sd_ipv4ll sd_ipv4ll;