mirror of
https://github.com/accel-ppp/accel-ppp.git
synced 2025-12-20 01:21:49 +08:00
added cpack interface to generate deb packages
This commit is contained in:
@@ -1,8 +1,13 @@
|
||||
PROJECT (accel-pptpd C)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
ADD_SUBDIRECTORY(accel-pptpd)
|
||||
include(cmake/cpack.cmake)
|
||||
|
||||
if (NOT BUILD_DRIVER_ONLY)
|
||||
ADD_SUBDIRECTORY(accel-pptpd)
|
||||
endif (NOT BUILD_DRIVER_ONLY)
|
||||
|
||||
if (BUILD_DRIVER OR BUILD_DRIVER_ONLY)
|
||||
ADD_SUBDIRECTORY(driver)
|
||||
endif (BUILD_DRIVER OR BUILD_DRIVER_ONLY)
|
||||
|
||||
if (BUILD_DRIVER)
|
||||
ADD_SUBDIRECTORY(driver)
|
||||
endif (BUILD_DRIVER)
|
||||
|
||||
340
COPYING
Normal file
340
COPYING
Normal file
@@ -0,0 +1,340 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
@@ -11,7 +11,7 @@ IF (NOT HAVE_SSL)
|
||||
MESSAGE(FATAL_ERROR "openssl headers not found")
|
||||
ENDIF (NOT HAVE_SSL)
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fvisibility=hidden -D_GNU_SOURCE -DGCC_SPINLOCK -DMEMDEBUG")
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fvisibility=hidden -D_GNU_SOURCE -DGCC_SPINLOCK -DMEMDEBUG -fPIC")
|
||||
|
||||
INCLUDE_DIRECTORIES(include)
|
||||
|
||||
@@ -59,7 +59,7 @@ INSTALL(TARGETS accel-pptpd
|
||||
RUNTIME DESTINATION usr/sbin
|
||||
)
|
||||
|
||||
INSTALL(FILES accel-pptp.conf DESTINATION /etc)
|
||||
INSTALL(FILES accel-pptp.conf DESTINATION etc)
|
||||
INSTALL(FILES accel-pptp.conf.5 DESTINATION usr/share/man/man5)
|
||||
|
||||
INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-pptp)")
|
||||
|
||||
@@ -6,8 +6,12 @@ ADD_LIBRARY(l2tp SHARED
|
||||
l2tp.c
|
||||
dict.c
|
||||
packet.c
|
||||
netlink.c
|
||||
# netlink.c
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(l2tp nl-genl)
|
||||
#TARGET_LINK_LIBRARIES(l2tp nl nl-genl)
|
||||
|
||||
INSTALL(TARGETS l2tp LIBRARY DESTINATION usr/lib/accel-pptp)
|
||||
|
||||
FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
|
||||
INSTALL(FILES ${dict} DESTINATION usr/share/accel-pptp/l2tp)
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/socket.h>
|
||||
#include <linux/socket.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_pppox.h>
|
||||
@@ -27,6 +28,10 @@
|
||||
#include "l2tp.h"
|
||||
#include "attr_defs.h"
|
||||
|
||||
#ifndef SOL_PPPOL2TP
|
||||
#define SOL_PPPOL2TP 273
|
||||
#endif
|
||||
|
||||
#define STATE_WAIT_SCCCN 1
|
||||
#define STATE_WAIT_ICRQ 2
|
||||
#define STATE_WAIT_ICCN 3
|
||||
@@ -59,6 +64,8 @@ struct l2tp_conn_t
|
||||
struct triton_timer_t rtimeout_timer;
|
||||
struct triton_timer_t hello_timer;
|
||||
|
||||
int tunnel_fd;
|
||||
|
||||
struct sockaddr_in addr;
|
||||
uint16_t tid;
|
||||
uint16_t sid;
|
||||
@@ -95,9 +102,6 @@ static void l2tp_disconnect(struct l2tp_conn_t *conn)
|
||||
{
|
||||
struct l2tp_packet_t *pack;
|
||||
|
||||
if (conn->tid)
|
||||
l2tp_nl_delete_tunnel(conn->tid);
|
||||
|
||||
triton_md_unregister_handler(&conn->hnd);
|
||||
close(conn->hnd.fd);
|
||||
|
||||
@@ -119,6 +123,12 @@ static void l2tp_disconnect(struct l2tp_conn_t *conn)
|
||||
l2tp_conn[conn->tid] = NULL;
|
||||
pthread_mutex_unlock(&l2tp_lock);
|
||||
|
||||
if (conn->ppp.fd != -1)
|
||||
close(conn->ppp.fd);
|
||||
|
||||
if (conn->tunnel_fd != -1)
|
||||
close(conn->tunnel_fd);
|
||||
|
||||
triton_event_fire(EV_CTRL_FINISHED, &conn->ppp);
|
||||
|
||||
if (conf_verbose)
|
||||
@@ -298,6 +308,8 @@ static int l2tp_tunnel_alloc(struct l2tp_serv_t *serv, struct l2tp_packet_t *pac
|
||||
|
||||
ppp_init(&conn->ppp);
|
||||
conn->ppp.ctrl = &conn->ctrl;
|
||||
conn->ppp.fd = -1;
|
||||
conn->tunnel_fd = -1;
|
||||
|
||||
triton_context_register(&conn->ctx, &conn->ppp);
|
||||
triton_md_register_handler(&conn->ctx, &conn->hnd);
|
||||
@@ -323,46 +335,54 @@ out_err:
|
||||
static int l2tp_connect(struct l2tp_conn_t *conn)
|
||||
{
|
||||
struct sockaddr_pppol2tp pppox_addr;
|
||||
|
||||
int arg = 1;
|
||||
|
||||
memset(&pppox_addr, 0, sizeof(pppox_addr));
|
||||
pppox_addr.sa_family = AF_PPPOX;
|
||||
pppox_addr.sa_protocol = PX_PROTO_OL2TP;
|
||||
pppox_addr.pppol2tp.fd = conn->hnd.fd;
|
||||
memcpy(&pppox_addr.pppol2tp.addr, &conn->addr, sizeof(conn->addr));
|
||||
pppox_addr.pppol2tp.s_tunnel = conn->tid;
|
||||
pppox_addr.pppol2tp.s_session = conn->sid;
|
||||
pppox_addr.pppol2tp.d_tunnel = conn->peer_tid;
|
||||
pppox_addr.pppol2tp.d_session = conn->peer_sid;
|
||||
|
||||
l2tp_nl_delete_tunnel(conn->tid);
|
||||
l2tp_nl_create_tunnel(conn->hnd.fd, conn->tid, conn->peer_tid);
|
||||
l2tp_nl_create_session(conn->tid, conn->sid, conn->peer_sid);
|
||||
|
||||
conn->ppp.fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
|
||||
conn->tunnel_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
|
||||
if (!conn->ppp.fd) {
|
||||
log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (connect(conn->ppp.fd, (struct sockaddr *)&pppox_addr, sizeof(pppox_addr))) {
|
||||
log_ppp_error("l2tp: connect: %s\n", strerror(errno));
|
||||
close(conn->ppp.fd);
|
||||
conn->ppp.fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
|
||||
if (!conn->ppp.fd) {
|
||||
close(conn->tunnel_fd);
|
||||
conn->tunnel_fd = -1;
|
||||
log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*if (setsockopt(conn->ppp.fd, SOL_SOCKET, PPPOL2TP_SO_LNSMODE, &conn->ppp.fd, sizeof(conn->ppp.fd))) {
|
||||
log_ppp_error("l2tp: setsockopt: %s\n", strerror(errno));
|
||||
close(conn->ppp.fd);
|
||||
if (connect(conn->tunnel_fd, (struct sockaddr *)&pppox_addr, sizeof(pppox_addr)) < 0) {
|
||||
log_ppp_error("l2tp: connect(tunnel): %s\n", strerror(errno));
|
||||
return -1;
|
||||
}*/
|
||||
}
|
||||
|
||||
pppox_addr.pppol2tp.s_session = conn->sid;
|
||||
pppox_addr.pppol2tp.d_session = conn->peer_sid;
|
||||
|
||||
if (connect(conn->ppp.fd, (struct sockaddr *)&pppox_addr, sizeof(pppox_addr)) < 0) {
|
||||
log_ppp_error("l2tp: connect(session): %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (setsockopt(conn->ppp.fd, SOL_PPPOL2TP, PPPOL2TP_SO_LNSMODE, &arg, sizeof(arg))) {
|
||||
log_ppp_error("l2tp: setsockopt: %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
conn->ppp.chan_name = _strdup(inet_ntoa(conn->addr.sin_addr));
|
||||
|
||||
triton_event_fire(EV_CTRL_STARTED, &conn->ppp);
|
||||
|
||||
if (establish_ppp(&conn->ppp)) {
|
||||
close(conn->ppp.fd);
|
||||
if (establish_ppp(&conn->ppp))
|
||||
return -1;
|
||||
}
|
||||
|
||||
conn->state = STATE_PPP;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ INSTALL(TARGETS pppd_compat ippool sigchld
|
||||
|
||||
IF (SHAPER)
|
||||
ADD_LIBRARY(shaper_tbf SHARED shaper_tbf.c)
|
||||
TARGET_LINK_LIBRARIES(shaper_tbf nl-route)
|
||||
TARGET_LINK_LIBRARIES(shaper_tbf nl nl-route m)
|
||||
INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION usr/lib/accel-pptp)
|
||||
ENDIF (SHAPER)
|
||||
|
||||
|
||||
@@ -177,6 +177,7 @@ static void destablish_ppp(struct ppp_t *ppp)
|
||||
|
||||
ppp->unit_fd = -1;
|
||||
ppp->chan_fd = -1;
|
||||
ppp->fd = -1;
|
||||
|
||||
_free(ppp->unit_buf);
|
||||
_free(ppp->chan_buf);
|
||||
|
||||
26
cmake/cpack.cmake
Normal file
26
cmake/cpack.cmake
Normal file
@@ -0,0 +1,26 @@
|
||||
INCLUDE(InstallRequiredSystemLibraries)
|
||||
|
||||
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
|
||||
SET(CPACK_PACKAGE_VERSION_MINOR "1")
|
||||
SET(CPACK_PACKAGE_VERSION_PATCH "2")
|
||||
|
||||
SET(CPACK_PACKAGE_NAME "accel-pptp")
|
||||
#SET(CPACK_PACKAGE_VERSION "1.1.2")
|
||||
SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High-performance multi-protocol tunneling server for Linux")
|
||||
|
||||
|
||||
|
||||
SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
|
||||
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
|
||||
#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
|
||||
#SET(CPACK_STRIP_FILES "usr/sbin/accel-pptpd")
|
||||
#SET(CPACK_PACKAGE_EXECUTABLES "usr/sbin/accel-ppptp")
|
||||
|
||||
IF(CMAKE_BUILD_TYPE STREQUAL Debian)
|
||||
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
|
||||
ENDIF(CMAKE_BUILD_TYPE STREQUAL Debian)
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
||||
3
cmake/debian-kmod/postinst
Executable file
3
cmake/debian-kmod/postinst
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
depmod
|
||||
5
cmake/debian.cmake
Normal file
5
cmake/debian.cmake
Normal file
@@ -0,0 +1,5 @@
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE $ARCH)
|
||||
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libc6 libssl)
|
||||
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst")
|
||||
|
||||
|
||||
17
cmake/debian/debian.cmake
Normal file
17
cmake/debian/debian.cmake
Normal file
@@ -0,0 +1,17 @@
|
||||
SET(CPACK_PACKAGING_INSTALL_PREFIX "/")
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH})
|
||||
|
||||
if (BUILD_DRIVER_ONLY)
|
||||
SET(CPACK_PACKAGE_NAME "accel-pptp-kmod")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-pptp kernel module")
|
||||
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst")
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra)
|
||||
#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
|
||||
else (BUILD_DRIVER_ONLY)
|
||||
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8)")
|
||||
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst")
|
||||
|
||||
INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-init DESTINATION etc/init.d RENAME accel-pptp)
|
||||
INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-default DESTINATION etc/default RENAME accel-pptp)
|
||||
endif (BUILD_DRIVER_ONLY)
|
||||
|
||||
11
cmake/debian/postinst
Executable file
11
cmake/debian/postinst
Executable file
@@ -0,0 +1,11 @@
|
||||
#!/bin/sh
|
||||
|
||||
chmod +x /etc/init.d/accel-pptp
|
||||
|
||||
mkdir /var/log/accel-pptp &> /dev/null
|
||||
|
||||
if [ -f /tmp/__accel-pptp.conf ]; then
|
||||
mv /tmp/__accel-pptp.conf /etc/accel-pptp.conf
|
||||
fi
|
||||
|
||||
exit 0
|
||||
7
cmake/debian/preinst
Executable file
7
cmake/debian/preinst
Executable file
@@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -f /etc/accel-pptp.conf ]; then
|
||||
mv /etc/accel-pptp.conf /tmp/__accel-pptp.conf
|
||||
fi
|
||||
|
||||
exit 0
|
||||
5
contrib/debian/accel-pptp-default
Normal file
5
contrib/debian/accel-pptp-default
Normal file
@@ -0,0 +1,5 @@
|
||||
# Config file for /etc/init.d/accel-pptp
|
||||
|
||||
# Any extra options you want to pass to aceel-pptpd
|
||||
# on start-up should be put here.
|
||||
ACCEL_PPTPD_OPTS="-c /etc/accel-pptp.conf"
|
||||
59
contrib/debian/accel-pptp-init
Executable file
59
contrib/debian/accel-pptp-init
Executable file
@@ -0,0 +1,59 @@
|
||||
#!/bin/sh
|
||||
# /etc/init.d/accel-pptpd: set up the accel-pptp server
|
||||
### BEGIN INIT INFO
|
||||
# Provides: accel-pptp
|
||||
# Required-Start: $networking
|
||||
# Required-Stop: $networking
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 1
|
||||
### END INIT INFO
|
||||
|
||||
set -e
|
||||
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
if test -f /etv/default/accel-pptp; then
|
||||
. /etc/default/accel-pptp
|
||||
fi
|
||||
|
||||
if [ -z $ACCEL_PPPTD_OPTS ]; then
|
||||
ACCEL_PPTPD_OPTS="-c /etc/accel-pptp.conf"
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Starting accel-pptp server" "accel-pptpd"
|
||||
if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pptpd -- -d -p /var/run/accel-pptpd.pid $ACCEL_PPTPD_OPTS; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
log_daemon_msg "Restarting accel-pptp server" "accel-pptpd"
|
||||
start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pptpd.pid
|
||||
if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pptpd -- -d -p /var/run/accel-pptpd.pid $ACCEL_PPTPD_OPTS; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
;;
|
||||
|
||||
stop)
|
||||
log_daemon_msg "Stopping accel-pptp server" "accel-pptpd"
|
||||
start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pptpd.pid
|
||||
log_end_msg 0
|
||||
;;
|
||||
|
||||
status)
|
||||
do_status
|
||||
;;
|
||||
*)
|
||||
log_success_msg "Usage: /etc/init.d/accel-pptp {start|stop|status|restart}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
Reference in New Issue
Block a user