welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only poll clifd if successfully bound

Browse source
This commit is contained in:
bodea 2006-04-23 23:18:30 +00:00
parent a66c20bf07
commit 5dacb3cdf5
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,3 +1,6 @@
* Mon Apr 24 2006 Brendan O'Dea <bod@optus.net> 2.1.19
- Only poll clifd if successfully bound.
* Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18 * Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18
- Don't shutdown on TerminateReq, wait for CDN. - Don't shutdown on TerminateReq, wait for CDN.
- Interpret "local" direction correctly (as LAC) in disconnect AVPs. - Interpret "local" direction correctly (as LAC) in disconnect AVPs.

11
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.161 2006/04/18 06:00:46 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.162 2006/04/23 23:18:31 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -3255,9 +3255,12 @@ static void mainloop(void)
e.events = EPOLLIN; e.events = EPOLLIN;
i = 0; i = 0;
d[i].type = FD_TYPE_CLI; if (clifd >= 0)
e.data.ptr = &d[i++]; {
epoll_ctl(epollfd, EPOLL_CTL_ADD, clifd, &e); d[i].type = FD_TYPE_CLI;
e.data.ptr = &d[i++];
epoll_ctl(epollfd, EPOLL_CTL_ADD, clifd, &e);
}
d[i].type = FD_TYPE_CLUSTER; d[i].type = FD_TYPE_CLUSTER;
e.data.ptr = &d[i++]; e.data.ptr = &d[i++];

4
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.113 2006/04/18 06:00:08 bodea Exp $ // $Id: l2tpns.h,v 1.114 2006/04/23 23:18:32 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -14,7 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <libcli.h> #include <libcli.h>
#define VERSION "2.1.18" #define VERSION "2.1.19"
// Limits // Limits
#define MAXTUNNEL 500 // could be up to 65535 #define MAXTUNNEL 500 // could be up to 65535

6
l2tpns.spec
View file

@ -1,6 +1,6 @@
Summary: A high-speed clustered L2TP LNS Summary: A high-speed clustered L2TP LNS
Name: l2tpns Name: l2tpns
Version: 2.1.18 Version: 2.1.19
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18-1 * Mon Apr 24 2006 Brendan O'Dea <bod@optus.net> 2.1.19-1
- 2.1.18 release, see /usr/share/doc/l2tpns-2.1.18/Changes - 2.1.19 release, see /usr/share/doc/l2tpns-2.1.19/Changes