- Timestamp:
- Sep 27, 2004, 4:00:52 PM (18 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream
- Children:
- dae0aec
- Parents:
- 7e2b223
- Location:
- src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_io.c
r7e2b223 r2e12226 29 29 apr_off_t readbytes) 30 30 { 31 apr_bucket *b;31 apr_bucket *b; 32 32 apr_status_t status = APR_SUCCESS; 33 gnutls_handle_t *ctxt = (gnutls_handle_t *) f->ctx;33 mod_gnutls_handle_t *ctxt = (mod_gnutls_handle_t *) f->ctx; 34 34 35 35 if (f->c->aborted) { … … 62 62 const char *buf = 0; 63 63 apr_size_t bytes = 0; 64 gnutls_handle_t *ctxt = (gnutls_handle_t *) f->ctx;64 mod_gnutls_handle_t *ctxt = (mod_gnutls_handle_t *) f->ctx; 65 65 apr_status_t status = APR_SUCCESS; 66 66 apr_read_type_e rblock = APR_NONBLOCK_READ; … … 257 257 void *buffer, size_t len) 258 258 { 259 gnutls_handle_t *ctxt = ptr;259 mod_gnutls_handle_t *ctxt = ptr; 260 260 apr_status_t rc; 261 261 apr_size_t in = len; … … 296 296 const void *buffer, size_t len) 297 297 { 298 gnutls_handle_t *ctxt = ptr;298 mod_gnutls_handle_t *ctxt = ptr; 299 299 300 300 // apr_bucket *bucket = apr_bucket_transient_create(in, inl, -
src/mod_gnutls.c
r7e2b223 r2e12226 22 22 #endif 23 23 24 static apr_status_t gnutls_cleanup_pre_config(void *data)24 static apr_status_t mod_gnutls_cleanup_pre_config(void *data) 25 25 { 26 26 gnutls_global_deinit(); … … 28 28 } 29 29 30 static int gnutls_hook_pre_config(apr_pool_t * pconf,31 apr_pool_t * plog, apr_pool_t * ptemp)30 static int mod_gnutls_hook_pre_config(apr_pool_t * pconf, 31 apr_pool_t * plog, apr_pool_t * ptemp) 32 32 { 33 33 … … 38 38 gnutls_global_init(); 39 39 40 apr_pool_cleanup_register(pconf, NULL, gnutls_cleanup_pre_config,40 apr_pool_cleanup_register(pconf, NULL, mod_gnutls_cleanup_pre_config, 41 41 apr_pool_cleanup_null); 42 42 … … 47 47 #define RSA_BITS 512 48 48 49 static int gnutls_hook_post_config(apr_pool_t * p, apr_pool_t * plog,50 apr_pool_t * ptemp,51 server_rec * base_server)52 { 53 gnutls_srvconf_rec *sc;49 static int mod_gnutls_hook_post_config(apr_pool_t * p, apr_pool_t * plog, 50 apr_pool_t * ptemp, 51 server_rec * base_server) 52 { 53 mod_gnutls_srvconf_rec *sc; 54 54 server_rec *s; 55 55 gnutls_dh_params_t dh_params; … … 64 64 65 65 for (s = base_server; s; s = s->next) { 66 sc = ( gnutls_srvconf_rec *) ap_get_module_config(s->module_config,67 &gnutls_module);66 sc = (mod_gnutls_srvconf_rec *) ap_get_module_config(s->module_config, 67 &gnutls_module); 68 68 if (sc->cert_file != NULL && sc->key_file != NULL) { 69 69 gnutls_certificate_set_x509_key_file(sc->certs, sc->cert_file, … … 85 85 } 86 86 87 static const char *gnutls_hook_http_method(const request_rec * r) 88 { 89 gnutls_srvconf_rec *sc = 90 (gnutls_srvconf_rec *) ap_get_module_config(r->server->module_config, 91 &gnutls_module); 87 static const char *mod_gnutls_hook_http_method(const request_rec * r) 88 { 89 mod_gnutls_srvconf_rec *sc = 90 (mod_gnutls_srvconf_rec *) ap_get_module_config(r->server-> 91 module_config, 92 &gnutls_module); 92 93 93 94 if (sc->enabled == GNUTLS_ENABLED_FALSE) { … … 98 99 } 99 100 100 static apr_port_t gnutls_hook_default_port(const request_rec * r) 101 { 102 gnutls_srvconf_rec *sc = 103 (gnutls_srvconf_rec *) ap_get_module_config(r->server->module_config, 104 &gnutls_module); 101 static apr_port_t mod_gnutls_hook_default_port(const request_rec * r) 102 { 103 mod_gnutls_srvconf_rec *sc = 104 (mod_gnutls_srvconf_rec *) ap_get_module_config(r->server-> 105 module_config, 106 &gnutls_module); 105 107 106 108 if (sc->enabled == GNUTLS_ENABLED_FALSE) { … … 111 113 } 112 114 113 static int gnutls_hook_pre_connection(conn_rec * c, void *csd)114 { 115 gnutls_handle_t *ctxt;116 gnutls_srvconf_rec *sc =117 ( gnutls_srvconf_rec *) ap_get_module_config(c->base_server->118 module_config,119 &gnutls_module);115 static int mod_gnutls_hook_pre_connection(conn_rec * c, void *csd) 116 { 117 mod_gnutls_handle_t *ctxt; 118 mod_gnutls_srvconf_rec *sc = 119 (mod_gnutls_srvconf_rec *) ap_get_module_config(c->base_server-> 120 module_config, 121 &gnutls_module); 120 122 121 123 if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) { … … 161 163 const char *arg) 162 164 { 163 gnutls_srvconf_rec *sc =164 ( gnutls_srvconf_rec *) ap_get_module_config(parms->server->165 module_config,166 &gnutls_module);165 mod_gnutls_srvconf_rec *sc = 166 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 167 module_config, 168 &gnutls_module); 167 169 sc->cert_file = apr_pstrdup(parms->pool, arg); 168 170 return NULL; … … 172 174 const char *arg) 173 175 { 174 gnutls_srvconf_rec *sc =175 ( gnutls_srvconf_rec *) ap_get_module_config(parms->server->176 module_config,177 &gnutls_module);176 mod_gnutls_srvconf_rec *sc = 177 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 178 module_config, 179 &gnutls_module); 178 180 sc->key_file = apr_pstrdup(parms->pool, arg); 179 181 return NULL; … … 183 185 const char *arg) 184 186 { 185 gnutls_srvconf_rec *sc =186 ( gnutls_srvconf_rec *) ap_get_module_config(parms->server->187 module_config,188 &gnutls_module);187 mod_gnutls_srvconf_rec *sc = 188 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 189 module_config, 190 &gnutls_module); 189 191 if (!strcasecmp(arg, "On")) { 190 192 sc->enabled = GNUTLS_ENABLED_TRUE; … … 225 227 static void gnutls_hooks(apr_pool_t * p) 226 228 { 227 ap_hook_pre_connection( gnutls_hook_pre_connection, NULL, NULL,229 ap_hook_pre_connection(mod_gnutls_hook_pre_connection, NULL, NULL, 228 230 APR_HOOK_MIDDLE); 229 ap_hook_post_config(gnutls_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE); 230 ap_hook_http_method(gnutls_hook_http_method, NULL, NULL, APR_HOOK_MIDDLE); 231 ap_hook_default_port(gnutls_hook_default_port, NULL, NULL, 231 ap_hook_post_config(mod_gnutls_hook_post_config, NULL, NULL, 232 APR_HOOK_MIDDLE); 233 ap_hook_http_method(mod_gnutls_hook_http_method, NULL, NULL, 234 APR_HOOK_MIDDLE); 235 ap_hook_default_port(mod_gnutls_hook_default_port, NULL, NULL, 232 236 APR_HOOK_MIDDLE); 233 ap_hook_pre_config(gnutls_hook_pre_config, NULL, NULL, APR_HOOK_MIDDLE); 237 ap_hook_pre_config(mod_gnutls_hook_pre_config, NULL, NULL, 238 APR_HOOK_MIDDLE); 234 239 235 240 /* TODO: HTTP Upgrade Filter */ … … 248 253 { 249 254 int i; 250 gnutls_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc));255 mod_gnutls_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc)); 251 256 252 257 sc->enabled = GNUTLS_ENABLED_FALSE;
Note: See TracChangeset
for help on using the changeset viewer.