1b6dec9f0SBrian Somers /*- 2b6dec9f0SBrian Somers * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3b6dec9f0SBrian Somers * All rights reserved. 41ae349f5Scvs2svn * 5b6dec9f0SBrian Somers * Redistribution and use in source and binary forms, with or without 6b6dec9f0SBrian Somers * modification, are permitted provided that the following conditions 7b6dec9f0SBrian Somers * are met: 8b6dec9f0SBrian Somers * 1. Redistributions of source code must retain the above copyright 9b6dec9f0SBrian Somers * notice, this list of conditions and the following disclaimer. 10b6dec9f0SBrian Somers * 2. Redistributions in binary form must reproduce the above copyright 11b6dec9f0SBrian Somers * notice, this list of conditions and the following disclaimer in the 12b6dec9f0SBrian Somers * documentation and/or other materials provided with the distribution. 131ae349f5Scvs2svn * 14b6dec9f0SBrian Somers * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 15b6dec9f0SBrian Somers * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16b6dec9f0SBrian Somers * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17b6dec9f0SBrian Somers * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18b6dec9f0SBrian Somers * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19b6dec9f0SBrian Somers * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20b6dec9f0SBrian Somers * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21b6dec9f0SBrian Somers * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22b6dec9f0SBrian Somers * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23b6dec9f0SBrian Somers * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24b6dec9f0SBrian Somers * SUCH DAMAGE. 251ae349f5Scvs2svn * 263b0f8d2eSBrian Somers * $Id: chat.c,v 1.44.2.17 1998/03/20 19:47:47 brian Exp $ 271ae349f5Scvs2svn */ 28b6dec9f0SBrian Somers 291ae349f5Scvs2svn #include <sys/param.h> 301ae349f5Scvs2svn #include <netinet/in.h> 311ae349f5Scvs2svn 321ae349f5Scvs2svn #include <ctype.h> 331ae349f5Scvs2svn #include <errno.h> 341ae349f5Scvs2svn #include <fcntl.h> 351ae349f5Scvs2svn #include <setjmp.h> 361ae349f5Scvs2svn #include <signal.h> 371ae349f5Scvs2svn #include <stdio.h> 381ae349f5Scvs2svn #include <stdlib.h> 391ae349f5Scvs2svn #include <string.h> 401ae349f5Scvs2svn #include <sys/time.h> 411ae349f5Scvs2svn #include <sys/wait.h> 421ae349f5Scvs2svn #include <termios.h> 431ae349f5Scvs2svn #include <unistd.h> 441ae349f5Scvs2svn 451ae349f5Scvs2svn #include "command.h" 461ae349f5Scvs2svn #include "mbuf.h" 471ae349f5Scvs2svn #include "log.h" 481ae349f5Scvs2svn #include "defs.h" 491ae349f5Scvs2svn #include "timer.h" 501ae349f5Scvs2svn #include "loadalias.h" 511ae349f5Scvs2svn #include "vars.h" 521ae349f5Scvs2svn #include "modem.h" 53879ed6faSBrian Somers #include "lqr.h" 546140ba11SBrian Somers #include "hdlc.h" 556140ba11SBrian Somers #include "throughput.h" 566140ba11SBrian Somers #include "fsm.h" 576140ba11SBrian Somers #include "lcp.h" 583b0f8d2eSBrian Somers #include "ccp.h" 596140ba11SBrian Somers #include "link.h" 606140ba11SBrian Somers #include "async.h" 6142d4d396SBrian Somers #include "descriptor.h" 6263b73463SBrian Somers #include "physical.h" 632289f246SBrian Somers #include "chat.h" 6485b542cfSBrian Somers #include "prompt.h" 651ae349f5Scvs2svn 66b6dec9f0SBrian Somers #define BUFLEFT(c) (sizeof (c)->buf - ((c)->bufend - (c)->buf)) 67c78db105SBrian Somers #define issep(c) ((c) == '\t' || (c) == ' ') 68b6dec9f0SBrian Somers 69b6dec9f0SBrian Somers static void ExecStr(struct physical *, char *, char *, int); 70d5015272SBrian Somers static char *ExpandString(struct chat *, const char *, char *, int, int); 71b6dec9f0SBrian Somers 72b6dec9f0SBrian Somers static void 73b6dec9f0SBrian Somers chat_PauseTimer(void *v) 74b6dec9f0SBrian Somers { 75b6dec9f0SBrian Somers struct chat *c = (struct chat *)v; 76b6dec9f0SBrian Somers StopTimer(&c->pause); 77b6dec9f0SBrian Somers c->pause.state = TIMER_STOPPED; 78b6dec9f0SBrian Somers c->pause.load = 0; 79b6dec9f0SBrian Somers } 80b6dec9f0SBrian Somers 81b6dec9f0SBrian Somers static void 82b6dec9f0SBrian Somers chat_Pause(struct chat *c, u_long load) 83b6dec9f0SBrian Somers { 84b6dec9f0SBrian Somers StopTimer(&c->pause); 85b6dec9f0SBrian Somers c->pause.state = TIMER_STOPPED; 86b6dec9f0SBrian Somers c->pause.load += load; 87b6dec9f0SBrian Somers c->pause.func = chat_PauseTimer; 883b0f8d2eSBrian Somers c->pause.name = "chat pause"; 89b6dec9f0SBrian Somers c->pause.arg = c; 90b6dec9f0SBrian Somers StartTimer(&c->pause); 91b6dec9f0SBrian Somers } 92b6dec9f0SBrian Somers 93b6dec9f0SBrian Somers static void 94b6dec9f0SBrian Somers chat_TimeoutTimer(void *v) 95b6dec9f0SBrian Somers { 96b6dec9f0SBrian Somers struct chat *c = (struct chat *)v; 97b6dec9f0SBrian Somers StopTimer(&c->timeout); 98b6dec9f0SBrian Somers c->TimedOut = 1; 99b6dec9f0SBrian Somers } 100b6dec9f0SBrian Somers 101b6dec9f0SBrian Somers static void 102b6dec9f0SBrian Somers chat_SetTimeout(struct chat *c) 103b6dec9f0SBrian Somers { 104b6dec9f0SBrian Somers StopTimer(&c->timeout); 105b6dec9f0SBrian Somers c->timeout.state = TIMER_STOPPED; 106b6dec9f0SBrian Somers if (c->TimeoutSec > 0) { 107b6dec9f0SBrian Somers c->timeout.load = SECTICKS * c->TimeoutSec; 108b6dec9f0SBrian Somers c->timeout.func = chat_TimeoutTimer; 1093b0f8d2eSBrian Somers c->timeout.name = "chat timeout"; 110b6dec9f0SBrian Somers c->timeout.arg = c; 111b6dec9f0SBrian Somers StartTimer(&c->timeout); 112b6dec9f0SBrian Somers } 113b6dec9f0SBrian Somers } 114b6dec9f0SBrian Somers 115b6dec9f0SBrian Somers static char * 116b6dec9f0SBrian Somers chat_NextChar(char *ptr, char ch) 117b6dec9f0SBrian Somers { 118b6dec9f0SBrian Somers for (; *ptr; ptr++) 119b6dec9f0SBrian Somers if (*ptr == ch) 120b6dec9f0SBrian Somers return ptr; 121b6dec9f0SBrian Somers else if (*ptr == '\\') 122b6dec9f0SBrian Somers if (*++ptr == '\0') 123b6dec9f0SBrian Somers return NULL; 124b6dec9f0SBrian Somers 125b6dec9f0SBrian Somers return NULL; 126b6dec9f0SBrian Somers } 127b6dec9f0SBrian Somers 128b6dec9f0SBrian Somers static int 129b6dec9f0SBrian Somers chat_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n) 130b6dec9f0SBrian Somers { 131b6dec9f0SBrian Somers struct chat *c = descriptor2chat(d); 132b6dec9f0SBrian Somers int special, gotabort, gottimeout, needcr; 133b6dec9f0SBrian Somers 134b6dec9f0SBrian Somers if (c->pause.state == TIMER_RUNNING) 135b6dec9f0SBrian Somers return 0; 136b6dec9f0SBrian Somers 137b6dec9f0SBrian Somers if (c->TimedOut) { 138b6dec9f0SBrian Somers LogPrintf(LogCHAT, "Expect timeout\n"); 139b6dec9f0SBrian Somers if ( c->nargptr == NULL) 140b6dec9f0SBrian Somers c->state = CHAT_FAILED; 141b6dec9f0SBrian Somers else { 142b6dec9f0SBrian Somers c->state = CHAT_EXPECT; 143b6dec9f0SBrian Somers c->argptr = ""; 144b6dec9f0SBrian Somers } 145b6dec9f0SBrian Somers } 146b6dec9f0SBrian Somers 147b6dec9f0SBrian Somers if (c->state != CHAT_EXPECT && c->state != CHAT_SEND) 148b6dec9f0SBrian Somers return 0; 149b6dec9f0SBrian Somers 150b6dec9f0SBrian Somers gottimeout = gotabort = 0; 151b6dec9f0SBrian Somers 152b6dec9f0SBrian Somers if (c->arg < c->argc && (c->arg < 0 || *c->argptr == '\0')) { 153b6dec9f0SBrian Somers /* Go get the next string */ 154b6dec9f0SBrian Somers if (c->arg < 0 || c->state == CHAT_SEND) 155b6dec9f0SBrian Somers c->state = CHAT_EXPECT; 156b6dec9f0SBrian Somers else 157b6dec9f0SBrian Somers c->state = CHAT_SEND; 158b6dec9f0SBrian Somers 159b6dec9f0SBrian Somers special = 1; 160b6dec9f0SBrian Somers while (special && (c->nargptr || c->arg < c->argc - 1)) { 161b6dec9f0SBrian Somers if (c->arg < 0 || !c->TimedOut) 162b6dec9f0SBrian Somers c->nargptr = NULL; 163b6dec9f0SBrian Somers 164b6dec9f0SBrian Somers if (c->nargptr != NULL) { 165b6dec9f0SBrian Somers /* We're doing expect-send-expect.... */ 166b6dec9f0SBrian Somers c->argptr = c->nargptr; 167b6dec9f0SBrian Somers /* Put the '-' back in case we ever want to rerun our script */ 168b6dec9f0SBrian Somers c->nargptr[-1] = '-'; 169b6dec9f0SBrian Somers c->nargptr = chat_NextChar(c->nargptr, '-'); 170b6dec9f0SBrian Somers if (c->nargptr != NULL) 171b6dec9f0SBrian Somers *c->nargptr++ = '\0'; 172b6dec9f0SBrian Somers } else { 173b6dec9f0SBrian Somers int minus; 174b6dec9f0SBrian Somers 175b6dec9f0SBrian Somers c->argptr = c->argv[++c->arg]; 176b6dec9f0SBrian Somers 177b6dec9f0SBrian Somers if (c->state == CHAT_EXPECT) { 178b6dec9f0SBrian Somers /* Look for expect-send-expect sequence */ 179b6dec9f0SBrian Somers c->nargptr = c->argptr; 180b6dec9f0SBrian Somers minus = 0; 181b6dec9f0SBrian Somers while ((c->nargptr = chat_NextChar(c->nargptr, '-'))) { 182b6dec9f0SBrian Somers c->nargptr++; 183b6dec9f0SBrian Somers minus++; 184b6dec9f0SBrian Somers } 185b6dec9f0SBrian Somers 186b6dec9f0SBrian Somers if (minus % 2) 187b6dec9f0SBrian Somers LogPrintf(LogWARN, "chat_UpdateSet: \"%s\": Uneven number of" 188b6dec9f0SBrian Somers " '-' chars, all ignored\n", c->argptr); 189b6dec9f0SBrian Somers else if (minus) { 190b6dec9f0SBrian Somers c->nargptr = chat_NextChar(c->argptr, '-'); 191b6dec9f0SBrian Somers *c->nargptr++ = '\0'; 192b6dec9f0SBrian Somers } 193b6dec9f0SBrian Somers } 194b6dec9f0SBrian Somers } 195b6dec9f0SBrian Somers 196b6dec9f0SBrian Somers /* 197b6dec9f0SBrian Somers * c->argptr now temporarily points into c->script (via c->argv) 198b6dec9f0SBrian Somers * If it's an expect-send-expect sequence, we've just got the correct 199b6dec9f0SBrian Somers * portion of that sequence. 200b6dec9f0SBrian Somers */ 201b6dec9f0SBrian Somers 202b6dec9f0SBrian Somers needcr = c->state == CHAT_SEND && *c->argptr != '!'; 203b6dec9f0SBrian Somers 204b6dec9f0SBrian Somers /* We leave room for a potential HDLC header in the target string */ 205d5015272SBrian Somers ExpandString(c, c->argptr, c->exp + 2, sizeof c->exp - 2, needcr); 206b6dec9f0SBrian Somers 207b6dec9f0SBrian Somers if (gotabort) { 208486f40c9SBrian Somers if (c->abort.num < MAXABORTS) { 209486f40c9SBrian Somers int len, n; 210486f40c9SBrian Somers 211486f40c9SBrian Somers len = strlen(c->exp+2); 212486f40c9SBrian Somers for (n = 0; n < c->abort.num; n++) 213486f40c9SBrian Somers if (len > c->abort.string[n].len) { 214486f40c9SBrian Somers int last; 215486f40c9SBrian Somers 216486f40c9SBrian Somers for (last = c->abort.num; last > n; last--) { 217486f40c9SBrian Somers c->abort.string[last].data = c->abort.string[last-1].data; 218486f40c9SBrian Somers c->abort.string[last].len = c->abort.string[last-1].len; 219486f40c9SBrian Somers } 220486f40c9SBrian Somers break; 221486f40c9SBrian Somers } 222486f40c9SBrian Somers c->abort.string[n].len = len; 223486f40c9SBrian Somers c->abort.string[n].data = (char *)malloc(len+1); 224486f40c9SBrian Somers memcpy(c->abort.string[n].data, c->exp+2, len+1); 225486f40c9SBrian Somers c->abort.num++; 226486f40c9SBrian Somers } else 227486f40c9SBrian Somers LogPrintf(LogERROR, "chat_UpdateSet: too many abort strings\n"); 228b6dec9f0SBrian Somers gotabort = 0; 229b6dec9f0SBrian Somers } else if (gottimeout) { 230b6dec9f0SBrian Somers c->TimeoutSec = atoi(c->exp + 2); 231b6dec9f0SBrian Somers if (c->TimeoutSec <= 0) 232b6dec9f0SBrian Somers c->TimeoutSec = 30; 233b6dec9f0SBrian Somers gottimeout = 0; 234b6dec9f0SBrian Somers } else if (c->nargptr == NULL && !strcmp(c->exp+2, "ABORT")) 235b6dec9f0SBrian Somers gotabort = 1; 236b6dec9f0SBrian Somers else if (c->nargptr == NULL && !strcmp(c->exp+2, "TIMEOUT")) 237b6dec9f0SBrian Somers gottimeout = 1; 238b6dec9f0SBrian Somers else { 239b6dec9f0SBrian Somers if (c->exp[2] == '!') 240b6dec9f0SBrian Somers ExecStr(c->physical, c->exp + 3, c->exp + 2, sizeof c->exp - 2); 241b6dec9f0SBrian Somers 24256c9cf9dSBrian Somers if (c->exp[2] == '\0') { 243b6dec9f0SBrian Somers /* Empty string, reparse (this may be better as a `goto start') */ 24456c9cf9dSBrian Somers c->argptr = ""; 245b6dec9f0SBrian Somers return chat_UpdateSet(d, r, w, e, n); 24656c9cf9dSBrian Somers } 247b6dec9f0SBrian Somers 248b6dec9f0SBrian Somers special = 0; 249b6dec9f0SBrian Somers } 250b6dec9f0SBrian Somers } 251b6dec9f0SBrian Somers 252b6dec9f0SBrian Somers if (special) { 253b6dec9f0SBrian Somers if (gottimeout) 254b6dec9f0SBrian Somers LogPrintf(LogWARN, "chat_UpdateSet: TIMEOUT: Argument expected\n"); 255b6dec9f0SBrian Somers else if (gotabort) 256b6dec9f0SBrian Somers LogPrintf(LogWARN, "chat_UpdateSet: ABORT: Argument expected\n"); 257b6dec9f0SBrian Somers 258b6dec9f0SBrian Somers /* End of script - all ok */ 259b6dec9f0SBrian Somers c->state = CHAT_DONE; 260b6dec9f0SBrian Somers return 0; 261b6dec9f0SBrian Somers } 262b6dec9f0SBrian Somers 263b6dec9f0SBrian Somers /* set c->argptr to point in the right place */ 264b6dec9f0SBrian Somers c->argptr = c->exp + 2; 265b6dec9f0SBrian Somers c->arglen = strlen(c->argptr); 266b6dec9f0SBrian Somers 267b6dec9f0SBrian Somers if (c->state == CHAT_EXPECT) { 268b6dec9f0SBrian Somers /* We must check to see if the string's already been found ! */ 269b6dec9f0SBrian Somers char *begin, *end; 270b6dec9f0SBrian Somers 271b6dec9f0SBrian Somers end = c->bufend - c->arglen + 1; 272b6dec9f0SBrian Somers if (end < c->bufstart) 273b6dec9f0SBrian Somers end = c->bufstart; 274b6dec9f0SBrian Somers for (begin = c->bufstart; begin < end; begin++) 275b6dec9f0SBrian Somers if (!strncmp(begin, c->argptr, c->arglen)) { 276b6dec9f0SBrian Somers c->bufstart = begin + c->arglen; 277b6dec9f0SBrian Somers c->argptr += c->arglen; 278b6dec9f0SBrian Somers c->arglen = 0; 279b6dec9f0SBrian Somers /* Continue - we've already read our expect string */ 280b6dec9f0SBrian Somers return chat_UpdateSet(d, r, w, e, n); 281b6dec9f0SBrian Somers } 282b6dec9f0SBrian Somers 283b6dec9f0SBrian Somers c->TimedOut = 0; 284b6dec9f0SBrian Somers LogPrintf(LogCHAT, "Expect(%d): %s\n", c->TimeoutSec, c->argptr); 285b6dec9f0SBrian Somers chat_SetTimeout(c); 286b6dec9f0SBrian Somers } 287b6dec9f0SBrian Somers } 288b6dec9f0SBrian Somers 289b6dec9f0SBrian Somers /* 290b6dec9f0SBrian Somers * We now have c->argptr pointing at what we want to expect/send and 291b6dec9f0SBrian Somers * c->state saying what we want to do... we now know what to put in 292b6dec9f0SBrian Somers * the fd_set :-) 293b6dec9f0SBrian Somers */ 294b6dec9f0SBrian Somers 295b6dec9f0SBrian Somers if (c->state == CHAT_EXPECT) 296b6dec9f0SBrian Somers return Physical_UpdateSet(&c->physical->desc, r, NULL, e, n, 1); 297b6dec9f0SBrian Somers else 298b6dec9f0SBrian Somers return Physical_UpdateSet(&c->physical->desc, NULL, w, e, n, 1); 299b6dec9f0SBrian Somers } 300b6dec9f0SBrian Somers 301b6dec9f0SBrian Somers static int 3022f786681SBrian Somers chat_IsSet(struct descriptor *d, const fd_set *fdset) 303b6dec9f0SBrian Somers { 304b6dec9f0SBrian Somers struct chat *c = descriptor2chat(d); 305b6dec9f0SBrian Somers return Physical_IsSet(&c->physical->desc, fdset); 306b6dec9f0SBrian Somers } 307b6dec9f0SBrian Somers 308b6dec9f0SBrian Somers static void 309b6dec9f0SBrian Somers chat_UpdateLog(struct chat *c, int in) 310b6dec9f0SBrian Somers { 311b6dec9f0SBrian Somers if (LogIsKept(LogCHAT) || LogIsKept(LogCONNECT)) { 312b6dec9f0SBrian Somers /* 313b6dec9f0SBrian Somers * If a linefeed appears in the last `in' characters of `c's input 314b6dec9f0SBrian Somers * buffer, output from there, all the way back to the last linefeed. 315b6dec9f0SBrian Somers * This is called for every read of `in' bytes. 316b6dec9f0SBrian Somers */ 317486f40c9SBrian Somers char *ptr, *end, *stop, ch; 318b6dec9f0SBrian Somers int level; 319b6dec9f0SBrian Somers 320b6dec9f0SBrian Somers level = LogIsKept(LogCHAT) ? LogCHAT : LogCONNECT; 321486f40c9SBrian Somers if (in == -1) 322486f40c9SBrian Somers end = ptr = c->bufend; 323486f40c9SBrian Somers else { 324b6dec9f0SBrian Somers ptr = c->bufend - in; 325b6dec9f0SBrian Somers for (end = c->bufend - 1; end >= ptr; end--) 326b6dec9f0SBrian Somers if (*end == '\n') 327b6dec9f0SBrian Somers break; 328486f40c9SBrian Somers } 329b6dec9f0SBrian Somers 330b6dec9f0SBrian Somers if (end >= ptr) { 331486f40c9SBrian Somers for (ptr = c->bufend - (in == -1 ? 1 : in + 1); ptr >= c->bufstart; ptr--) 332b6dec9f0SBrian Somers if (*ptr == '\n') 333b6dec9f0SBrian Somers break; 334b6dec9f0SBrian Somers ptr++; 335b6dec9f0SBrian Somers stop = NULL; 336486f40c9SBrian Somers while (stop < end) { 337486f40c9SBrian Somers if ((stop = memchr(ptr, '\n', end - ptr)) == NULL) 338486f40c9SBrian Somers stop = end; 339486f40c9SBrian Somers ch = *stop; 340b6dec9f0SBrian Somers *stop = '\0'; 341b6dec9f0SBrian Somers if (level == LogCHAT || strstr(ptr, "CONNECT")) 342b6dec9f0SBrian Somers LogPrintf(level, "Received: %s\n", ptr); 343486f40c9SBrian Somers *stop = ch; 344b6dec9f0SBrian Somers ptr = stop + 1; 345b6dec9f0SBrian Somers } 346b6dec9f0SBrian Somers } 347b6dec9f0SBrian Somers } 348b6dec9f0SBrian Somers } 349b6dec9f0SBrian Somers 350b6dec9f0SBrian Somers static void 351b6dec9f0SBrian Somers chat_Read(struct descriptor *d, struct bundle *bundle, const fd_set *fdset) 352b6dec9f0SBrian Somers { 353b6dec9f0SBrian Somers struct chat *c = descriptor2chat(d); 354b6dec9f0SBrian Somers 355b6dec9f0SBrian Somers if (c->state == CHAT_EXPECT) { 356b6dec9f0SBrian Somers ssize_t in; 357486f40c9SBrian Somers char *abegin, *ebegin, *begin, *aend, *eend, *end; 358486f40c9SBrian Somers int n; 359b6dec9f0SBrian Somers 360b6dec9f0SBrian Somers /* 361b6dec9f0SBrian Somers * XXX - should this read only 1 byte to guarantee that we don't 362b6dec9f0SBrian Somers * swallow any ppp talk from the peer ? 363b6dec9f0SBrian Somers */ 364b6dec9f0SBrian Somers in = BUFLEFT(c); 365b6dec9f0SBrian Somers if (in > sizeof c->buf / 2) 366b6dec9f0SBrian Somers in = sizeof c->buf / 2; 367b6dec9f0SBrian Somers 368b6dec9f0SBrian Somers in = Physical_Read(c->physical, c->bufend, in); 369b6dec9f0SBrian Somers if (in <= 0) 370b6dec9f0SBrian Somers return; 371b6dec9f0SBrian Somers 372b6dec9f0SBrian Somers /* `begin' and `end' delimit where we're going to strncmp() from */ 373486f40c9SBrian Somers ebegin = c->bufend - c->arglen + 1; 374486f40c9SBrian Somers eend = ebegin + in; 375486f40c9SBrian Somers if (ebegin < c->bufstart) 376486f40c9SBrian Somers ebegin = c->bufstart; 377486f40c9SBrian Somers 378486f40c9SBrian Somers if (c->abort.num) { 379486f40c9SBrian Somers abegin = c->bufend - c->abort.string[0].len + 1; 380486f40c9SBrian Somers aend = c->bufend - c->abort.string[c->abort.num-1].len + in + 1; 381486f40c9SBrian Somers if (abegin < c->bufstart) 382486f40c9SBrian Somers abegin = c->bufstart; 383486f40c9SBrian Somers } else { 384486f40c9SBrian Somers abegin = ebegin; 385486f40c9SBrian Somers aend = eend; 386486f40c9SBrian Somers } 387486f40c9SBrian Somers begin = abegin < ebegin ? abegin : ebegin; 388486f40c9SBrian Somers end = aend < eend ? eend : aend; 389486f40c9SBrian Somers 390b6dec9f0SBrian Somers c->bufend += in; 391b6dec9f0SBrian Somers 392b6dec9f0SBrian Somers chat_UpdateLog(c, in); 393b6dec9f0SBrian Somers 394b6dec9f0SBrian Somers if (c->bufend > c->buf + sizeof c->buf / 2) { 395b6dec9f0SBrian Somers /* Shuffle our receive buffer back a bit */ 396b6dec9f0SBrian Somers int chop; 397b6dec9f0SBrian Somers 398b6dec9f0SBrian Somers for (chop = begin - c->buf; chop; chop--) 399b6dec9f0SBrian Somers if (c->buf[chop] == '\n') 400b6dec9f0SBrian Somers /* found some already-logged garbage to remove :-) */ 401b6dec9f0SBrian Somers break; 402486f40c9SBrian Somers 403486f40c9SBrian Somers if (!chop) 404b6dec9f0SBrian Somers chop = begin - c->buf; 405486f40c9SBrian Somers 406b6dec9f0SBrian Somers if (chop) { 407b6dec9f0SBrian Somers char *from, *to; 408b6dec9f0SBrian Somers 409b6dec9f0SBrian Somers to = c->buf; 410b6dec9f0SBrian Somers from = to + chop; 411b6dec9f0SBrian Somers while (from < c->bufend) 412b6dec9f0SBrian Somers *to++ = *from++; 413b6dec9f0SBrian Somers c->bufstart -= chop; 414b6dec9f0SBrian Somers c->bufend -= chop; 415b6dec9f0SBrian Somers begin -= chop; 416b6dec9f0SBrian Somers end -= chop; 417486f40c9SBrian Somers abegin -= chop; 418486f40c9SBrian Somers aend -= chop; 419486f40c9SBrian Somers ebegin -= chop; 420486f40c9SBrian Somers eend -= chop; 421b6dec9f0SBrian Somers } 422b6dec9f0SBrian Somers } 423b6dec9f0SBrian Somers 424b6dec9f0SBrian Somers for (; begin < end; begin++) 425486f40c9SBrian Somers if (begin >= ebegin && begin < eend && 426486f40c9SBrian Somers !strncmp(begin, c->argptr, c->arglen)) { 427b6dec9f0SBrian Somers /* Got it ! */ 428486f40c9SBrian Somers if (memchr(begin + c->arglen - 1, '\n', 429486f40c9SBrian Somers c->bufend - begin - c->arglen + 1) == NULL) { 430486f40c9SBrian Somers /* force it into the log */ 431b6dec9f0SBrian Somers end = c->bufend; 432b6dec9f0SBrian Somers c->bufend = begin + c->arglen; 433486f40c9SBrian Somers chat_UpdateLog(c, -1); 434b6dec9f0SBrian Somers c->bufend = end; 435b6dec9f0SBrian Somers } 436b6dec9f0SBrian Somers c->bufstart = begin + c->arglen; 437b6dec9f0SBrian Somers c->argptr += c->arglen; 438b6dec9f0SBrian Somers c->arglen = 0; 439b6dec9f0SBrian Somers break; 440486f40c9SBrian Somers } else if (begin >= abegin && begin < aend) { 441486f40c9SBrian Somers for (n = c->abort.num - 1; n >= 0; n--) { 442486f40c9SBrian Somers if (begin + c->abort.string[n].len > c->bufend) 443486f40c9SBrian Somers break; 444486f40c9SBrian Somers if (!strncmp(begin, c->abort.string[n].data, 445486f40c9SBrian Somers c->abort.string[n].len)) { 446486f40c9SBrian Somers if (memchr(begin + c->abort.string[n].len - 1, '\n', 447486f40c9SBrian Somers c->bufend - begin - c->abort.string[n].len + 1) == NULL) { 448486f40c9SBrian Somers /* force it into the log */ 449486f40c9SBrian Somers end = c->bufend; 450486f40c9SBrian Somers c->bufend = begin + c->abort.string[n].len; 451486f40c9SBrian Somers chat_UpdateLog(c, -1); 452486f40c9SBrian Somers c->bufend = end; 453486f40c9SBrian Somers } 454486f40c9SBrian Somers c->bufstart = begin + c->abort.string[n].len; 455486f40c9SBrian Somers c->state = CHAT_FAILED; 456486f40c9SBrian Somers return; 457486f40c9SBrian Somers } 458486f40c9SBrian Somers } 459b6dec9f0SBrian Somers } 460b6dec9f0SBrian Somers } 461b6dec9f0SBrian Somers } 462b6dec9f0SBrian Somers 463b6dec9f0SBrian Somers static void 464f4768038SBrian Somers chat_Write(struct descriptor *d, struct bundle *bundle, const fd_set *fdset) 465b6dec9f0SBrian Somers { 466b6dec9f0SBrian Somers struct chat *c = descriptor2chat(d); 467b6dec9f0SBrian Somers 468b6dec9f0SBrian Somers if (c->state == CHAT_SEND) { 469b6dec9f0SBrian Somers int wrote; 470b6dec9f0SBrian Somers 471b6dec9f0SBrian Somers if (strstr(c->argv[c->arg], "\\P")) /* Don't log the password */ 472b6dec9f0SBrian Somers LogPrintf(LogCHAT, "Send: %s\n", c->argv[c->arg]); 473b6dec9f0SBrian Somers else { 474b6dec9f0SBrian Somers int sz; 475b6dec9f0SBrian Somers 476b6dec9f0SBrian Somers sz = c->arglen - 1; 477b6dec9f0SBrian Somers while (sz >= 0 && c->argptr[sz] == '\n') 478b6dec9f0SBrian Somers sz--; 479b6dec9f0SBrian Somers LogPrintf(LogCHAT, "Send: %.*s\n", sz + 1, c->argptr); 480b6dec9f0SBrian Somers } 481b6dec9f0SBrian Somers 482b6dec9f0SBrian Somers if (Physical_IsSync(c->physical)) { 483b6dec9f0SBrian Somers /* There's always room for the HDLC header */ 484b6dec9f0SBrian Somers c->argptr -= 2; 485b6dec9f0SBrian Somers c->arglen += 2; 486b6dec9f0SBrian Somers memcpy(c->argptr, "\377\003", 2); /* Prepend HDLC header */ 487b6dec9f0SBrian Somers } 488b6dec9f0SBrian Somers 489b6dec9f0SBrian Somers wrote = Physical_Write(c->physical, c->argptr, c->arglen); 490b6dec9f0SBrian Somers if (wrote == -1) { 491b6dec9f0SBrian Somers if (errno != EINTR) 492b6dec9f0SBrian Somers LogPrintf(LogERROR, "chat_Write: %s\n", strerror(errno)); 493b6dec9f0SBrian Somers if (Physical_IsSync(c->physical)) { 494b6dec9f0SBrian Somers c->argptr += 2; 495b6dec9f0SBrian Somers c->arglen -= 2; 496b6dec9f0SBrian Somers } 497b6dec9f0SBrian Somers } else if (wrote < 2 && Physical_IsSync(c->physical)) { 498b6dec9f0SBrian Somers /* Oops - didn't even write our HDLC header ! */ 499b6dec9f0SBrian Somers c->argptr += 2; 500b6dec9f0SBrian Somers c->arglen -= 2; 501b6dec9f0SBrian Somers } else { 502b6dec9f0SBrian Somers c->argptr += wrote; 503b6dec9f0SBrian Somers c->arglen -= wrote; 504b6dec9f0SBrian Somers } 505b6dec9f0SBrian Somers } 506b6dec9f0SBrian Somers } 507b6dec9f0SBrian Somers 508b6dec9f0SBrian Somers void 509f9545805SBrian Somers chat_Init(struct chat *c, struct physical *p, const char *data, int emptybuf, 510f9545805SBrian Somers const char *phone) 511b6dec9f0SBrian Somers { 512b6dec9f0SBrian Somers c->desc.type = CHAT_DESCRIPTOR; 513b6dec9f0SBrian Somers c->desc.next = NULL; 514b6dec9f0SBrian Somers c->desc.UpdateSet = chat_UpdateSet; 515b6dec9f0SBrian Somers c->desc.IsSet = chat_IsSet; 516b6dec9f0SBrian Somers c->desc.Read = chat_Read; 517b6dec9f0SBrian Somers c->desc.Write = chat_Write; 518b6dec9f0SBrian Somers c->physical = p; 519b6dec9f0SBrian Somers 520b6dec9f0SBrian Somers c->state = CHAT_EXPECT; 521b6dec9f0SBrian Somers 5225b8b8060SBrian Somers if (data == NULL) { 5235b8b8060SBrian Somers *c->script = '\0'; 5245b8b8060SBrian Somers c->argc = 0; 5255b8b8060SBrian Somers } else { 526b6dec9f0SBrian Somers strncpy(c->script, data, sizeof c->script - 1); 527b6dec9f0SBrian Somers c->script[sizeof c->script - 1] = '\0'; 528b6dec9f0SBrian Somers c->argc = MakeArgs(c->script, c->argv, VECSIZE(c->argv)); 5295b8b8060SBrian Somers } 530b6dec9f0SBrian Somers 531b6dec9f0SBrian Somers c->arg = -1; 532b6dec9f0SBrian Somers c->argptr = NULL; 533b6dec9f0SBrian Somers c->nargptr = NULL; 534b6dec9f0SBrian Somers 535b6dec9f0SBrian Somers if (emptybuf) 536b6dec9f0SBrian Somers c->bufstart = c->bufend = c->buf; 537b6dec9f0SBrian Somers 538b6dec9f0SBrian Somers c->TimeoutSec = 30; 539b6dec9f0SBrian Somers c->TimedOut = 0; 540f9545805SBrian Somers c->phone = phone; 541486f40c9SBrian Somers c->abort.num = 0; 542b6dec9f0SBrian Somers 543b6dec9f0SBrian Somers StopTimer(&c->pause); 544b6dec9f0SBrian Somers c->pause.state = TIMER_STOPPED; 545b6dec9f0SBrian Somers 546b6dec9f0SBrian Somers StopTimer(&c->timeout); 547b6dec9f0SBrian Somers c->timeout.state = TIMER_STOPPED; 548b6dec9f0SBrian Somers } 549b6dec9f0SBrian Somers 550b6dec9f0SBrian Somers void 551b6dec9f0SBrian Somers chat_Destroy(struct chat *c) 552b6dec9f0SBrian Somers { 553486f40c9SBrian Somers while (c->abort.num) 554486f40c9SBrian Somers free(c->abort.string[--c->abort.num].data); 555b6dec9f0SBrian Somers } 556b6dec9f0SBrian Somers 5571ae349f5Scvs2svn static char * 5581ae349f5Scvs2svn findblank(char *p, int instring) 5591ae349f5Scvs2svn { 5601ae349f5Scvs2svn if (instring) { 5611ae349f5Scvs2svn while (*p) { 5621ae349f5Scvs2svn if (*p == '\\') { 5631ae349f5Scvs2svn strcpy(p, p + 1); 5641ae349f5Scvs2svn if (!*p) 5651ae349f5Scvs2svn break; 5661ae349f5Scvs2svn } else if (*p == '"') 5671ae349f5Scvs2svn return (p); 5681ae349f5Scvs2svn p++; 5691ae349f5Scvs2svn } 5701ae349f5Scvs2svn } else { 5711ae349f5Scvs2svn while (*p) { 572c78db105SBrian Somers if (issep(*p)) 5731ae349f5Scvs2svn return (p); 5741ae349f5Scvs2svn p++; 5751ae349f5Scvs2svn } 5761ae349f5Scvs2svn } 5771ae349f5Scvs2svn return p; 5781ae349f5Scvs2svn } 5791ae349f5Scvs2svn 5801ae349f5Scvs2svn int 5811ae349f5Scvs2svn MakeArgs(char *script, char **pvect, int maxargs) 5821ae349f5Scvs2svn { 5831ae349f5Scvs2svn int nargs, nb; 5841ae349f5Scvs2svn int instring; 5851ae349f5Scvs2svn 5861ae349f5Scvs2svn nargs = 0; 5871ae349f5Scvs2svn while (*script) { 5881ae349f5Scvs2svn nb = strspn(script, " \t"); 5891ae349f5Scvs2svn script += nb; 5901ae349f5Scvs2svn if (*script) { 5911ae349f5Scvs2svn if (*script == '"') { 5921ae349f5Scvs2svn instring = 1; 5931ae349f5Scvs2svn script++; 5941ae349f5Scvs2svn if (*script == '\0') 5951ae349f5Scvs2svn break; /* Shouldn't return here. Need to null 5961ae349f5Scvs2svn * terminate below */ 5971ae349f5Scvs2svn } else 5981ae349f5Scvs2svn instring = 0; 5991ae349f5Scvs2svn if (nargs >= maxargs - 1) 6001ae349f5Scvs2svn break; 6011ae349f5Scvs2svn *pvect++ = script; 6021ae349f5Scvs2svn nargs++; 6031ae349f5Scvs2svn script = findblank(script, instring); 6041ae349f5Scvs2svn if (*script) 6051ae349f5Scvs2svn *script++ = '\0'; 6061ae349f5Scvs2svn } 6071ae349f5Scvs2svn } 6081ae349f5Scvs2svn *pvect = NULL; 6091ae349f5Scvs2svn return nargs; 6101ae349f5Scvs2svn } 6111ae349f5Scvs2svn 6121ae349f5Scvs2svn /* 6131ae349f5Scvs2svn * \c don't add a cr 6141ae349f5Scvs2svn * \d Sleep a little (delay 2 seconds 6151ae349f5Scvs2svn * \n Line feed character 6161ae349f5Scvs2svn * \P Auth Key password 6171ae349f5Scvs2svn * \p pause 0.25 sec 6181ae349f5Scvs2svn * \r Carrige return character 6191ae349f5Scvs2svn * \s Space character 6201ae349f5Scvs2svn * \T Telephone number(s) (defined via `set phone') 6211ae349f5Scvs2svn * \t Tab character 6221ae349f5Scvs2svn * \U Auth User 6231ae349f5Scvs2svn */ 6241ae349f5Scvs2svn char * 625d5015272SBrian Somers ExpandString(struct chat *c, const char *str, char *result, int reslen, 626b6dec9f0SBrian Somers int sendmode) 6271ae349f5Scvs2svn { 6281ae349f5Scvs2svn int addcr = 0; 6291ae349f5Scvs2svn 6301ae349f5Scvs2svn result[--reslen] = '\0'; 6311ae349f5Scvs2svn if (sendmode) 6321ae349f5Scvs2svn addcr = 1; 6331ae349f5Scvs2svn while (*str && reslen > 0) { 6341ae349f5Scvs2svn switch (*str) { 6351ae349f5Scvs2svn case '\\': 6361ae349f5Scvs2svn str++; 6371ae349f5Scvs2svn switch (*str) { 6381ae349f5Scvs2svn case 'c': 6391ae349f5Scvs2svn if (sendmode) 6401ae349f5Scvs2svn addcr = 0; 6411ae349f5Scvs2svn break; 6421ae349f5Scvs2svn case 'd': /* Delay 2 seconds */ 643b6dec9f0SBrian Somers chat_Pause(c, 2 * SECTICKS); 6441ae349f5Scvs2svn break; 6451ae349f5Scvs2svn case 'p': 646b6dec9f0SBrian Somers chat_Pause(c, SECTICKS / 4); 6471ae349f5Scvs2svn break; /* Pause 0.25 sec */ 6481ae349f5Scvs2svn case 'n': 6491ae349f5Scvs2svn *result++ = '\n'; 6501ae349f5Scvs2svn reslen--; 6511ae349f5Scvs2svn break; 6521ae349f5Scvs2svn case 'r': 6531ae349f5Scvs2svn *result++ = '\r'; 6541ae349f5Scvs2svn reslen--; 6551ae349f5Scvs2svn break; 6561ae349f5Scvs2svn case 's': 6571ae349f5Scvs2svn *result++ = ' '; 6581ae349f5Scvs2svn reslen--; 6591ae349f5Scvs2svn break; 6601ae349f5Scvs2svn case 't': 6611ae349f5Scvs2svn *result++ = '\t'; 6621ae349f5Scvs2svn reslen--; 6631ae349f5Scvs2svn break; 6641ae349f5Scvs2svn case 'P': 6651ae349f5Scvs2svn strncpy(result, VarAuthKey, reslen); 6661ae349f5Scvs2svn reslen -= strlen(result); 6671ae349f5Scvs2svn result += strlen(result); 6681ae349f5Scvs2svn break; 6691ae349f5Scvs2svn case 'T': 670f9545805SBrian Somers strncpy(result, c->phone, reslen); 6711ae349f5Scvs2svn reslen -= strlen(result); 6721ae349f5Scvs2svn result += strlen(result); 6731ae349f5Scvs2svn break; 6741ae349f5Scvs2svn case 'U': 6751ae349f5Scvs2svn strncpy(result, VarAuthName, reslen); 6761ae349f5Scvs2svn reslen -= strlen(result); 6771ae349f5Scvs2svn result += strlen(result); 6781ae349f5Scvs2svn break; 6791ae349f5Scvs2svn default: 6801ae349f5Scvs2svn reslen--; 6811ae349f5Scvs2svn *result++ = *str; 6821ae349f5Scvs2svn break; 6831ae349f5Scvs2svn } 6841ae349f5Scvs2svn if (*str) 6851ae349f5Scvs2svn str++; 6861ae349f5Scvs2svn break; 6871ae349f5Scvs2svn case '^': 6881ae349f5Scvs2svn str++; 6891ae349f5Scvs2svn if (*str) { 6901ae349f5Scvs2svn *result++ = *str++ & 0x1f; 6911ae349f5Scvs2svn reslen--; 6921ae349f5Scvs2svn } 6931ae349f5Scvs2svn break; 6941ae349f5Scvs2svn default: 6951ae349f5Scvs2svn *result++ = *str++; 6961ae349f5Scvs2svn reslen--; 6971ae349f5Scvs2svn break; 6981ae349f5Scvs2svn } 6991ae349f5Scvs2svn } 7001ae349f5Scvs2svn if (--reslen > 0) { 7011ae349f5Scvs2svn if (addcr) 7021ae349f5Scvs2svn *result++ = '\r'; 7031ae349f5Scvs2svn } 7041ae349f5Scvs2svn if (--reslen > 0) 7051ae349f5Scvs2svn *result++ = '\0'; 7061ae349f5Scvs2svn return (result); 7071ae349f5Scvs2svn } 7081ae349f5Scvs2svn 7091ae349f5Scvs2svn static void 71063b73463SBrian Somers ExecStr(struct physical *physical, char *command, char *out, int olen) 7111ae349f5Scvs2svn { 7121ae349f5Scvs2svn pid_t pid; 7131ae349f5Scvs2svn int fids[2]; 7141ae349f5Scvs2svn char *vector[MAXARGS], *startout, *endout; 7151ae349f5Scvs2svn int stat, nb; 7161ae349f5Scvs2svn 7171ae349f5Scvs2svn LogPrintf(LogCHAT, "Exec: %s\n", command); 7181ae349f5Scvs2svn MakeArgs(command, vector, VECSIZE(vector)); 7191ae349f5Scvs2svn 7201ae349f5Scvs2svn if (pipe(fids) < 0) { 7211ae349f5Scvs2svn LogPrintf(LogCHAT, "Unable to create pipe in ExecStr: %s\n", 7221ae349f5Scvs2svn strerror(errno)); 723c78db105SBrian Somers *out = '\0'; 724c78db105SBrian Somers return; 7251ae349f5Scvs2svn } 7261ae349f5Scvs2svn if ((pid = fork()) == 0) { 7271ae349f5Scvs2svn TermTimerService(); 7281ae349f5Scvs2svn signal(SIGINT, SIG_DFL); 7291ae349f5Scvs2svn signal(SIGQUIT, SIG_DFL); 7301ae349f5Scvs2svn signal(SIGTERM, SIG_DFL); 7311ae349f5Scvs2svn signal(SIGHUP, SIG_DFL); 7321ae349f5Scvs2svn signal(SIGALRM, SIG_DFL); 73363b73463SBrian Somers /* XXX-ML This looks like it might need more encapsulation. */ 73463b73463SBrian Somers if (Physical_GetFD(physical) == 2) { 73563b73463SBrian Somers Physical_DupAndClose(physical); 7361ae349f5Scvs2svn } 7371ae349f5Scvs2svn close(fids[0]); 7381ae349f5Scvs2svn dup2(fids[1], 2); 7391ae349f5Scvs2svn close(fids[1]); 74063b73463SBrian Somers dup2(Physical_GetFD(physical), 0); 74163b73463SBrian Somers dup2(Physical_GetFD(physical), 1); 7421ae349f5Scvs2svn if ((nb = open("/dev/tty", O_RDWR)) > 3) { 7431ae349f5Scvs2svn dup2(nb, 3); 7441ae349f5Scvs2svn close(nb); 7451ae349f5Scvs2svn } 7461ae349f5Scvs2svn setuid(geteuid()); 7471ae349f5Scvs2svn execvp(vector[0], vector); 7481ae349f5Scvs2svn fprintf(stderr, "execvp failed: %s: %s\n", vector[0], strerror(errno)); 7491ae349f5Scvs2svn exit(127); 7501ae349f5Scvs2svn } else { 7511ae349f5Scvs2svn char *name = strdup(vector[0]); 7521ae349f5Scvs2svn 7531ae349f5Scvs2svn close(fids[1]); 7541ae349f5Scvs2svn endout = out + olen - 1; 7551ae349f5Scvs2svn startout = out; 7561ae349f5Scvs2svn while (out < endout) { 7571ae349f5Scvs2svn nb = read(fids[0], out, 1); 7581ae349f5Scvs2svn if (nb <= 0) 7591ae349f5Scvs2svn break; 7601ae349f5Scvs2svn out++; 7611ae349f5Scvs2svn } 7621ae349f5Scvs2svn *out = '\0'; 7631ae349f5Scvs2svn close(fids[0]); 7641ae349f5Scvs2svn close(fids[1]); 7651ae349f5Scvs2svn waitpid(pid, &stat, WNOHANG); 7661ae349f5Scvs2svn if (WIFSIGNALED(stat)) { 7671ae349f5Scvs2svn LogPrintf(LogWARN, "%s: signal %d\n", name, WTERMSIG(stat)); 7681ae349f5Scvs2svn free(name); 769c78db105SBrian Somers *out = '\0'; 770c78db105SBrian Somers return; 7711ae349f5Scvs2svn } else if (WIFEXITED(stat)) { 7721ae349f5Scvs2svn switch (WEXITSTATUS(stat)) { 7731ae349f5Scvs2svn case 0: 7741ae349f5Scvs2svn free(name); 7751ae349f5Scvs2svn break; 7761ae349f5Scvs2svn case 127: 7771ae349f5Scvs2svn LogPrintf(LogWARN, "%s: %s\n", name, startout); 7781ae349f5Scvs2svn free(name); 779c78db105SBrian Somers *out = '\0'; 780c78db105SBrian Somers return; 7811ae349f5Scvs2svn break; 7821ae349f5Scvs2svn default: 7831ae349f5Scvs2svn LogPrintf(LogWARN, "%s: exit %d\n", name, WEXITSTATUS(stat)); 7841ae349f5Scvs2svn free(name); 785c78db105SBrian Somers *out = '\0'; 786c78db105SBrian Somers return; 7871ae349f5Scvs2svn break; 7881ae349f5Scvs2svn } 7891ae349f5Scvs2svn } else { 7901ae349f5Scvs2svn LogPrintf(LogWARN, "%s: Unexpected exit result\n", name); 7911ae349f5Scvs2svn free(name); 792c78db105SBrian Somers *out = '\0'; 793c78db105SBrian Somers return; 7941ae349f5Scvs2svn } 7951ae349f5Scvs2svn } 7961ae349f5Scvs2svn } 797