diff options
author | brian <brian@FreeBSD.org> | 1999-12-03 06:33:10 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1999-12-03 06:33:10 +0000 |
commit | 0646335b2f5f7598da20e77bef0307600e5090c2 (patch) | |
tree | e7ed7b5062bdcdb2fd9076a534d57580850d607e /usr.sbin/ppp/datalink.c | |
parent | 07cba0f9111a977a86c5f79554b6891a7e4f06a4 (diff) | |
download | FreeBSD-src-0646335b2f5f7598da20e77bef0307600e5090c2.zip FreeBSD-src-0646335b2f5f7598da20e77bef0307600e5090c2.tar.gz |
Be careful not to re-initialise `struct stat' while it still has
a running timer. This fixes a problem where a dial is manually
aborted, the hangup script kicks in and the chat timer ends up
on the timer queue twice (tick tick tick tick *boom*)
Diffstat (limited to 'usr.sbin/ppp/datalink.c')
-rw-r--r-- | usr.sbin/ppp/datalink.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c index a050e25..b5e20f9 100644 --- a/usr.sbin/ppp/datalink.c +++ b/usr.sbin/ppp/datalink.c @@ -120,7 +120,7 @@ datalink_HangupDone(struct datalink *dl) return; } - chat_Destroy(&dl->chat); + chat_Finish(&dl->chat); physical_Close(dl->physical); dl->phone.chosen = "N/A"; @@ -203,7 +203,7 @@ datalink_ChoosePhoneNumber(struct datalink *dl) static void datalink_LoginDone(struct datalink *dl) { - chat_Destroy(&dl->chat); + chat_Finish(&dl->chat); if (!dl->script.packetmode) { dl->dial.tries = -1; @@ -214,7 +214,7 @@ datalink_LoginDone(struct datalink *dl) log_Printf(LogWARN, "datalink_LoginDone: Not connected.\n"); if (dl->script.run) { datalink_NewState(dl, DATALINK_LOGOUT); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.logout, NULL); + chat_Setup(&dl->chat, dl->cfg.script.logout, NULL); } else { physical_StopDeviceTimer(dl->physical); if (dl->physical->type == PHYS_DEDICATED) @@ -273,9 +273,8 @@ datalink_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, dl->physical->name.full); if (dl->script.run) { datalink_NewState(dl, DATALINK_DIAL); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.dial, - *dl->cfg.script.dial ? - datalink_ChoosePhoneNumber(dl) : ""); + chat_Setup(&dl->chat, dl->cfg.script.dial, *dl->cfg.script.dial ? + datalink_ChoosePhoneNumber(dl) : ""); if (!(dl->physical->type & (PHYS_DDIAL|PHYS_DEDICATED)) && dl->cfg.dial.max) log_Printf(LogCHAT, "%s: Dial attempt %u of %d\n", @@ -323,7 +322,7 @@ datalink_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, case CARRIER_OK: if (dl->script.run) { datalink_NewState(dl, DATALINK_LOGIN); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.login, NULL); + chat_Setup(&dl->chat, dl->cfg.script.login, NULL); } else datalink_LoginDone(dl); return datalink_UpdateSet(d, r, w, e, n); @@ -332,7 +331,7 @@ datalink_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, physical_Offline(dl->physical); /* Is this required ? */ if (dl->script.run) { datalink_NewState(dl, DATALINK_HANGUP); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.hangup, NULL); + chat_Setup(&dl->chat, dl->cfg.script.hangup, NULL); return datalink_UpdateSet(d, r, w, e, n); } else { datalink_HangupDone(dl); @@ -358,7 +357,7 @@ datalink_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, case DATALINK_LOGOUT: datalink_NewState(dl, DATALINK_HANGUP); physical_Offline(dl->physical); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.hangup, NULL); + chat_Setup(&dl->chat, dl->cfg.script.hangup, NULL); return datalink_UpdateSet(d, r, w, e, n); case DATALINK_LOGIN: dl->phone.alt = NULL; @@ -378,7 +377,7 @@ datalink_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, case DATALINK_LOGIN: datalink_NewState(dl, DATALINK_HANGUP); physical_Offline(dl->physical); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.hangup, NULL); + chat_Setup(&dl->chat, dl->cfg.script.hangup, NULL); return datalink_UpdateSet(d, r, w, e, n); } break; @@ -512,10 +511,10 @@ datalink_ComeDown(struct datalink *dl, int how) if (dl->script.run && dl->state != DATALINK_OPENING) { if (dl->state == DATALINK_LOGOUT) { datalink_NewState(dl, DATALINK_HANGUP); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.hangup, NULL); + chat_Setup(&dl->chat, dl->cfg.script.hangup, NULL); } else { datalink_NewState(dl, DATALINK_LOGOUT); - chat_Init(&dl->chat, dl->physical, dl->cfg.script.logout, NULL); + chat_Setup(&dl->chat, dl->cfg.script.logout, NULL); } } else datalink_HangupDone(dl); @@ -825,7 +824,7 @@ datalink_Create(const char *name, struct bundle *bundle, int type) cbcp_Init(&dl->cbcp, dl->physical); memset(&dl->chat, '\0', sizeof dl->chat); /* Force buf{start,end} reset */ - chat_Init(&dl->chat, dl->physical, NULL, NULL); + chat_Init(&dl->chat, dl->physical); log_Printf(LogPHASE, "%s: Created in %s state\n", dl->name, datalink_State(dl)); @@ -889,7 +888,7 @@ datalink_Clone(struct datalink *odl, const char *name) cbcp_Init(&dl->cbcp, dl->physical); memset(&dl->chat, '\0', sizeof dl->chat); /* Force buf{start,end} reset */ - chat_Init(&dl->chat, dl->physical, NULL, NULL); + chat_Init(&dl->chat, dl->physical); log_Printf(LogPHASE, "%s: Cloned in %s state\n", dl->name, datalink_State(dl)); @@ -909,11 +908,12 @@ datalink_Destroy(struct datalink *dl) case DATALINK_HANGUP: case DATALINK_DIAL: case DATALINK_LOGIN: - chat_Destroy(&dl->chat); /* Gotta blat the timers ! */ + chat_Finish(&dl->chat); /* Gotta blat the timers ! */ break; } } + chat_Destroy(&dl->chat); timer_Stop(&dl->dial.timer); result = dl->next; physical_Destroy(dl->physical); @@ -1327,7 +1327,7 @@ iov2datalink(struct bundle *bundle, struct iovec *iov, int *niov, int maxiov, cbcp_Init(&dl->cbcp, dl->physical); memset(&dl->chat, '\0', sizeof dl->chat); /* Force buf{start,end} reset */ - chat_Init(&dl->chat, dl->physical, NULL, NULL); + chat_Init(&dl->chat, dl->physical); log_Printf(LogPHASE, "%s: Transferred in %s state\n", dl->name, datalink_State(dl)); |