From 892ddeb5190dd5c1ffa26a95142a10a0034fc5e3 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Wed, 20 Jan 2016 13:05:10 +0100 Subject: Rename dp_dyndns.h to be_dyndns.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Sumit Bose Reviewed-by: Jakub Hrozek Reviewed-by: Lukáš Slebodník --- Makefile.am | 2 +- src/providers/ad/ad_common.c | 2 +- src/providers/ad/ad_dyndns.c | 2 +- src/providers/ad/ad_init.c | 2 +- src/providers/be_dyndns.h | 143 +++++++++++++++++++++++++++++++++++++++ src/providers/dp_dyndns.c | 2 +- src/providers/dp_dyndns.h | 143 --------------------------------------- src/providers/ipa/ipa_common.c | 2 +- src/providers/ipa/ipa_dyndns.c | 2 +- src/providers/ipa/ipa_init.c | 2 +- src/providers/ldap/sdap_dyndns.c | 2 +- src/providers/ldap/sdap_dyndns.h | 2 +- src/tests/cmocka/test_dyndns.c | 2 +- src/tests/ipa_ldap_opt-tests.c | 2 +- 14 files changed, 155 insertions(+), 155 deletions(-) create mode 100644 src/providers/be_dyndns.h delete mode 100644 src/providers/dp_dyndns.h diff --git a/Makefile.am b/Makefile.am index 89b210930..980859a54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -615,7 +615,7 @@ dist_noinst_HEADERS = \ src/providers/data_provider_req.h \ src/providers/data_provider_iface_generated.h \ src/providers/dp_backend.h \ - src/providers/dp_dyndns.h \ + src/providers/be_dyndns.h \ src/providers/be_ptask_private.h \ src/providers/be_ptask.h \ src/providers/be_refresh.h \ diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c index be16b4306..9f9f9f1bd 100644 --- a/src/providers/ad/ad_common.c +++ b/src/providers/ad/ad_common.c @@ -23,7 +23,7 @@ #include "providers/ad/ad_common.h" #include "providers/ad/ad_opts.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" struct ad_server_data { bool gc; diff --git a/src/providers/ad/ad_dyndns.c b/src/providers/ad/ad_dyndns.c index a4d38c442..e3f181283 100644 --- a/src/providers/ad/ad_dyndns.c +++ b/src/providers/ad/ad_dyndns.c @@ -26,7 +26,7 @@ #include "util/util.h" #include "providers/ldap/sdap_dyndns.h" #include "providers/data_provider.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "providers/ad/ad_common.h" void ad_dyndns_update(void *pvt); diff --git a/src/providers/ad/ad_init.c b/src/providers/ad/ad_init.c index b17a9f50a..905338135 100644 --- a/src/providers/ad/ad_init.c +++ b/src/providers/ad/ad_init.c @@ -38,7 +38,7 @@ #include "providers/krb5/krb5_init_shared.h" #include "providers/ad/ad_id.h" #include "providers/ad/ad_srv.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "providers/ad/ad_subdomains.h" #include "providers/ad/ad_domain_info.h" diff --git a/src/providers/be_dyndns.h b/src/providers/be_dyndns.h new file mode 100644 index 000000000..9f39e5d48 --- /dev/null +++ b/src/providers/be_dyndns.h @@ -0,0 +1,143 @@ +/* + SSSD + + dp_dyndns.h + + Authors: + Jakub Hrozek + + Copyright (C) 2013 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + +#ifndef DP_DYNDNS_H_ +#define DP_DYNDNS_H_ + +/* dynamic dns helpers */ +struct sss_iface_addr; + +typedef void (*nsupdate_timer_fn_t)(void *pvt); + +enum be_nsupdate_auth { + BE_NSUPDATE_AUTH_NONE, + BE_NSUPDATE_AUTH_GSS_TSIG, +}; + +struct be_nsupdate_ctx { + struct dp_option *opts; + enum be_nsupdate_auth auth_type; + + time_t last_refresh; + bool timer_in_progress; + struct tevent_timer *refresh_timer; + nsupdate_timer_fn_t timer_callback; + void *timer_pvt; +}; + +enum dp_dyndns_opts { + DP_OPT_DYNDNS_UPDATE, + DP_OPT_DYNDNS_REFRESH_INTERVAL, + DP_OPT_DYNDNS_IFACE, + DP_OPT_DYNDNS_TTL, + DP_OPT_DYNDNS_UPDATE_PTR, + DP_OPT_DYNDNS_FORCE_TCP, + DP_OPT_DYNDNS_AUTH, + DP_OPT_DYNDNS_SERVER, + + DP_OPT_DYNDNS /* attrs counter */ +}; + +#define DYNDNS_REMOVE_A 0x1 +#define DYNDNS_REMOVE_AAAA 0x2 + +errno_t be_nsupdate_check(void); + +errno_t +be_nsupdate_init(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, + struct dp_option *defopts, + struct be_nsupdate_ctx **_ctx); + +errno_t be_nsupdate_init_timer(struct be_nsupdate_ctx *ctx, + struct tevent_context *ev, + nsupdate_timer_fn_t timer_callback, + void *timer_pvt); + +void be_nsupdate_timer_schedule(struct tevent_context *ev, + struct be_nsupdate_ctx *ctx); + +errno_t +sss_iface_addr_list_get(TALLOC_CTX *mem_ctx, const char *ifname, + struct sss_iface_addr **_addrlist); + +errno_t +sss_iface_addr_list_as_str_list(TALLOC_CTX *mem_ctx, + struct sss_iface_addr *ifaddr_list, + char ***_straddrs); + +errno_t +be_nsupdate_create_fwd_msg(TALLOC_CTX *mem_ctx, const char *realm, + const char *servername, + const char *hostname, const unsigned int ttl, + uint8_t remove_af, struct sss_iface_addr *addresses, + char **_update_msg); + +errno_t +be_nsupdate_create_ptr_msg(TALLOC_CTX *mem_ctx, const char *realm, + const char *servername, const char *hostname, + const unsigned int ttl, + struct sockaddr_storage *address, + bool delete, + char **_update_msg); + +/* Returns: + * * ERR_OK - on success + * * ERR_DYNDNS_FAILED - if nsupdate fails for any reason + * * ERR_DYNDNS_TIMEOUT - if the update times out. child_status + * is ETIMEDOUT in this case + */ +struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + enum be_nsupdate_auth auth_type, + char *nsupdate_msg, + bool force_tcp); +errno_t be_nsupdate_recv(struct tevent_req *req, int *child_status); + +struct tevent_req * nsupdate_get_addrs_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct be_resolv_ctx *be_res, + const char *hostname); +errno_t +nsupdate_get_addrs_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + struct sss_iface_addr **_addrlist, + size_t *_count); + +void +sss_iface_addr_concatenate(struct sss_iface_addr **list, + struct sss_iface_addr *list2); + +errno_t +sss_get_dualstack_addresses(TALLOC_CTX *mem_ctx, + struct sockaddr *ss, + struct sss_iface_addr **_iface_addrs); + +struct sss_iface_addr * +sss_iface_addr_get_next(struct sss_iface_addr *address); + +struct sockaddr_storage* +sss_iface_addr_get_address(struct sss_iface_addr *address); + +#endif /* DP_DYNDNS_H_ */ diff --git a/src/providers/dp_dyndns.c b/src/providers/dp_dyndns.c index b12cd514c..a136dbe05 100644 --- a/src/providers/dp_dyndns.c +++ b/src/providers/dp_dyndns.c @@ -35,7 +35,7 @@ #include "util/child_common.h" #include "providers/data_provider.h" #include "providers/dp_backend.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "resolv/async_resolv.h" #ifndef DYNDNS_TIMEOUT diff --git a/src/providers/dp_dyndns.h b/src/providers/dp_dyndns.h deleted file mode 100644 index 9f39e5d48..000000000 --- a/src/providers/dp_dyndns.h +++ /dev/null @@ -1,143 +0,0 @@ -/* - SSSD - - dp_dyndns.h - - Authors: - Jakub Hrozek - - Copyright (C) 2013 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - - -#ifndef DP_DYNDNS_H_ -#define DP_DYNDNS_H_ - -/* dynamic dns helpers */ -struct sss_iface_addr; - -typedef void (*nsupdate_timer_fn_t)(void *pvt); - -enum be_nsupdate_auth { - BE_NSUPDATE_AUTH_NONE, - BE_NSUPDATE_AUTH_GSS_TSIG, -}; - -struct be_nsupdate_ctx { - struct dp_option *opts; - enum be_nsupdate_auth auth_type; - - time_t last_refresh; - bool timer_in_progress; - struct tevent_timer *refresh_timer; - nsupdate_timer_fn_t timer_callback; - void *timer_pvt; -}; - -enum dp_dyndns_opts { - DP_OPT_DYNDNS_UPDATE, - DP_OPT_DYNDNS_REFRESH_INTERVAL, - DP_OPT_DYNDNS_IFACE, - DP_OPT_DYNDNS_TTL, - DP_OPT_DYNDNS_UPDATE_PTR, - DP_OPT_DYNDNS_FORCE_TCP, - DP_OPT_DYNDNS_AUTH, - DP_OPT_DYNDNS_SERVER, - - DP_OPT_DYNDNS /* attrs counter */ -}; - -#define DYNDNS_REMOVE_A 0x1 -#define DYNDNS_REMOVE_AAAA 0x2 - -errno_t be_nsupdate_check(void); - -errno_t -be_nsupdate_init(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, - struct dp_option *defopts, - struct be_nsupdate_ctx **_ctx); - -errno_t be_nsupdate_init_timer(struct be_nsupdate_ctx *ctx, - struct tevent_context *ev, - nsupdate_timer_fn_t timer_callback, - void *timer_pvt); - -void be_nsupdate_timer_schedule(struct tevent_context *ev, - struct be_nsupdate_ctx *ctx); - -errno_t -sss_iface_addr_list_get(TALLOC_CTX *mem_ctx, const char *ifname, - struct sss_iface_addr **_addrlist); - -errno_t -sss_iface_addr_list_as_str_list(TALLOC_CTX *mem_ctx, - struct sss_iface_addr *ifaddr_list, - char ***_straddrs); - -errno_t -be_nsupdate_create_fwd_msg(TALLOC_CTX *mem_ctx, const char *realm, - const char *servername, - const char *hostname, const unsigned int ttl, - uint8_t remove_af, struct sss_iface_addr *addresses, - char **_update_msg); - -errno_t -be_nsupdate_create_ptr_msg(TALLOC_CTX *mem_ctx, const char *realm, - const char *servername, const char *hostname, - const unsigned int ttl, - struct sockaddr_storage *address, - bool delete, - char **_update_msg); - -/* Returns: - * * ERR_OK - on success - * * ERR_DYNDNS_FAILED - if nsupdate fails for any reason - * * ERR_DYNDNS_TIMEOUT - if the update times out. child_status - * is ETIMEDOUT in this case - */ -struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - enum be_nsupdate_auth auth_type, - char *nsupdate_msg, - bool force_tcp); -errno_t be_nsupdate_recv(struct tevent_req *req, int *child_status); - -struct tevent_req * nsupdate_get_addrs_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct be_resolv_ctx *be_res, - const char *hostname); -errno_t -nsupdate_get_addrs_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - struct sss_iface_addr **_addrlist, - size_t *_count); - -void -sss_iface_addr_concatenate(struct sss_iface_addr **list, - struct sss_iface_addr *list2); - -errno_t -sss_get_dualstack_addresses(TALLOC_CTX *mem_ctx, - struct sockaddr *ss, - struct sss_iface_addr **_iface_addrs); - -struct sss_iface_addr * -sss_iface_addr_get_next(struct sss_iface_addr *address); - -struct sockaddr_storage* -sss_iface_addr_get_address(struct sss_iface_addr *address); - -#endif /* DP_DYNDNS_H_ */ diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 90be42751..b15ccc6ee 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -30,7 +30,7 @@ #include "providers/ipa/ipa_common.h" #include "providers/ipa/ipa_dyndns.h" #include "providers/ldap/sdap_async_private.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "util/sss_krb5.h" #include "db/sysdb_services.h" #include "db/sysdb_autofs.h" diff --git a/src/providers/ipa/ipa_dyndns.c b/src/providers/ipa/ipa_dyndns.c index 1a7014718..7217c6145 100644 --- a/src/providers/ipa/ipa_dyndns.c +++ b/src/providers/ipa/ipa_dyndns.c @@ -28,7 +28,7 @@ #include "providers/ipa/ipa_common.h" #include "providers/ipa/ipa_dyndns.h" #include "providers/data_provider.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" void ipa_dyndns_update(void *pvt); diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index 453e2b256..6ef8ecafc 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -41,7 +41,7 @@ #include "providers/ldap/sdap_idmap.h" #include "providers/ipa/ipa_subdomains.h" #include "providers/ipa/ipa_srv.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" struct ipa_options *ipa_options = NULL; diff --git a/src/providers/ldap/sdap_dyndns.c b/src/providers/ldap/sdap_dyndns.c index 456aa5592..8b3b2a75d 100644 --- a/src/providers/ldap/sdap_dyndns.c +++ b/src/providers/ldap/sdap_dyndns.c @@ -25,7 +25,7 @@ #include "util/util.h" #include "resolv/async_resolv.h" #include "providers/dp_backend.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "providers/ldap/sdap_async_private.h" #include "providers/ldap/sdap_dyndns.h" #include "providers/ldap/sdap_id_op.h" diff --git a/src/providers/ldap/sdap_dyndns.h b/src/providers/ldap/sdap_dyndns.h index fda4530b6..415faf8e8 100644 --- a/src/providers/ldap/sdap_dyndns.h +++ b/src/providers/ldap/sdap_dyndns.h @@ -27,7 +27,7 @@ #include "util/util.h" #include "providers/dp_backend.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "providers/ldap/ldap_common.h" struct tevent_req * diff --git a/src/tests/cmocka/test_dyndns.c b/src/tests/cmocka/test_dyndns.c index 43df0e1b5..5dc841b18 100644 --- a/src/tests/cmocka/test_dyndns.c +++ b/src/tests/cmocka/test_dyndns.c @@ -34,7 +34,7 @@ #include "tests/cmocka/common_mock.h" #include "tests/cmocka/common_mock_be.h" -#include "src/providers/dp_dyndns.h" +#include "src/providers/be_dyndns.h" #define TESTS_PATH "tp_" BASE_FILE_STEM #define TEST_CONF_DB "test_dyndns_conf.ldb" diff --git a/src/tests/ipa_ldap_opt-tests.c b/src/tests/ipa_ldap_opt-tests.c index 8587e8df7..622a617c3 100644 --- a/src/tests/ipa_ldap_opt-tests.c +++ b/src/tests/ipa_ldap_opt-tests.c @@ -33,7 +33,7 @@ #include "providers/krb5/krb5_opts.h" #include "providers/krb5/krb5_common.h" #include "providers/ad/ad_opts.h" -#include "providers/dp_dyndns.h" +#include "providers/be_dyndns.h" #include "tests/common.h" struct test_domain { -- cgit