X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=kernel%2Furp.c;h=d472c264c8a22d8eb05410b7b3f6131dddc25c9f;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=5b73f461eb44287ed8b8abfb8bc9475c57f87e22;hpb=d9dc334cfdbe42f9acf56266c0bdd53522315304;p=egate.git diff --git a/kernel/urp.c b/kernel/urp.c index 5b73f46..d472c26 100644 --- a/kernel/urp.c +++ b/kernel/urp.c @@ -45,7 +45,56 @@ * Europagate, 1995 * * $Log: urp.c,v $ - * Revision 1.35 1995/05/16 09:40:43 adam + * Revision 1.50 1996/03/01 16:09:30 adam + * New setting: gw.msg.replyto that sets Reply-To in user response. + * + * Revision 1.49 1996/03/01 14:25:28 adam + * Email gateway obeys 'Reply-To:' in header. + * + * Revision 1.48 1996/02/12 10:04:57 adam + * The gateway doesn't try to reconnect if it is already known that + * it will fail (connect_fail flag introduced). + * + * Revision 1.47 1996/01/18 13:54:48 adam + * Help gives help information about individual commands. + * Status without arguments gives list of available predefined targets. + * + * Revision 1.46 1995/07/28 10:51:09 adam + * Bug fix: account from previous session had effect when new target command + * was executed. + * + * Revision 1.45 1995/07/20 08:20:24 adam + * Minor changes. + * + * Revision 1.44 1995/07/11 12:28:53 adam + * New functions ccl_token_simple and ccl_token_del used. + * + * Revision 1.43 1995/07/11 11:49:13 adam + * LINE_MAX renamed to STR_LINE_MAX. + * + * Revision 1.42 1995/07/03 12:59:29 adam + * New option for eti: -c dir to chdir before start. + * Setting change: gw.max.show defaults to 100. + * + * Revision 1.41 1995/07/03 08:20:18 adam + * More help information and better diagnostics. + * + * Revision 1.40 1995/05/23 08:13:00 adam + * Minor changes. + * + * Revision 1.39 1995/05/22 14:57:30 adam + * Next default record position also set by last p=... in show. + * + * Revision 1.38 1995/05/19 13:26:00 adam + * Bug fixes. Better command line options. + * + * Revision 1.37 1995/05/18 12:03:09 adam + * Bug fixes and minor improvements. + * + * Revision 1.36 1995/05/17 10:51:33 adam + * Added a few more error checks to the show command. + * + * Revision 1.35 1995/05/16 09:40:43 adam * LICENSE. Setting of CCL token names (and/or/not/set) in read_kernel_res. * * Revision 1.34 1995/05/04 10:40:08 adam @@ -166,7 +215,6 @@ Todo: info/status (other name?) better persistence diagnostics - resource gw.path - use chdir call instead Optional: automatic information about target-aliases: name, query-support, etc. @@ -188,7 +236,7 @@ static void present (const char *set, int offset, int number, struct ccl_token *format_token); -static char line_buf[LINE_MAX+1]; +static char line_buf[STR_LINE_MAX+1]; static void put_esc_str (const char *s) { @@ -212,6 +260,7 @@ int reopen_target (void) gw_res_get (info.kernel_res, "gw.err.connect", "Cannot connect to target"), info.hostname, info.port); + info.connect_failed = 1; return -1; } v = gw_res_get (info.kernel_res, "gw.description", NULL); @@ -246,14 +295,13 @@ struct command_word { char *resource_suffix; }; -static int command_search (struct command_word *tab, struct ccl_token *cmd, -const char *resource_prefix) +static int command_search_str (struct command_word *tab, const char *cmd_name, + int cmd_len, const char *resource_prefix) { int no = 1; assert (resource_prefix); assert (tab); - assert (cmd); while (tab->default_value) { char *cp, command_names[60]; @@ -272,8 +320,8 @@ const char *resource_prefix) if ((split = strchr (cp, ' '))) *split = '\0'; - if (cmd->len == strlen(cp) && - !memcmp (cmd->name, cp, cmd->len)) + if (cmd_len == strlen(cp) && + !memcmp (cmd_name, cp, cmd_len)) return no; if (!split) break; @@ -285,6 +333,12 @@ const char *resource_prefix) return 0; } +static int command_search (struct command_word *tab, struct ccl_token *cmd, + const char *resource_prefix) +{ + return command_search_str (tab, cmd->name, cmd->len, resource_prefix); +} + static struct error_no_struct { int no; char *resource_name; @@ -322,12 +376,14 @@ static int email_header (struct str_queue *sq, { *from_str = '\0'; *subject_str = '\0'; - while (str_queue_deq (sq, line_buf, LINE_MAX)) + while (str_queue_deq (sq, line_buf, STR_LINE_MAX)) { if (line_buf[0] == '\n') return 0; if (memcmp (line_buf, "From ", 5) == 0) sscanf (line_buf+4, "%s", from_str); + if (memcmp (line_buf, "Reply-To: ", 10) == 0) + sscanf (line_buf+10, "%s", from_str); if (memcmp (line_buf, "Subject: ", 9) == 0 && sscanf (line_buf+9, "%s", subject_str+1) == 1) strcpy (subject_str, line_buf+9); @@ -341,27 +397,83 @@ static void help_general (void) "Commands available in this service:\n")); } +static struct command_word command_tab [] = +{ +{ "find", "find"}, +{ "show", "show"}, +{ "base", "base" }, +{ "help", "help" }, +{ "info", "info" }, +{ "continue", "continue" }, +{ "status", "status" }, +{ "stop", "stop" }, +{ "target", "target" }, +{ "def", "def" }, +{ "account", "account" }, +{ NULL, NULL } +}; + + static int exec_help (struct ccl_token *list) { + int no = 0; static char *sep = "-------------------------------\\n"; - help_general (); + if (list->kind != CCL_TOK_EOL) + no = command_search_str (command_tab, list->name, list->len, + "ccl.command."); + if (!no) + help_general (); - put_esc_str (sep); - put_esc_str (gw_res_get (info.kernel_res, "gw.help.target", - "target - selects a given target\n")); + if (!no || no == 9) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.target", + "target - selects a given target\n")); + } - put_esc_str (sep); - put_esc_str (gw_res_get (info.kernel_res, "gw.help.base", + if (!no || no == 3) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.base", "base .. - selects databases\n")); + } + + if (!no || no == 1) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.find", + "find - performs a search\n")); + } + + if (!no || no == 2) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.show", + "show - retrieves and displays " + "records\n")); + } - put_esc_str (sep); - put_esc_str (gw_res_get (info.kernel_res, "gw.help.find", - "find - performs a search request\n")); + if (!no || no == 10) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.def", + "def user definitons\n")); + } + + if (!no || no == 11) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.account", + "account sets authentication\n")); + } + + if (!no || no == 7) + { + put_esc_str (sep); + put_esc_str (gw_res_get (info.kernel_res, "gw.help.status", + "status status information\n")); + } - put_esc_str (sep); - put_esc_str (gw_res_get (info.kernel_res, "gw.help.show", - "show - retrieves and displays " - "records\n")); return 0; } @@ -432,7 +544,7 @@ static int exec_find (struct ccl_token *list, const char *search_str) { fprintf (reply_fd, "%s\n", gw_res_get (info.kernel_res, "gw.err.search.fail", - "Search fail. Connection closed")); + "Search fail.")); return -1; } if (p->errcode != -1) @@ -471,6 +583,39 @@ static int exec_account (struct ccl_token *list) } else *info.account = '\0'; + info.account_in_session = 1; + return 0; +} + +void handle_target_list (const char *name, const char *value) +{ + GwRes res; + const char *p; + + if (strlen(name) < 10) + return; + if (memcmp (name, "gw.target.", 10)) + return; + fprintf (reply_fd, "%s\n", name+10); + res = gw_res_init (); + gw_res_merge (res, value); + p = gw_res_get (res, "gw.description", NULL); + if (p) + { + put_esc_str (p); + put_esc_str ("\\n"); + } + p = gw_res_get (res, "gw.databases", NULL); + if (p) + fprintf (reply_fd, " Databases: %s\n", p); + fprintf (reply_fd, "\n"); + gw_res_close (res); +} + +static int exec_target_list (void) +{ + gw_res_trav (info.kernel_res, NULL, handle_target_list); + fprintf (reply_fd, "\n"); return 0; } @@ -478,12 +623,16 @@ static int exec_target (struct ccl_token *list) { int len; if (list->kind == CCL_TOK_EOL) - return -1; + return exec_target_list (); len = list->len; memcpy (info.target, list->name, len); info.target [len] = '\0'; - + + if (!info.account_in_session) + *info.account = '\0'; + info.account_in_session = 0; read_kernel_res (); + info.connect_failed = 0; return reopen_target (); } @@ -547,7 +696,7 @@ static void present (const char *set, int offset, int number, int max_number; char format_str[16]; - max_number = gw_res_int (info.kernel_res, "gw.max.show", 200); + max_number = gw_res_int (info.kernel_res, "gw.max.show", 100); if (number > max_number) number = max_number; gw_log (GW_LOG_DEBUG, KERNEL_LOG, "present in set %s", set); @@ -558,7 +707,6 @@ static void present (const char *set, int offset, int number, { int i; zass_record *pp; - char path[128]; int record_log_fd = -1; const char *record_log_name; @@ -566,12 +714,11 @@ static void present (const char *set, int offset, int number, NULL); if (record_log_name) { - sprintf (path, "%s/%s", gw_res_get (info.kernel_res, - "gw.path", "."), - record_log_name ); - record_log_fd = open (path, O_WRONLY|O_CREAT|O_APPEND, 0666); + record_log_fd = open (record_log_name, + O_WRONLY|O_CREAT|O_APPEND, 0666); if (record_log_fd == -1) - gw_log (GW_LOG_WARN|GW_LOG_ERRNO, "Cannot open %s", path); + gw_log (GW_LOG_WARN|GW_LOG_ERRNO, "Cannot open %s", + record_log_name); } fprintf (reply_fd, gw_res_get (info.kernel_res, "gw.msg.records", @@ -695,7 +842,19 @@ static int exec_show (struct ccl_token *list) li = li->next; } else + { + int len = li->len; + memcpy (tmp_str, li->name, len); + tmp_str[len] = '\0'; + if (atoi(tmp_str) <= 0) + { + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, "gw.err.bad.show", + "Syntax error")); + return -3; + } li = li->next; + } } if (set_token) gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Got set=%.*s", set_token->len, @@ -731,6 +890,15 @@ static int exec_show (struct ccl_token *list) memcpy (tmp_str, li->name, len); tmp_str [len] = '\0'; number = atoi (tmp_str) - offset + 1; + if (number <= 0) + { + fprintf (reply_fd, "%s\n", + gw_res_get (info.kernel_res, + "gw.err.pos.show", + "Starting position " + "greater than ending position")); + return -3; + } } else { @@ -743,7 +911,7 @@ static int exec_show (struct ccl_token *list) } li = li->next; } - else + else if (li->kind == CCL_TOK_TERM) { len = li->len; memcpy (tmp_str, li->name, len); @@ -772,6 +940,7 @@ static int exec_show (struct ccl_token *list) if (offset+number-1 > us->hits) number = us->hits - offset+1; present (us->name, offset, number, format_token); + info.next_position = offset+number; } } else if (!no_of_present) /* display error message once! */ @@ -847,9 +1016,7 @@ static int exec_def (struct ccl_token *list) if (info.userid < 0) return -1; - sprintf (fname, "%s/user.%d.r", gw_res_get (info.kernel_res, - "gw.path", "."), - info.userid); + sprintf (fname, "user.%d.r", info.userid); if (list->kind == CCL_TOK_EOL) show_def (); @@ -916,37 +1083,26 @@ static int exec_def (struct ccl_token *list) */ static int exec_command (const char *str, int *stop_flag) { - static struct command_word command_tab [] = - { - { "find", "find"}, - { "show", "show"}, - { "base", "base" }, - { "help", "help" }, - { "info", "info" }, - { "continue", "continue" }, - { "status", "status" }, - { "stop", "stop" }, - { "target", "target" }, - { "def", "def" }, - { "account", "account" }, - { NULL, NULL } - }; - - struct ccl_token *cmd = ccl_tokenize (str); + struct ccl_token *cmd; + const char *cp = str; int no; + while (*cp && *cp != ' ' && *cp != '\n' && *cp != '\t' && *cp != '\r') + cp++; + *stop_flag = 0; - if (cmd->kind != CCL_TOK_EOL && - (no = command_search (command_tab, cmd, "ccl.command."))) + no = command_search_str (command_tab, str, cp-str, "ccl.command."); + if (no) { if (no == 1 || no == 2 || no == 3) /* find/show/base? */ { - if (!info.zass) /* open if not already opened */ + if (!info.connect_failed && !info.zass) + /* open if not already opened */ reopen_target (); fprintf (reply_fd, "\n> %s\n", str); - if (!info.zass) /* fail? */ + if (!info.zass) /* fail? */ { - fprintf (reply_fd, "%s\n", + fprintf (reply_fd, "\n%s\n", gw_res_get (info.kernel_res, "gw.err.no.target", "No connection established - " "command ignored")); @@ -957,33 +1113,50 @@ static int exec_command (const char *str, int *stop_flag) fprintf (reply_fd, "\n> %s\n", str); switch (no) { - case 1: - return exec_find (cmd->next, str); - case 2: - return exec_show (cmd->next); - case 3: - return exec_base (cmd->next); - case 4: - return exec_help (cmd->next); + case 1: /* find */ + cmd = ccl_tokenize (cp); + exec_find (cmd, str); + break; + case 2: /* show */ + cmd = ccl_tokenize (cp); + exec_show (cmd); + break; + case 3: /* base */ + cmd = ccl_token_simple (cp); + exec_base (cmd); + break; + case 4: /* help */ + cmd = ccl_token_simple (cp); + exec_help (cmd); + break; case 6: /* continue */ *stop_flag = 2; return 0; case 7: /* status */ - return exec_status (cmd->next); + exec_status (cmd); + return 0; case 8: /* stop */ *stop_flag = 1; return 0; case 9: /* target */ - return exec_target (cmd->next); + cmd = ccl_token_simple (cp); + exec_target (cmd); + break; case 10: /* def */ - return exec_def (cmd->next); - case 11: - return exec_account (cmd->next); + cmd = ccl_token_simple (cp); + exec_def (cmd); + break; + case 11: /* account */ + cmd = ccl_token_simple (cp); + exec_account (cmd); + break; default: + cmd = NULL; fprintf (reply_fd, "%s\n", gw_res_get (info.kernel_res, "gw.err.unimplemented", "Not implemented yet")); } + ccl_token_del (cmd); } else { @@ -999,6 +1172,7 @@ static int exec_command (const char *str, int *stop_flag) int urp_start (int continuation, struct str_queue *queue) { char subject_str[128]; + const char *cp; info.command_no = 0; info.reply_fname = NULL; @@ -1025,7 +1199,11 @@ int urp_start (int continuation, struct str_queue *queue) } tty_init (reply_fd, 0, 0); fprintf (reply_fd, "From: %s\n", - gw_res_get (info.kernel_res, "gw.msg.from","Email-gateway")); + gw_res_get (info.kernel_res, "gw.msg.from", + "Email-Z39.50 gateway")); + cp = gw_res_get (info.kernel_res, "gw.msg.replyto", NULL); + if (cp) + fprintf (reply_fd, "Reply-To: %s\n", cp); fprintf (reply_fd, "Subject: "); if (*subject_str) fprintf (reply_fd, "Z39.50 Re: %s", subject_str); @@ -1052,7 +1230,7 @@ int urp_command (struct str_queue *queue) char *cp; int stop_flag; - while (str_queue_deq (queue, line_buf, LINE_MAX)) + while (str_queue_deq (queue, line_buf, STR_LINE_MAX)) { if (line_buf[0] == '\n') if (info.command_no) @@ -1072,7 +1250,7 @@ int urp_command (struct str_queue *queue) if (stop_flag) { info.command_no++; /* prevent help! */ - while (str_queue_deq (queue, line_buf, LINE_MAX)) + while (str_queue_deq (queue, line_buf, STR_LINE_MAX)) ; return stop_flag; } @@ -1103,7 +1281,6 @@ void urp_end (void) mta = gw_res_get (info.kernel_res, "gw.reply.mta", "/usr/lib/sendmail"); sprintf (cmd, "%s %s < %s", mta, info.from_str, info.reply_fname); - mta_code = system (cmd); if (mta_code) gw_log (GW_LOG_FATAL, KERNEL_LOG,