X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=chat%2Fchat.c;h=812a785fb5e453293d9a1a6d706974da7dac4ddc;hp=f7aaabf1a30050d66130078c018a6d469b0b265c;hb=2483ba8c2a4952c8d62cbef4df702e8d70b23ac0;hpb=c3931bd3267c380ff05e632a0952b5897ae0e2ba diff --git a/chat/chat.c b/chat/chat.c index f7aaabf..812a785 100644 --- a/chat/chat.c +++ b/chat/chat.c @@ -21,6 +21,9 @@ * Added -r "report file" switch & REPORT keyword. * Robert Geer * + * Added -e "echo" switch & ECHO keyword + * Dick Streefland + * * The original author is: * * Karl Fox @@ -31,15 +34,19 @@ * */ -static char rcsid[] = "$Id: chat.c,v 1.9 1995/06/12 11:24:15 paulus Exp $"; +#ifndef lint +static char rcsid[] = "$Id: chat.c,v 1.14 1997/04/30 05:40:50 paulus Exp $"; +#endif #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -92,7 +99,9 @@ char *program_name; #define MAX_REPORTS 50 #define DEFAULT_CHAT_TIMEOUT 45 +int echo = 0; int verbose = 0; +int Verbose = 0; int quiet = 0; int report = 0; int exit_code = 0; @@ -119,7 +128,7 @@ struct termios saved_tty_parameters; char *abort_string[MAX_ABORTS], *fail_reason = (char *)0, fail_buffer[50]; -int n_aborts = 0, abort_next = 0, timeout_next = 0; +int n_aborts = 0, abort_next = 0, timeout_next = 0, echo_next = 0; char *report_string[MAX_REPORTS] ; char report_buffer[50] ; @@ -139,6 +148,7 @@ SIGTYPE sighup __P((int signo)); void unalarm __P((void)); void init __P((void)); void set_tty_parameters __P((void)); +void echo_stderr __P((int)); void break_sequence __P((void)); void terminate __P((int status)); void do_file __P((char *chat_file)); @@ -154,6 +164,9 @@ char *clean __P((register char *s, int sending)); void break_sequence __P((void)); void terminate __P((int status)); void die __P((void)); +char *expect_strtok __P((char *, char *)); + +int main __P((int, char *[])); void *dup_mem(b, c) void *b; @@ -191,16 +204,24 @@ char **argv; program_name = *argv; tzset(); - while (option = OPTION(argc, argv)) + while ((option = OPTION(argc, argv)) != 0) { switch (option) { + case 'e': + ++echo; + break; + case 'v': ++verbose; break; + case 'V': + ++Verbose; + break; + case 'f': - if (arg = OPTARG(argc, argv)) + if ((arg = OPTARG(argc, argv)) != NULL) { chat_file = copy_of(arg); } @@ -211,7 +232,7 @@ char **argv; break; case 't': - if (arg = OPTARG(argc, argv)) + if ((arg = OPTARG(argc, argv)) != NULL) { timeout = atoi(arg); } @@ -287,11 +308,11 @@ char **argv; } else { - while (arg = ARG(argc, argv)) + while ((arg = ARG(argc, argv)) != NULL) { chat_expect(arg); - if (arg = ARG(argc, argv)) + if ((arg = ARG(argc, argv)) != NULL) { chat_send(arg); } @@ -299,6 +320,7 @@ char **argv; } terminate(0); + return 0; } /* @@ -308,7 +330,7 @@ char **argv; void do_file (chat_file) char *chat_file; { - int linect, len, sendflg; + int linect, sendflg; char *sp, *arg, quote; char buf [STR_LEN]; FILE *cfp; @@ -397,26 +419,30 @@ char *chat_file; void usage() { fprintf(stderr, "\ -Usage: %s [-v] [-t timeout] [-r report-file] {-f chat-file | chat-script}\n", +Usage: %s [-e] [-v] [-t timeout] [-r report-file] {-f chat-file | chat-script}\n", program_name); exit(1); } -char line[256]; +char line[128]; char *p; void logf (str) const char *str; - { - p = line + strlen(line); - strcat (p, str); +{ + int l = strlen(line); - if (str[strlen(str)-1] == '\n') - { + if (l + strlen(str) >= sizeof(line)) { + syslog(LOG_INFO, "%s", line); + l = 0; + } + strcpy(line + l, str); + + if (str[strlen(str)-1] == '\n') { syslog (LOG_INFO, "%s", line); line[0] = 0; - } } +} void logflush() { @@ -573,14 +599,34 @@ void break_sequence() void terminate(status) int status; { + echo_stderr(-1); if (report_file != (char *) 0 && report_fp != (FILE *) NULL) - { + { +/* + * Allow the last of the report string to be gathered before we terminate. + */ + if (report_gathering) { + int c, rep_len; + + rep_len = strlen(report_buffer); + while (rep_len + 1 <= sizeof(report_buffer)) { + alarm(1); + c = get_char(); + alarm(0); + if (c < 0 || iscntrl(c)) + break; + report_buffer[rep_len] = c; + ++rep_len; + } + report_buffer[rep_len] = 0; + fprintf (report_fp, "chat: %s\n", report_buffer); + } if (verbose) { fprintf (report_fp, "Closing \"%s\".\n", report_file); } fclose (report_fp); - report_fp = (FILE*) NULL; + report_fp = (FILE *) NULL; } #if defined(get_term_param) @@ -676,7 +722,7 @@ int sending; break; case 'q': - quiet = ! quiet; + quiet = 1; break; case 'r': @@ -752,12 +798,77 @@ int sending; return dup_mem (temp, (size_t) (s1 - temp)); /* may have embedded nuls */ } +/* + * A modified version of 'strtok'. This version skips \ sequences. + */ + +char *expect_strtok (s, term) +char *s, *term; + { + static char *str = ""; + int escape_flag = 0; + char *result; +/* + * If a string was specified then do initial processing. + */ + if (s) + { + str = s; + } +/* + * If this is the escape flag then reset it and ignore the character. + */ + if (*str) + { + result = str; + } + else + { + result = (char *) 0; + } + + while (*str) + { + if (escape_flag) + { + escape_flag = 0; + ++str; + continue; + } + + if (*str == '\\') + { + ++str; + escape_flag = 1; + continue; + } +/* + * If this is not in the termination string, continue. + */ + if (strchr (term, *str) == (char *) 0) + { + ++str; + continue; + } +/* + * This is the terminator. Mark the end of the string and stop. + */ + *str++ = '\0'; + break; + } + return (result); + } + /* * Process the expect string */ -void chat_expect(s) -register char *s; + +void chat_expect (s) +char *s; { + char *expect; + char *reply; + if (strcmp(s, "ABORT") == 0) { ++abort_next; @@ -776,81 +887,62 @@ register char *s; return; } - while (*s) + if (strcmp(s, "ECHO") == 0) + { + ++echo_next; + return; + } +/* + * Fetch the expect and reply string. + */ + for (;;) { - register char *hyphen; + expect = expect_strtok (s, "-"); + s = (char *) 0; - for (hyphen = s; *hyphen; ++hyphen) + if (expect == (char *) 0) { - if (*hyphen == '-') - { - if (hyphen == s || hyphen[-1] != '\\') - { - break; - } - } + return; } - - if (*hyphen == '-') - { - *hyphen = '\0'; - - if (get_string(s)) - { - return; - } - else - { - s = hyphen + 1; - for (hyphen = s; *hyphen; ++hyphen) - { - if (*hyphen == '-') - { - if (hyphen == s || hyphen[-1] != '\\') - { - break; - } - } - } - - if (*hyphen == '-') - { - *hyphen = '\0'; - - chat_send(s); - s = hyphen + 1; - } - else - { - chat_send(s); - return; - } - } + reply = expect_strtok (s, "-"); +/* + * Handle the expect string. If successful then exit. + */ + if (get_string (expect)) + { + return; } - else +/* + * If there is a sub-reply string then send it. Otherwise any condition + * is terminal. + */ + if (reply == (char *) 0 || exit_code != 3) { - if (get_string(s)) - { - return; - } - else - { - if (fail_reason) - { - syslog(LOG_INFO, "Failed (%s)", fail_reason); - } - else - { - syslog(LOG_INFO, "Failed"); - } - - terminate(exit_code); - } + break; } + + chat_send (reply); + } +/* + * The expectation did not occur. This is terminal. + */ + if (fail_reason) + { + syslog(LOG_INFO, "Failed (%s)", fail_reason); } + else + { + syslog(LOG_INFO, "Failed"); + } + terminate(exit_code); } +/* + * Translate the input character to the appropriate string for printing + * the data. + */ + char *character(c) int c; { @@ -885,6 +977,12 @@ int c; void chat_send (s) register char *s; { + if (echo_next) + { + echo_next = 0; + echo = (strcmp(s, "ON") == 0); + return; + } if (abort_next) { char *s1; @@ -1089,6 +1187,7 @@ int c; int put_string (s) register char *s; { + quiet = 0; s = clean(s, 1); if (verbose) @@ -1154,6 +1253,37 @@ register char *s; return (1); } +/* + * Echo a character to stderr. + * When called with -1, a '\n' character is generated when + * the cursor is not at the beginning of a line. + */ +void echo_stderr(n) +int n; + { + static int need_lf; + char *s; + + switch (n) + { + case '\r': /* ignore '\r' */ + break; + case -1: + if (need_lf == 0) + break; + /* fall through */ + case '\n': + write(2, "\n", 1); + need_lf = 0; + break; + default: + s = character(n); + write(2, s, strlen(s)); + need_lf = 1; + break; + } + } + /* * 'Wait for' this string to appear on this file descriptor. */ @@ -1207,6 +1337,10 @@ register char *string; { int n, abort_len, report_len; + if (echo) + { + echo_stderr(c); + } if (verbose) { if (c == '\n') @@ -1219,39 +1353,12 @@ register char *string; } } - *s++ = c; - - if (s - temp >= len && - c == string[len - 1] && - strncmp(s - len, string, len) == 0) - { - if (verbose) - { - logf(" -- got it\n"); - } - - alarm(0); - alarmed = 0; - return (1); - } + if (Verbose) { + if (c == '\n') fputc( '\n', stderr ); + else if (c != '\r') fprintf( stderr, "%s", character(c) ); + } - for (n = 0; n < n_aborts; ++n) - { - if (s - temp >= (abort_len = strlen(abort_string[n])) && - strncmp(s - abort_len, abort_string[n], abort_len) == 0) - { - if (verbose) - { - logf(" -- failed\n"); - } - - alarm(0); - alarmed = 0; - exit_code = n + 4; - strcpy(fail_reason = fail_buffer, abort_string[n]); - return (0); - } - } + *s++ = c; if (!report_gathering) { @@ -1288,6 +1395,38 @@ register char *string; } } + if (s - temp >= len && + c == string[len - 1] && + strncmp(s - len, string, len) == 0) + { + if (verbose) + { + logf(" -- got it\n"); + } + + alarm(0); + alarmed = 0; + return (1); + } + + for (n = 0; n < n_aborts; ++n) + { + if (s - temp >= (abort_len = strlen(abort_string[n])) && + strncmp(s - abort_len, abort_string[n], abort_len) == 0) + { + if (verbose) + { + logf(" -- failed\n"); + } + + alarm(0); + alarmed = 0; + exit_code = n + 4; + strcpy(fail_reason = fail_buffer, abort_string[n]); + return (0); + } + } + if (s >= end) { strncpy (temp, s - minlen, minlen);