| if_spppsubr.c (249925) | if_spppsubr.c (250131) |
|---|---|
| 1/* 2 * Synchronous PPP/Cisco/Frame Relay link level subroutines. 3 * Keepalive protocol implemented in both Cisco and PPP modes. 4 */ 5/*- 6 * Copyright (C) 1994-2000 Cronyx Engineering. 7 * Author: Serge Vakulenko, <vak@cronyx.ru> 8 * --- 4 unchanged lines hidden (view full) --- 13 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 14 * 15 * Authors grant any other persons or organisations permission to use 16 * or modify this software as long as this message is kept with the software, 17 * all derivative works or modified versions. 18 * 19 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 20 * | 1/* 2 * Synchronous PPP/Cisco/Frame Relay link level subroutines. 3 * Keepalive protocol implemented in both Cisco and PPP modes. 4 */ 5/*- 6 * Copyright (C) 1994-2000 Cronyx Engineering. 7 * Author: Serge Vakulenko, <vak@cronyx.ru> 8 * --- 4 unchanged lines hidden (view full) --- 13 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 14 * 15 * Authors grant any other persons or organisations permission to use 16 * or modify this software as long as this message is kept with the software, 17 * all derivative works or modified versions. 18 * 19 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 20 * |
| 21 * $FreeBSD: head/sys/net/if_spppsubr.c 249925 2013-04-26 12:50:32Z glebius $ | 21 * $FreeBSD: head/sys/net/if_spppsubr.c 250131 2013-05-01 04:37:34Z eadler $ |
| 22 */ 23 24#include <sys/param.h> 25 26#include "opt_inet.h" 27#include "opt_inet6.h" 28#include "opt_ipx.h" 29 --- 3561 unchanged lines hidden (view full) --- 3591 if (debug) { 3592 log(-1, " %s [%s]", 3593 ip6_sprintf(ip6buf, &desiredaddr), 3594 sppp_cp_type_name(type)); 3595 } 3596 continue; 3597 } 3598 | 22 */ 23 24#include <sys/param.h> 25 26#include "opt_inet.h" 27#include "opt_inet6.h" 28#include "opt_ipx.h" 29 --- 3561 unchanged lines hidden (view full) --- 3591 if (debug) { 3592 log(-1, " %s [%s]", 3593 ip6_sprintf(ip6buf, &desiredaddr), 3594 sppp_cp_type_name(type)); 3595 } 3596 continue; 3597 } 3598 |
| 3599 bzero(&suggestaddr, sizeof(&suggestaddr)); | 3599 bzero(&suggestaddr, sizeof(suggestaddr)); |
| 3600 if (collision && nohisaddr) { 3601 /* collision, hisaddr unknown - Conf-Rej */ 3602 type = CONF_REJ; 3603 bzero(&p[2], 8); 3604 } else { 3605 /* 3606 * - no collision, hisaddr unknown, or 3607 * - collision, hisaddr known --- 1839 unchanged lines hidden --- | 3600 if (collision && nohisaddr) { 3601 /* collision, hisaddr unknown - Conf-Rej */ 3602 type = CONF_REJ; 3603 bzero(&p[2], 8); 3604 } else { 3605 /* 3606 * - no collision, hisaddr unknown, or 3607 * - collision, hisaddr known --- 1839 unchanged lines hidden --- |