Skip to content
Snippets Groups Projects
Commit fcbcbff2 authored by ahedberg's avatar ahedberg
Browse files

prefix external linkage functions with grpc

parent 43df2955
No related branches found
No related tags found
No related merge requests found
...@@ -351,21 +351,22 @@ static void sockaddr_factory_ref(grpc_resolver_factory *factory) {} ...@@ -351,21 +351,22 @@ static void sockaddr_factory_ref(grpc_resolver_factory *factory) {}
static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} static void sockaddr_factory_unref(grpc_resolver_factory *factory) {}
#define DECL_FACTORY(name) \ #define DECL_FACTORY(name, prefix) \
static grpc_resolver *name##_factory_create_resolver( \ static grpc_resolver *name##_factory_create_resolver( \
grpc_resolver_factory *factory, grpc_resolver_args *args) { \ grpc_resolver_factory *factory, grpc_resolver_args *args) { \
return sockaddr_create(args, "pick_first", parse_##name); \ return sockaddr_create(args, "pick_first", prefix##parse_##name); \
} \ } \
static const grpc_resolver_factory_vtable name##_factory_vtable = { \ static const grpc_resolver_factory_vtable name##_factory_vtable = { \
sockaddr_factory_ref, sockaddr_factory_unref, \ sockaddr_factory_ref, sockaddr_factory_unref, \
name##_factory_create_resolver, name##_get_default_authority, #name}; \ name##_factory_create_resolver, prefix##name##_get_default_authority, \
#name}; \
static grpc_resolver_factory name##_resolver_factory = { \ static grpc_resolver_factory name##_resolver_factory = { \
&name##_factory_vtable}; \ &name##_factory_vtable}; \
grpc_resolver_factory *grpc_##name##_resolver_factory_create() { \ grpc_resolver_factory *grpc_##name##_resolver_factory_create() { \
return &name##_resolver_factory; \ return &name##_resolver_factory; \
} }
#ifdef GPR_POSIX_SOCKET #ifdef GPR_HAVE_UNIX_SOCKET
DECL_FACTORY(unix) DECL_FACTORY(unix, grpc_)
#endif #endif
DECL_FACTORY(ipv4) DECL_FACTORY(ipv6) DECL_FACTORY(ipv4, ) DECL_FACTORY(ipv6, )
...@@ -194,7 +194,7 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { ...@@ -194,7 +194,7 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) {
if (s->head) { if (s->head) {
grpc_tcp_listener *sp; grpc_tcp_listener *sp;
for (sp = s->head; sp; sp = sp->next) { for (sp = s->head; sp; sp = sp->next) {
unlink_if_unix_domain_socket(&sp->addr.sockaddr); grpc_unlink_if_unix_domain_socket(&sp->addr.sockaddr);
sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb = destroyed_port;
sp->destroyed_closure.cb_arg = s; sp->destroyed_closure.cb_arg = s;
grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL, grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL,
...@@ -441,7 +441,7 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr, ...@@ -441,7 +441,7 @@ int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr,
if (s->tail != NULL) { if (s->tail != NULL) {
port_index = s->tail->port_index + 1; port_index = s->tail->port_index + 1;
} }
unlink_if_unix_domain_socket((struct sockaddr *)addr); grpc_unlink_if_unix_domain_socket((struct sockaddr *)addr);
/* Check if this is a wildcard port, and if so, try to keep the port the same /* Check if this is a wildcard port, and if so, try to keep the port the same
as some previously created listener. */ as some previously created listener. */
......
...@@ -167,7 +167,7 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { ...@@ -167,7 +167,7 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) {
if (s->nports) { if (s->nports) {
for (i = 0; i < s->nports; i++) { for (i = 0; i < s->nports; i++) {
server_port *sp = &s->ports[i]; server_port *sp = &s->ports[i];
unlink_if_unix_domain_socket(&sp->addr.sockaddr); grpc_unlink_if_unix_domain_socket(&sp->addr.sockaddr);
sp->destroyed_closure.cb = destroyed_port; sp->destroyed_closure.cb = destroyed_port;
sp->destroyed_closure.cb_arg = s; sp->destroyed_closure.cb_arg = s;
grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL, grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL,
...@@ -325,7 +325,7 @@ int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr, ...@@ -325,7 +325,7 @@ int grpc_udp_server_add_port(grpc_udp_server *s, const void *addr,
socklen_t sockname_len; socklen_t sockname_len;
int port; int port;
unlink_if_unix_domain_socket((struct sockaddr *)addr); grpc_unlink_if_unix_domain_socket((struct sockaddr *)addr);
/* Check if this is a wildcard port, and if so, try to keep the port the same /* Check if this is a wildcard port, and if so, try to keep the port the same
as some previously created listener. */ as some previously created listener. */
......
...@@ -62,7 +62,7 @@ int grpc_is_unix_socket(const struct sockaddr *addr) { ...@@ -62,7 +62,7 @@ int grpc_is_unix_socket(const struct sockaddr *addr) {
return addr->sa_family == AF_UNIX; return addr->sa_family == AF_UNIX;
} }
void unlink_if_unix_domain_socket(const struct sockaddr *addr) { void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr) {
if (addr->sa_family != AF_UNIX) { if (addr->sa_family != AF_UNIX) {
return; return;
} }
...@@ -74,7 +74,7 @@ void unlink_if_unix_domain_socket(const struct sockaddr *addr) { ...@@ -74,7 +74,7 @@ void unlink_if_unix_domain_socket(const struct sockaddr *addr) {
} }
} }
int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
struct sockaddr_un *un = (struct sockaddr_un *)addr; struct sockaddr_un *un = (struct sockaddr_un *)addr;
un->sun_family = AF_UNIX; un->sun_family = AF_UNIX;
...@@ -84,8 +84,8 @@ int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { ...@@ -84,8 +84,8 @@ int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
return 1; return 1;
} }
char *unix_get_default_authority(grpc_resolver_factory *factory, char *grpc_unix_get_default_authority(grpc_resolver_factory *factory,
grpc_uri *uri) { grpc_uri *uri) {
return gpr_strdup("localhost"); return gpr_strdup("localhost");
} }
......
...@@ -52,11 +52,12 @@ grpc_resolved_addresses *grpc_resolve_unix_domain_address(const char* name); ...@@ -52,11 +52,12 @@ grpc_resolved_addresses *grpc_resolve_unix_domain_address(const char* name);
int grpc_is_unix_socket(const struct sockaddr *addr); int grpc_is_unix_socket(const struct sockaddr *addr);
void unlink_if_unix_domain_socket(const struct sockaddr *addr); void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr);
int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len); int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len);
char *unix_get_default_authority(grpc_resolver_factory *factory, grpc_uri *uri); char *grpc_unix_get_default_authority(grpc_resolver_factory *factory,
grpc_uri *uri);
char *grpc_sockaddr_to_uri_unix_if_possible(const struct sockaddr *addr); char *grpc_sockaddr_to_uri_unix_if_possible(const struct sockaddr *addr);
......
...@@ -46,14 +46,14 @@ int grpc_is_unix_socket(const struct sockaddr *addr) { ...@@ -46,14 +46,14 @@ int grpc_is_unix_socket(const struct sockaddr *addr) {
return false; return false;
} }
void unlink_if_unix_domain_socket(const struct sockaddr *addr) {} void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr) {}
int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
return 0; return 0;
} }
char *unix_get_default_authority(grpc_resolver_factory *factory, char *grpc_unix_get_default_authority(grpc_resolver_factory *factory,
grpc_uri *uri) { grpc_uri *uri) {
return NULL; return NULL;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment