From 48354754a89e16001bcaab166dc1a25b2d343b9a Mon Sep 17 00:00:00 2001 From: henri Date: Mon, 22 Apr 2013 19:30:23 +0000 Subject: [PATCH] Renamed proxy actions into proxy op, which seems to be rather more meaningful. --- nsock/src/nsock_connect.c | 2 +- nsock/src/nsock_proxy.c | 2 +- nsock/src/nsock_proxy.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nsock/src/nsock_connect.c b/nsock/src/nsock_connect.c index e262fc538..a0e9fba90 100644 --- a/nsock/src/nsock_connect.c +++ b/nsock/src/nsock_connect.c @@ -67,7 +67,7 @@ /* Defined in nsock_proxy.c */ -extern struct proxy_actions ProxyActions[]; +extern struct proxy_op ProxyOps[]; /* Create the actual socket (nse->iod->sd) underlying the iod. This unblocks the diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c index 44fa6ff64..d7a0a63d8 100644 --- a/nsock/src/nsock_proxy.c +++ b/nsock/src/nsock_proxy.c @@ -99,7 +99,7 @@ static char *proxy_http_data_encode(const char *src, size_t len, size_t *dlen); static char *proxy_http_data_decode(const char *src, size_t len, size_t *dlen); -const struct proxy_actions ProxyActions[PROXY_TYPE_COUNT] = { +const struct proxy_op ProxyOps[PROXY_TYPE_COUNT] = { [PROXY_TYPE_HTTP] = { .connect_tcp = proxy_http_connect_tcp, .data_encode = proxy_http_data_encode, diff --git a/nsock/src/nsock_proxy.h b/nsock/src/nsock_proxy.h index 181389d2d..fbe33a430 100644 --- a/nsock/src/nsock_proxy.h +++ b/nsock/src/nsock_proxy.h @@ -66,9 +66,9 @@ #define PROXY_CTX_NEXT(ctx) ((struct proxy_node *)((GH_LIST_ELEM_NEXT((ctx)->px_current)) ? GH_LIST_ELEM_DATA(GH_LIST_ELEM_NEXT((ctx)->px_current)) : NULL)) #define PROXY_CTX_NODES(ctx) ((ctx)->px_chain->nodes) -#define IOD_PX_TCP_CONNECT(iod) (ProxyActions[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].connect_tcp) -#define IOD_PX_DATA_ENCODE(iod) (ProxyActions[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].data_encode) -#define IOD_PX_DATA_DECODE(iod) (ProxyActions[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].data_decode) +#define IOD_PX_TCP_CONNECT(iod) (ProxyOps[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].connect_tcp) +#define IOD_PX_DATA_ENCODE(iod) (ProxyOps[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].data_encode) +#define IOD_PX_DATA_DECODE(iod) (ProxyOps[PROXY_CTX_CURRENT((iod)->px_ctx)->px_type].data_decode) /* ------------------- CONSTANTS ------------------- */ @@ -116,7 +116,7 @@ struct proxy_chain_context { nsock_ev_handler target_handler; }; -struct proxy_actions { +struct proxy_op { nsock_event_id (*connect_tcp)(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler handler, int mstimeout, void *userdata, struct sockaddr *saddr, size_t sslen, unsigned short port); char *(*data_encode)(const char *src, size_t len, size_t *dlen);