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

Disable sending HELLO message for Apple compatibility

Browse source
This commit is contained in:
fendo 2013-01-15 15:22:43 +01:00
parent b4f2e323ff
commit 9fb78ffe6a
4 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Docs/manual.html
View file

@ -387,6 +387,12 @@ not clustered (the tunnel can be coming from different source IP)
(default: no). (default: no).
</LI> </LI>
<LI><B>disable_sending_hello</B> (boolean)<BR>
Disable l2tp sending HELLO message for Apple compatibility.
Some OS X implementation of l2tp no manage the L2TP "HELLO message".
(default: no).
</LI>
</UL> </UL>
<P><U><B>LAC configuration</B></U></P> <P><U><B>LAC configuration</B></U></P>

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
l2tpns (2.2.1-2fdn3.4) unstable; urgency=low
* Add parameter to disable the send of the L2TP HELLO message (Apple compatibility).
-- Fernando Alves <fernando.alves@sameswireless.fr>, 15 Jan 2013 15:17:22 +0100
l2tpns (2.2.1-2fdn3.3) unstable; urgency=low l2tpns (2.2.1-2fdn3.3) unstable; urgency=low
* pppoe server functionality * pppoe server functionality

14
l2tpns.c
View file

@ -190,7 +190,8 @@ config_descriptt config_values[] = {
CONFIG("pppoe_if_to_bind", pppoe_if_to_bind, STRING), CONFIG("pppoe_if_to_bind", pppoe_if_to_bind, STRING),
CONFIG("pppoe_service_name", pppoe_service_name, STRING), CONFIG("pppoe_service_name", pppoe_service_name, STRING),
CONFIG("pppoe_ac_name", pppoe_ac_name, STRING), CONFIG("pppoe_ac_name", pppoe_ac_name, STRING),
{ NULL, 0, 0, 0 }, CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
{ NULL, 0, 0, 0 }
}; };
static char *plugin_functions[] = { static char *plugin_functions[] = {
@ -3502,10 +3503,13 @@ static void regular_cleanups(double period)
// Send hello // Send hello
if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60) if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60)
{ {
controlt *c = controlnew(6); // sending HELLO if (!config->disable_sending_hello)
controladd(c, 0, t); // send the message {
LOG(3, 0, t, "Sending HELLO message\n"); controlt *c = controlnew(6); // sending HELLO
t_actions++; controladd(c, 0, t); // send the message
LOG(3, 0, t, "Sending HELLO message\n");
t_actions++;
}
} }
// Check for tunnel changes requested from the CLI // Check for tunnel changes requested from the CLI

1
l2tpns.h
View file

@ -779,6 +779,7 @@ typedef struct
char pppoe_service_name[64]; // pppoe service name char pppoe_service_name[64]; // pppoe service name
char pppoe_ac_name[64]; char pppoe_ac_name[64];
uint8_t pppoe_hwaddr[ETH_ALEN]; // MAC addr of interface pppoe to bind uint8_t pppoe_hwaddr[ETH_ALEN]; // MAC addr of interface pppoe to bind
int disable_sending_hello; // Disable l2tp sending HELLO message for Apple compatibility.
} configt; } configt;
enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 }; enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };