You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by so...@apache.org on 2006/01/24 06:49:01 UTC
svn commit: r371826 - in /httpd/mod_smtpd/trunk/src: mod_smtpd.h smtp.h
smtp_core.c smtp_filters.c smtp_protocol.c smtp_util.c
Author: soc-rian
Date: Mon Jan 23 21:48:57 2006
New Revision: 371826
URL: http://svn.apache.org/viewcvs?rev=371826&view=rev
Log:
Changed name of main structures to more closely reflect their nature.
Modified:
httpd/mod_smtpd/trunk/src/mod_smtpd.h
httpd/mod_smtpd/trunk/src/smtp.h
httpd/mod_smtpd/trunk/src/smtp_core.c
httpd/mod_smtpd/trunk/src/smtp_filters.c
httpd/mod_smtpd/trunk/src/smtp_protocol.c
httpd/mod_smtpd/trunk/src/smtp_util.c
Modified: httpd/mod_smtpd/trunk/src/mod_smtpd.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/mod_smtpd.h?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/mod_smtpd.h (original)
+++ httpd/mod_smtpd/trunk/src/mod_smtpd.h Mon Jan 23 21:48:57 2006
@@ -77,10 +77,10 @@
apr_array_header_t *msgs;
} smtpd_return_data;
-typedef struct smtpd_trans_rec {
+typedef struct smtpd_envelope_rec {
apr_pool_t *p;
- /* where are we in the current transaction */
+ /* where are we in the current envelope */
smtpd_trans_state trans_state;
/* string of who this mail is from */
@@ -106,9 +106,9 @@
/* filters in */
ap_filter_t *input_filters;
-} smtpd_trans_rec;
+} smtpd_envelope_rec;
-typedef struct smtpd_conn_rec {
+typedef struct smtpd_session_rec {
apr_pool_t *p;
conn_rec *c;
server_rec *s;
@@ -123,72 +123,72 @@
/* hostname we were helo'd with */
char *helo;
- /* current transaction */
- smtpd_trans_rec *transaction;
+ /* current envelope */
+ smtpd_envelope_rec *envelope;
/* bb in */
apr_bucket_brigade *bb_in;
/* bb out */
apr_bucket_brigade *bb_out;
-} smtpd_conn_rec;
+} smtpd_session_rec;
/* public */
-SMTPD_DECLARE_NONSTD(void) smtpd_register_extension(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(void) smtpd_register_extension(smtpd_session_rec *scr,
const char *line);
-SMTPD_DECLARE_NONSTD(void) smtpd_reset_transaction(smtpd_conn_rec *scr);
+SMTPD_DECLARE_NONSTD(void) smtpd_reset_envelope(smtpd_session_rec *scr);
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_getline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_getline(smtpd_session_rec *scr,
char *data, apr_size_t dlen,
apr_size_t *outlen);
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_multiline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_multiline(smtpd_session_rec *scr,
int code,
apr_array_header_t
*msgs);
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_oneline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_oneline(smtpd_session_rec *scr,
int code,
char *message);
SMTPD_DECLARE_NONSTD(ap_filter_t *)
smtpd_add_input_filter_handle(ap_filter_rec_t *frec, void *ctx,
- smtpd_conn_rec *scr);
+ smtpd_session_rec *scr);
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode,
unrecognized_command,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *command, char *data));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, connect,
- (smtpd_conn_rec *scr, smtpd_return_data *in));
-APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, reset_transaction,
- (smtpd_conn_rec *scr));
+ (smtpd_session_rec *scr, smtpd_return_data *in));
+APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, reset_envelope,
+ (smtpd_session_rec *scr));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, helo,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *str));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, ehlo,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *str));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, mail,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *str, apr_table_t *mail_parameters));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, rcpt,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *str, apr_table_t *rcpt_parameters));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, vrfy,
- (smtpd_conn_rec *scr, smtpd_return_data *in,
+ (smtpd_session_rec *scr, smtpd_return_data *in,
char *str));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, quit,
- (smtpd_conn_rec *scr, smtpd_return_data *in));
+ (smtpd_session_rec *scr, smtpd_return_data *in));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, data,
- (smtpd_conn_rec *scr, smtpd_return_data *in));
+ (smtpd_session_rec *scr, smtpd_return_data *in));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, data_post,
- (smtpd_conn_rec *scr, smtpd_return_data *in));
+ (smtpd_session_rec *scr, smtpd_return_data *in));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, queue,
- (smtpd_conn_rec *scr, smtpd_return_data *in));
+ (smtpd_session_rec *scr, smtpd_return_data *in));
APR_DECLARE_EXTERNAL_HOOK(smtpd, SMTPD, smtpd_retcode, headers_parsed,
- (smtpd_conn_rec *scr));
+ (smtpd_session_rec *scr));
#ifdef __cplusplus
}
Modified: httpd/mod_smtpd/trunk/src/smtp.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp.h?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp.h (original)
+++ httpd/mod_smtpd/trunk/src/smtp.h Mon Jan 23 21:48:57 2006
@@ -25,7 +25,7 @@
#endif
/* SMTP handlers registration */
-#define HANDLER_PROTOTYPE smtpd_conn_rec *scr, char *buffer, \
+#define HANDLER_PROTOTYPE smtpd_session_rec *scr, char *buffer, \
smtpd_return_data *in_data, void *data
#define HANDLER_FUNC(name) smtpd_handler_##name
@@ -42,14 +42,14 @@
typedef struct {
int headers_parsed;
- smtpd_conn_rec *scr;
+ smtpd_session_rec *scr;
apreq_parser_t *rfc822_parser;
apr_bucket_brigade *bb;
} smtpd_header_filter_ctx;
-void smtpd_process_connection_internal(smtpd_conn_rec *str);
+void smtpd_process_connection_internal(smtpd_session_rec *str);
-void smtpd_clear_trans_rec(smtpd_conn_rec *);
+void smtpd_clear_trans_rec(smtpd_session_rec *);
#ifdef __cplusplus
}
Modified: httpd/mod_smtpd/trunk/src/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_core.c?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_core.c Mon Jan 23 21:48:57 2006
@@ -47,9 +47,9 @@
ap_regex_t *rcpt_compiled_regex;
ap_regex_t *vrfy_compiled_regex;
-void smtpd_clear_trans_rec(smtpd_conn_rec *scr)
+void smtpd_clear_trans_rec(smtpd_session_rec *scr)
{
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
apr_pool_clear(str->p);
str->trans_state = SMTPD_STATE_GOT_NOTHING;
str->tfp = NULL;
@@ -124,12 +124,12 @@
}
/* Creates the main request record for the connection */
-static smtpd_conn_rec *smtpd_create_conn_rec(conn_rec *conn)
+static smtpd_session_rec *smtpd_create_conn_rec(conn_rec *conn)
{
apr_pool_t *p;
- smtpd_conn_rec *scr;
+ smtpd_session_rec *scr;
apr_pool_t *sp;
- smtpd_trans_rec *str;
+ smtpd_envelope_rec *str;
scr = apr_pcalloc(conn->pool, sizeof(*scr));
apr_pool_create(&p, conn->pool);
@@ -145,13 +145,13 @@
scr->protocol_type = SMTPD_PROTOCOL_UNKNOWN;
scr->helo = apr_palloc(scr->p, 256);
- /* create transaction rec */
+ /* create envelope rec */
str = apr_pcalloc(scr->p, sizeof(*str));
apr_pool_create(&sp, scr->p);
str->p = sp;
- scr->transaction = str;
+ scr->envelope = str;
smtpd_clear_trans_rec(scr);
return scr;
@@ -160,7 +160,7 @@
/* process connection hook */
static int process_smtp_connection(conn_rec *c)
{
- smtpd_conn_rec *scr;
+ smtpd_session_rec *scr;
smtpd_svr_config_rec *pConfig =
ap_get_module_config(c->base_server->module_config, &smtpd_module);
@@ -276,7 +276,7 @@
APR_HOOK_STRUCT(
APR_HOOK_LINK(unrecognized_command)
APR_HOOK_LINK(connect)
- APR_HOOK_LINK(reset_transaction)
+ APR_HOOK_LINK(reset_envelope)
APR_HOOK_LINK(helo)
APR_HOOK_LINK(ehlo)
APR_HOOK_LINK(mail)
@@ -292,7 +292,7 @@
/* Implement 'smtpd_run_unrecognized_command'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode,
unrecognized_command,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in,
char *command, char *data),
(scr, in, command, data),
@@ -301,47 +301,47 @@
/* it is an all hook because multiple plugins
should be ale to perform actions on connect */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, connect,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in),
(scr, in),
SMTPD_OK, SMTPD_DECLINED);
-/* Implement 'smtpd_run_reset_transaction'. */
+/* Implement 'smtpd_run_reset_envelope'. */
/* it is an all hook because multiple plugins
should be able to perform actions on rset */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
- reset_transaction,
- (smtpd_conn_rec *scr),
+ reset_envelope,
+ (smtpd_session_rec *scr),
(scr),
SMTPD_OK, SMTPD_DECLINED);
/* Implement 'smtpd_run_helo'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, helo,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in, char *str),
(scr, in, str),
SMTPD_DECLINED);
/* Implement 'smtpd_run_ehlo'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, ehlo,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in, char *str),
(scr, in, str),
SMTPD_DECLINED);
/* Implement 'smtpd_run_mail'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, mail,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in, char *str,
apr_table_t *mail_parameters),
(scr, in, str, mail_parameters),
SMTPD_DECLINED);
/* Implement 'smtpd_run_rcpt'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, rcpt,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in, char *str,
apr_table_t *rcpt_parameters),
(scr, in, str, rcpt_parameters),
SMTPD_DECLINED);
/* Implement 'smtpd_run_vrfy'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, vrfy,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in, char *str),
(scr, in, str),
SMTPD_DECLINED);
@@ -349,20 +349,20 @@
/* it is an all hook because multiple plugins
should be able to perform actions on quit */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, quit,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in),
(scr, in),
SMTPD_OK, SMTPD_DECLINED);
/* Implement 'smtpd_run_data'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode, data,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in),
(scr, in),
SMTPD_DECLINED);
/* Implement 'smtpd_run_data_post'. */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(smtpd, SMTPD, smtpd_retcode,
data_post,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in),
(scr, in),
SMTPD_DECLINED);
@@ -370,7 +370,7 @@
/* it is an all hook because multiple plugins
should be able to queue */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, queue,
- (smtpd_conn_rec *scr,
+ (smtpd_session_rec *scr,
smtpd_return_data *in),
(scr, in),
SMTPD_OK, SMTPD_DECLINED);
@@ -379,6 +379,6 @@
should be able to perform actions */
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
headers_parsed,
- (smtpd_conn_rec *scr),
+ (smtpd_session_rec *scr),
(scr),
SMTPD_OK, SMTPD_DECLINED);
Modified: httpd/mod_smtpd/trunk/src/smtp_filters.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_filters.c?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_filters.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_filters.c Mon Jan 23 21:48:57 2006
@@ -96,8 +96,8 @@
apr_off_t readbytes)
{
smtpd_header_filter_ctx *my_ctx = f->ctx;
- smtpd_conn_rec *scr = my_ctx->scr;
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_session_rec *scr = my_ctx->scr;
+ smtpd_envelope_rec *str = scr->envelope;
apr_status_t rv;
apreq_parser_t *rfc822_parser = my_ctx->rfc822_parser;
Modified: httpd/mod_smtpd/trunk/src/smtp_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_protocol.c?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_protocol.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_protocol.c Mon Jan 23 21:48:57 2006
@@ -46,28 +46,28 @@
extern ap_regex_t *rcpt_compiled_regex;
extern ap_regex_t *vrfy_compiled_regex;
-static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
+static int smtpd_handle_unrecognized_command(smtpd_session_rec *scr,
smtpd_return_data *in_data,
char *command, char *data);
-static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_ehlo(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_helo(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_mail(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rcpt(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_data(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rset(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_quit(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
-static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_vrfy(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data);
#define BUFFER_STR_LEN 1024
-void smtpd_process_connection_internal(smtpd_conn_rec *scr)
+void smtpd_process_connection_internal(smtpd_session_rec *scr)
{
apr_pool_t *per_command_pool;
char cmdbuff[BUFFER_STR_LEN];
@@ -175,7 +175,7 @@
return;
}
-static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
+static int smtpd_handle_unrecognized_command(smtpd_session_rec *scr,
smtpd_return_data
*out_data,
char *command, char *data)
@@ -200,7 +200,7 @@
}
-static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_ehlo(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
int error;
@@ -246,7 +246,7 @@
/* RFC 2821 states that when ehlo or helo is received, reset */
/* state */
- smtpd_reset_transaction(scr);
+ smtpd_reset_envelope(scr);
strncpy(scr->helo, buffer, 255);
scr->helo[255] = '\0';
@@ -271,7 +271,7 @@
return 250;
}
-static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_helo(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
int error;
@@ -315,7 +315,7 @@
/* RFC 2821 states that when ehlo or helo is received, reset */
/* state */
- smtpd_reset_transaction(scr);
+ smtpd_reset_envelope(scr);
strncpy(scr->helo, buffer, 255);
scr->helo[255] = '\0';
@@ -350,10 +350,10 @@
}
}
-static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_mail(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
char *email_address;
char *start_parameters;
apr_table_t *mail_parameters;
@@ -466,10 +466,10 @@
return 250;
}
-static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rcpt(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
char *email_address;
char *start_parameters;
apr_table_t *rcpt_parameters;
@@ -569,7 +569,7 @@
}
-inline static int smtpd_queue(smtpd_conn_rec *scr, smtpd_return_data *out_data)
+inline static int smtpd_queue(smtpd_session_rec *scr, smtpd_return_data *out_data)
{
switch(smtpd_run_queue(scr, out_data)) {
case SMTPD_DONE:
@@ -616,7 +616,7 @@
/* for debugging
static int print_headers(void *rec, const char *key,
const char *value) {
- smtpd_conn_rec *scr = rec;
+ smtpd_session_rec *scr = rec;
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, scr->s,
"(header) %s: %s", key, value);
@@ -625,10 +625,10 @@
}
*/
-static void smtpd_add_received_header(smtpd_conn_rec *scr)
+static void smtpd_add_received_header(smtpd_session_rec *scr)
{
apr_time_exp_t t;
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
smtpd_svr_config_rec *pConfig =
ap_get_module_config(scr->s->module_config,
&smtpd_module);
@@ -670,10 +670,10 @@
apr_pool_destroy(p);
}
-static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_data(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
smtpd_svr_config_rec *pConfig =
ap_get_module_config(scr->s->module_config,
&smtpd_module);
@@ -779,7 +779,7 @@
/* wait until there is no more data
or until we have too much data */
while (total_data < pConfig->max_data) {
- rv = ap_get_brigade(scr->transaction->input_filters, bb, AP_MODE_GETLINE,
+ rv = ap_get_brigade(scr->envelope->input_filters, bb, AP_MODE_GETLINE,
APR_BLOCK_READ, 0);
if (rv != APR_SUCCESS) {
@@ -844,14 +844,14 @@
retval = smtpd_queue(scr, out_data);
}
- smtpd_reset_transaction(scr);
+ smtpd_reset_envelope(scr);
cleanup:
apr_file_close(tfp);
return retval;
}
-static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rset(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
if (buffer != NULL) {
@@ -859,13 +859,13 @@
return 501;
}
- smtpd_reset_transaction(scr);
+ smtpd_reset_envelope(scr);
smtpd_respond_oneline(scr, 250, "Ok");
return 250;
}
-static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_quit(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
if (buffer != NULL) {
@@ -880,7 +880,7 @@
return 0;
}
-static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_vrfy(smtpd_session_rec *scr, char *buffer,
smtpd_return_data *out_data)
{
int error;
Modified: httpd/mod_smtpd/trunk/src/smtp_util.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_util.c?rev=371826&r1=371825&r2=371826&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_util.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_util.c Mon Jan 23 21:48:57 2006
@@ -24,27 +24,27 @@
/* should be called at smtpd_hook_connect
* at least by convention
*/
-SMTPD_DECLARE_NONSTD(void) smtpd_register_extension(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(void) smtpd_register_extension(smtpd_session_rec *scr,
const char *line)
{
(*((char **)apr_array_push(scr->extensions))) =
apr_pstrdup(scr->p, line);
}
-/* how to reset the transaction */
-SMTPD_DECLARE_NONSTD(void) smtpd_reset_transaction(smtpd_conn_rec *scr)
+/* how to reset the envelope */
+SMTPD_DECLARE_NONSTD(void) smtpd_reset_envelope(smtpd_session_rec *scr)
{
/* REVIEW: don't know whether to run clear request first
* then run reset hooks, or run reset hooks then clear request
* depends on whether hooks want to save info before it gets cleared out
* or if they want to overwrite default values in the request rec
*/
- smtpd_run_reset_transaction(scr);
+ smtpd_run_reset_envelope(scr);
smtpd_clear_trans_rec(scr);
}
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_getline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_getline(smtpd_session_rec *scr,
char *data, apr_size_t dlen,
apr_size_t *outlen)
{
@@ -123,7 +123,7 @@
return APR_SUCCESS;
}
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_multiline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_multiline(smtpd_session_rec *scr,
int code,
apr_array_header_t
*msgs)
@@ -143,7 +143,7 @@
return APR_SUCCESS;
}
-SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_oneline(smtpd_conn_rec *scr,
+SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_respond_oneline(smtpd_session_rec *scr,
int code,
char *message)
{
@@ -159,9 +159,9 @@
|| (before_this)->r != (f)->r)
SMTPD_DECLARE_NONSTD(ap_filter_t *)
smtpd_add_input_filter_handle(ap_filter_rec_t *frec, void *ctx,
- smtpd_conn_rec *scr)
+ smtpd_session_rec *scr)
{
- smtpd_trans_rec *str = scr->transaction;
+ smtpd_envelope_rec *str = scr->envelope;
ap_filter_t *f = apr_palloc(str->p, sizeof(*f));
ap_filter_t **outf;