| bundle.c (59084) | bundle.c (60945) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/usr.sbin/ppp/bundle.c 59084 2000-04-07 23:46:14Z brian $ | 26 * $FreeBSD: head/usr.sbin/ppp/bundle.c 60945 2000-05-26 08:26:56Z brian $ |
| 27 */ 28 29#include <sys/param.h> 30#include <sys/socket.h> 31#include <netinet/in.h> 32#include <net/if.h> 33#include <net/if_tun.h> /* For TUNS* ioctls */ 34#include <arpa/inet.h> --- 1036 unchanged lines hidden (view full) --- 1071 */ 1072 struct datalink *dl; 1073 1074 for (dl = bundle->links; dl; dl = dl->next) 1075 if (name == NULL || !strcasecmp(dl->name, name)) { 1076 if ((mask & dl->physical->type) && 1077 (dl->state == DATALINK_CLOSED || 1078 (force && dl->state == DATALINK_OPENING && | 27 */ 28 29#include <sys/param.h> 30#include <sys/socket.h> 31#include <netinet/in.h> 32#include <net/if.h> 33#include <net/if_tun.h> /* For TUNS* ioctls */ 34#include <arpa/inet.h> --- 1036 unchanged lines hidden (view full) --- 1071 */ 1072 struct datalink *dl; 1073 1074 for (dl = bundle->links; dl; dl = dl->next) 1075 if (name == NULL || !strcasecmp(dl->name, name)) { 1076 if ((mask & dl->physical->type) && 1077 (dl->state == DATALINK_CLOSED || 1078 (force && dl->state == DATALINK_OPENING && |
| 1079 dl->dial.timer.state == TIMER_RUNNING))) { 1080 if (force) /* Ignore redial timeout ? */ 1081 timer_Stop(&dl->dial.timer); | 1079 dl->dial.timer.state == TIMER_RUNNING) || 1080 dl->state == DATALINK_READY)) { 1081 timer_Stop(&dl->dial.timer); /* We're finished with this */ |
| 1082 datalink_Up(dl, 1, 1); 1083 if (mask & PHYS_AUTO) | 1082 datalink_Up(dl, 1, 1); 1083 if (mask & PHYS_AUTO) |
| 1084 /* Only one AUTO link at a time */ 1085 break; | 1084 break; /* Only one AUTO link at a time */ |
| 1086 } 1087 if (name != NULL) 1088 break; 1089 } 1090} 1091 1092struct datalink * 1093bundle2datalink(struct bundle *bundle, const char *name) --- 917 unchanged lines hidden --- | 1085 } 1086 if (name != NULL) 1087 break; 1088 } 1089} 1090 1091struct datalink * 1092bundle2datalink(struct bundle *bundle, const char *name) --- 917 unchanged lines hidden --- |