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/05 19:57:56 UTC
svn commit: r366245 - /httpd/mod_smtpd/trunk/src/smtp_core.c
Author: soc-rian
Date: Thu Jan 5 10:57:53 2006
New Revision: 366245
URL: http://svn.apache.org/viewcvs?rev=366245&view=rev
Log:
Reformatting.
Modified:
httpd/mod_smtpd/trunk/src/smtp_core.c
Modified: httpd/mod_smtpd/trunk/src/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_core.c?rev=366245&r1=366244&r2=366245&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_core.c Thu Jan 5 10:57:53 2006
@@ -42,106 +42,7 @@
ap_filter_rec_t *smtpd_data_input_filter_handle;
ap_filter_rec_t *smtpd_header_input_filter_handle;
-
-APR_HOOK_STRUCT(
- APR_HOOK_LINK(unrecognized_command)
- APR_HOOK_LINK(connect)
- APR_HOOK_LINK(reset_transaction)
- APR_HOOK_LINK(helo)
- APR_HOOK_LINK(ehlo)
- APR_HOOK_LINK(mail)
- APR_HOOK_LINK(rcpt)
- APR_HOOK_LINK(vrfy)
- APR_HOOK_LINK(quit)
- APR_HOOK_LINK(data)
- APR_HOOK_LINK(data_post)
- APR_HOOK_LINK(queue)
- APR_HOOK_LINK(headers_parsed)
- )
-
- /* Implement 'smtpd_run_unrecognized_command'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
- unrecognized_command,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in,
- char *command, char *data),
- (scr, in, command, data),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_connect'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, connect,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in),
- (scr, in),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_reset_transaction'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
- reset_transaction,
- (smtpd_conn_rec *scr),
- (scr),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_helo'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, helo,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in, char *str),
- (scr, in, str),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_ehlo'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, ehlo,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in, char *str),
- (scr, in, str),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_mail'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, mail,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in, char *str),
- (scr, in, str),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_rcpt'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, rcpt,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in, char *str),
- (scr, in, str),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_vrfy'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, vrfy,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in, char *str),
- (scr, in, str),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_quit'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, quit,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in),
- (scr, in),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_data'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, data,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in),
- (scr, in),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_data_post'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
- data_post,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in),
- (scr, in),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_queue'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, queue,
- (smtpd_conn_rec *scr,
- smtpd_return_data *in),
- (scr, in),
- SMTPD_OK, SMTPD_DECLINED);
- /* Implement 'smtpd_run_headers_parsed'. */
- APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
- headers_parsed,
- (smtpd_conn_rec *scr),
- (scr),
- SMTPD_OK, SMTPD_DECLINED);
-
- void smtpd_clear_trans_rec(smtpd_conn_rec *scr)
+void smtpd_clear_trans_rec(smtpd_conn_rec *scr)
{
smtpd_trans_rec *str = scr->transaction;
apr_pool_clear(str->p);
@@ -303,3 +204,101 @@
smtpd_cmds, /* command apr_table_t */
register_hooks /* register hooks */
};
+
+APR_HOOK_STRUCT(
+ APR_HOOK_LINK(unrecognized_command)
+ APR_HOOK_LINK(connect)
+ APR_HOOK_LINK(reset_transaction)
+ APR_HOOK_LINK(helo)
+ APR_HOOK_LINK(ehlo)
+ APR_HOOK_LINK(mail)
+ APR_HOOK_LINK(rcpt)
+ APR_HOOK_LINK(vrfy)
+ APR_HOOK_LINK(quit)
+ APR_HOOK_LINK(data)
+ APR_HOOK_LINK(data_post)
+ APR_HOOK_LINK(queue)
+ APR_HOOK_LINK(headers_parsed)
+ )
+
+/* Implement 'smtpd_run_unrecognized_command'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
+ unrecognized_command,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in,
+ char *command, char *data),
+ (scr, in, command, data),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_connect'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, connect,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in),
+ (scr, in),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_reset_transaction'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
+ reset_transaction,
+ (smtpd_conn_rec *scr),
+ (scr),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_helo'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, helo,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in, char *str),
+ (scr, in, str),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_ehlo'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, ehlo,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in, char *str),
+ (scr, in, str),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_mail'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, mail,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in, char *str),
+ (scr, in, str),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_rcpt'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, rcpt,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in, char *str),
+ (scr, in, str),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_vrfy'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, vrfy,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in, char *str),
+ (scr, in, str),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_quit'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, quit,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in),
+ (scr, in),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_data'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, data,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in),
+ (scr, in),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_data_post'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
+ data_post,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in),
+ (scr, in),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_queue'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode, queue,
+ (smtpd_conn_rec *scr,
+ smtpd_return_data *in),
+ (scr, in),
+ SMTPD_OK, SMTPD_DECLINED);
+/* Implement 'smtpd_run_headers_parsed'. */
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(smtpd, SMTPD, smtpd_retcode,
+ headers_parsed,
+ (smtpd_conn_rec *scr),
+ (scr),
+ SMTPD_OK, SMTPD_DECLINED);