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

set source address for DAE responses

Browse source
This commit is contained in:
bodea 2006-04-05 02:13:48 +00:00
parent 6228957415
commit 42bf2e312d
6 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Changes
View file

@ -1,6 +1,8 @@
* Fri Mar 31 2006 Brendan O'Dea <bod@optus.net> 2.1.17 * Wed Apr 5 2006 Brendan O'Dea <bod@optus.net> 2.1.17
- Fix IPCP length test to allow Terminate-Request (4 bytes). - Fix IPCP length test to allow Terminate-Request (4 bytes).
- Send nsctl responses back using the correct source address (thanks ltd). - Send nsctl responses back using the correct source address (thanks ltd).
- Similarly set the source for DAE responses; use bind_address when
handling forwarded packets on the master.
* Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16 * Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16
- Send configured magic-no in LCP EchoReq when LCP is opened. - Send configured magic-no in LCP EchoReq when LCP is opened.

8
cluster.c
View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.49 2005/12/05 14:10:42 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.50 2006/04/05 02:13:48 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1655,7 +1655,11 @@ int processcluster(uint8_t *data, int size, in_addr_t addr)
STAT(recv_forward); STAT(recv_forward);
if (type == C_FORWARD_DAE) if (type == C_FORWARD_DAE)
processdae(p, s, &a, sizeof(a)); {
struct in_addr local;
local.s_addr = config->bind_address ? config->bind_address : my_address;
processdae(p, s, &a, sizeof(a), &local);
}
else else
processudp(p, s, &a); processudp(p, s, &a);

7
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.158 2006/04/05 01:50:33 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.159 2006/04/05 02:13:48 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -647,6 +647,7 @@ static void initudp(void)
addr.sin_port = htons(config->radius_dae_port); addr.sin_port = htons(config->radius_dae_port);
daefd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); daefd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
setsockopt(daefd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); setsockopt(daefd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
setsockopt(daefd, SOL_IP, IP_PKTINFO, &on, sizeof(on)); // recvfromto
if (bind(daefd, (void *) &addr, sizeof(addr)) < 0) if (bind(daefd, (void *) &addr, sizeof(addr)) < 0)
{ {
LOG(0, 0, 0, "Error in DAE bind: %s\n", strerror(errno)); LOG(0, 0, 0, "Error in DAE bind: %s\n", strerror(errno));
@ -3300,8 +3301,8 @@ static void mainloop(void)
case FD_TYPE_DAE: // DAE requests case FD_TYPE_DAE: // DAE requests
alen = sizeof(addr); alen = sizeof(addr);
s = recvfrom(daefd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen); s = recvfromto(daefd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
if (s > 0) processdae(buf, s, &addr, alen); if (s > 0) processdae(buf, s, &addr, alen, &local);
n--; n--;
break; break;

4
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.110 2006/03/27 03:01:08 bodea Exp $ // $Id: l2tpns.h,v 1.111 2006/04/05 02:13:48 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -703,7 +703,7 @@ void processrad(uint8_t *buf, int len, char socket_index);
void radiusretry(uint16_t r); void radiusretry(uint16_t r);
uint16_t radiusnew(sessionidt s); uint16_t radiusnew(sessionidt s);
void radiusclear(uint16_t r, sessionidt s); void radiusclear(uint16_t r, sessionidt s);
void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen); void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local);
// l2tpns.c // l2tpns.c

2
l2tpns.spec
View file

@ -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
* Fri Mar 31 2006 Brendan O'Dea <bod@optus.net> 2.1.17-1 * Wed Apr 5 2006 Brendan O'Dea <bod@optus.net> 2.1.17-1
- 2.1.17 release, see /usr/share/doc/l2tpns-2.1.17/Changes - 2.1.17 release, see /usr/share/doc/l2tpns-2.1.17/Changes

6
radius.c
View file

@ -1,6 +1,6 @@
// L2TPNS Radius Stuff // L2TPNS Radius Stuff
char const *cvs_id_radius = "$Id: radius.c,v 1.47 2005/12/19 06:18:13 bodea Exp $"; char const *cvs_id_radius = "$Id: radius.c,v 1.48 2006/04/05 02:13:48 bodea Exp $";
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
@ -785,7 +785,7 @@ void radiusretry(uint16_t r)
extern int daefd; extern int daefd;
void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen) void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local)
{ {
int i, r_code, r_id, length, attribute_length; int i, r_code, r_id, length, attribute_length;
uint8_t *packet, attribute; uint8_t *packet, attribute;
@ -1063,6 +1063,6 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id); LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id);
// send DAE response // send DAE response
if (sendto(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen) < 0) if (sendtofrom(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen, local) < 0)
LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno)); LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno));
} }