Email gateway obeys 'Reply-To:' in header.

[egate.git] / kernel / urp.c

diff --git a/kernel/urp.c b/kernel/urp.c
index ff59ae0..3cce3a1 100644 (file)
--- a/kernel/urp.c
+++ b/kernel/urp.c
@@ -45,7 +45,14 @@
  * Europagate, 1995
  *
  * $Log: urp.c,v $
- * Revision 1.47  1996/01/18 13:54:48  adam
+ * 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 <command> gives help information about individual commands.
  * Status without arguments gives list of available predefined targets.
  *
@@ -250,6 +257,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);
@@ -371,6 +379,8 @@ static int email_header (struct str_queue *sq,
             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);
@@ -619,6 +629,7 @@ static int exec_target (struct ccl_token *list)
         *info.account = '\0';
     info.account_in_session = 0;
     read_kernel_res ();
+    info.connect_failed = 0;
     return reopen_target ();
 }
 
@@ -1082,10 +1093,11 @@ static int exec_command (const char *str, int *stop_flag)
     {
         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, "\n%s\n",
                          gw_res_get (info.kernel_res, "gw.err.no.target",
@@ -1183,7 +1195,8 @@ 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"));
         fprintf (reply_fd, "Subject: ");
         if (*subject_str)
             fprintf (reply_fd, "Z39.50 Re: %s", subject_str);