o Do an mp_Down() when aborting ppp.
o Re-assign the link name when strdup()ing the datalink name. o Add the link name to some more hdlc log messages.
This commit is contained in:
parent
24989c68ac
commit
66f634b6df
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/cvs2svn/branches/MP/; revision=35956
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: bundle.c,v 1.1.2.80 1998/05/10 10:21:10 brian Exp $
|
||||
* $Id: bundle.c,v 1.1.2.81 1998/05/10 22:20:06 brian Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -704,6 +704,9 @@ bundle_Destroy(struct bundle *bundle)
|
||||
struct datalink *dl;
|
||||
struct descriptor *desc, *ndesc;
|
||||
|
||||
/* In case we're dropping out with an exception :-O */
|
||||
mp_Down(&bundle->ncp.mp);
|
||||
|
||||
if (bundle->phys_type & PHYS_DEMAND) {
|
||||
ipcp_CleanInterface(&bundle->ncp.ipcp);
|
||||
bundle_DownInterface(bundle);
|
||||
|
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: datalink.c,v 1.1.2.57 1998/05/08 01:15:05 brian Exp $
|
||||
* $Id: datalink.c,v 1.1.2.58 1998/05/09 13:52:12 brian Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -959,6 +959,7 @@ iov2datalink(struct bundle *bundle, struct iovec *iov, int *niov, int maxiov,
|
||||
free(oname);
|
||||
} else {
|
||||
dl->name = strdup(dl->name);
|
||||
dl->physical->link.name = dl->name;
|
||||
free(iov[*niov].iov_base);
|
||||
}
|
||||
(*niov)++;
|
||||
|
@ -17,7 +17,7 @@
|
||||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* $Id: hdlc.c,v 1.28.2.33 1998/05/04 03:00:07 brian Exp $
|
||||
* $Id: hdlc.c,v 1.28.2.34 1998/05/08 01:15:07 brian Exp $
|
||||
*
|
||||
* TODO:
|
||||
*/
|
||||
@ -467,11 +467,10 @@ hdlc_Input(struct bundle *bundle, struct mbuf * bp, struct physical *physical)
|
||||
fcs = hdlc_Fcs(INITFCS, MBUF_CTOP(bp), bp->cnt);
|
||||
physical->hdlc.lqm.SaveInOctets += bp->cnt + 1;
|
||||
|
||||
log_Printf(LogDEBUG, "hdlc_Input: fcs = %04x (%s)\n",
|
||||
fcs, (fcs == GOODFCS) ? "good" : "bad");
|
||||
log_Printf(LogDEBUG, "%s: hdlc_Input: fcs = %04x (%s)\n",
|
||||
physical->link.name, fcs, (fcs == GOODFCS) ? "good" : "BAD!");
|
||||
if (fcs != GOODFCS) {
|
||||
physical->hdlc.lqm.SaveInErrors++;
|
||||
log_Printf(LogDEBUG, "hdlc_Input: Bad FCS\n");
|
||||
physical->hdlc.stats.badfcs++;
|
||||
mbuf_Free(bp);
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user