From ba30ceeb705e9b4d40ce0d98f6a4e047d47ce919 Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Sun, 21 Sep 2008 15:54:12 +0000 Subject: moved all modules source to src subdirectory.. Moved header files into include subdirectory cleaned up makefiles. --- (limited to 'functions.h') diff --git a/functions.h b/functions.h deleted file mode 100644 index 07711d2..0000000 --- a/functions.h +++ /dev/null @@ -1,261 +0,0 @@ -/* $Id$ */ - -/* Begin the individual functions that, given a request r, - * extract the needed information from it and return the - * value to the calling entity. - */ - -static const char *extract_remote_host(request_rec *r, char *a) -{ - return (char *) ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL); -} - -static const char *extract_remote_address(request_rec *r, char *a) __attribute__((unused)); - -static const char *extract_remote_address(request_rec *r, char *a) -{ - return r->connection->remote_ip; -} - -static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused)); - -static const char *extract_local_address(request_rec *r, char *a) -{ - return r->connection->local_ip; -} - -static const char *extract_remote_logname(request_rec *r, char *a) -{ - return (char *) ap_get_remote_logname(r); -} - -static const char *extract_remote_user(request_rec *r, char *a) -{ - #ifdef WITH_APACHE13 - char *rvalue = r->connection->user; - #else - char *rvalue = r->user; - #endif - if (rvalue == NULL) { - rvalue = "-"; - } else if (strlen(rvalue) == 0) { - rvalue = "\"\""; - } - return rvalue; -} - -static const char *extract_request_line(request_rec *r, char *a) -{ - /* Upddated to mod_log_config logic */ - /* NOTE: If the original request contained a password, we - * re-write the request line here to contain XXXXXX instead: - * (note the truncation before the protocol string for HTTP/0.9 requests) - * (note also that r->the_request contains the unmodified request) - */ - return (r->parsed_uri.password) - ? apr_pstrcat(r->pool, r->method, " ", - apr_uri_unparse(r->pool, - &r->parsed_uri, 0), - r->assbackwards ? NULL : " ", - r->protocol, NULL) - : r->the_request; -} - -static const char *extract_request_file(request_rec *r, char *a) -{ - return r->filename; -} - -static const char *extract_request_uri(request_rec *r, char *a) -{ - return r->uri; -} - -static const char *extract_request_method(request_rec *r, char *a) -{ - return r->method; -} - -static const char *extract_request_protocol(request_rec *r, char *a) -{ - return r->protocol; -} - -static const char *extract_request_query(request_rec *r, char *a) -{ - return (r->args) ? apr_pstrcat(r->pool, "?", - r->args, NULL) - : ""; -} - -static const char *extract_status(request_rec *r, char *a) -{ - if (r->status <= 0) { - return "-"; - } else { - return apr_psprintf(r->pool, "%d", r->status); - } -} - -static const char *extract_virtual_host(request_rec *r, char *a) -{ - return r->server->server_hostname; -} - -static const char *extract_server_name(request_rec *r, char *a) -{ - return ap_get_server_name(r); -} - -static const char *extract_machine_id(request_rec *r, char *a) -{ - if (!global_config.machid) - return "-"; - else - return global_config.machid; -} - -static const char *extract_server_port(request_rec *r, char *a) -{ - return apr_psprintf(r->pool, "%u", - r->server->port ? r->server->port : ap_default_port(r)); -} - -/* This respects the setting of UseCanonicalName so that - * the dynamic mass virtual hosting trick works better. - */ -static const char *log_server_name(request_rec *r, char *a) __attribute__((unused)); -static const char *log_server_name(request_rec *r, char *a) -{ - return ap_get_server_name(r); -} - -static const char *extract_child_pid(request_rec *r, char *a) -{ - if (*a == '\0' || !strcmp(a, "pid")) { - return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid()); - } - else if (!strcmp(a, "tid")) { -#if APR_HAS_THREADS - apr_os_thread_t tid = apr_os_thread_current(); -#else - int tid = 0; /* APR will format "0" anyway but an arg is needed */ -#endif - return apr_psprintf(r->pool, "%pT", &tid); - } - /* bogus format */ - return a; -} - -static const char *extract_referer(request_rec *r, char *a) -{ - const char *tempref; - - tempref = apr_table_get(r->headers_in, "Referer"); - if (!tempref) - { - return "-"; - } else { - return tempref; - } -} - -static const char *extract_agent(request_rec *r, char *a) -{ - const char *tempag; - - tempag = apr_table_get(r->headers_in, "User-Agent"); - if (!tempag) - { - return "-"; - } else { - return tempag; - } -} - -static const char *extract_specific_cookie(request_rec *r, char *a) -{ - const char *cookiestr; - char *cookieend; - char *isvalid; - char *cookiebuf; - - if (a != NULL) { - log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, - "watching for cookie '%s'", a); - - /* Fetch out the cookie header */ - cookiestr = (char *)apr_table_get(r->headers_in, "cookie2"); - if (cookiestr != NULL) { - log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, - "Cookie2: [%s]", cookiestr); - /* Does the cookie string contain one with our name? */ - isvalid = ap_strstr_c(cookiestr, a); - if (isvalid != NULL) { - /* Move past the cookie name and equal sign */ - isvalid += strlen(a) + 1; - /* Duplicate it into the pool */ - cookiebuf = apr_pstrdup(r->pool, isvalid); - /* Segregate just this cookie out of the string - * with a terminating nul at the first semicolon */ - cookieend = ap_strchr(cookiebuf, ';'); - if (cookieend != NULL) - *cookieend = '\0'; - return cookiebuf; - } - } - - cookiestr = (char *)apr_table_get(r->headers_in, "cookie"); - if (cookiestr != NULL) { - log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, - "Cookie: [%s]", cookiestr); - isvalid = ap_strstr_c(cookiestr, a); - if (isvalid != NULL) { - isvalid += strlen(a) + 1; - cookiebuf = apr_pstrdup(r->pool, isvalid); - cookieend = ap_strchr(cookiebuf, ';'); - if (cookieend != NULL) - *cookieend = '\0'; - return cookiebuf; - } - } - - cookiestr = apr_table_get(r->headers_out, "set-cookie"); - if (cookiestr != NULL) { - log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, - "Set-Cookie: [%s]", cookiestr); - isvalid = ap_strstr_c(cookiestr, a); - if (isvalid != NULL) { - isvalid += strlen(a) + 1; - cookiebuf = apr_pstrdup(r->pool, isvalid); - cookieend = ap_strchr(cookiebuf, ';'); - if (cookieend != NULL) - *cookieend = '\0'; - return cookiebuf; - } - } - } - - return "-"; -} - -/*static const char *extract_cookie(request_rec *r, char *a) -{ - logsql_state *cls = ap_get_module_config(r->server->module_config, - &log_sql_module); - - return extract_specific_cookie(r, (char *)cls->cookie_name); -}*/ - -static const char *extract_unique_id(request_rec *r, char *a) -{ - const char *tempid; - - tempid = apr_table_get(r->subprocess_env, "UNIQUE_ID"); - if (!tempid) - return "-"; - else - return tempid; -} - -/* End declarations of various extract_ functions */ -- cgit v0.9.2