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

unused: sessiont.{ns,nr}

Browse source
This commit is contained in:
Brendan O'Dea 2005-12-05 14:10:42 +00:00
parent b78e45723b
commit b3eeda4574
5 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,8 +1,9 @@
* Sun Dec 4 2005 Brendan O'Dea <bod@optus.net> 2.1.13 * Tue Dec 6 2005 Brendan O'Dea <bod@optus.net> 2.1.13
- Add test/ping-sweep. - Add test/ping-sweep.
- Apply spec changes from Charlie Brady: use License header, change - Apply spec changes from Charlie Brady: use License header, change
BuildRoot to include username. BuildRoot to include username.
- Fix IPCP negotiation of secondary DNS server, reported by Jon Morby. - Fix IPCP negotiation of secondary DNS server, reported by Jon Morby.
- Clean up sessiont, removing some unused fields.
* Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12 * Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12
- Set MTU on tunnel interface so the kernel will re-fragment large - Set MTU on tunnel interface so the kernel will re-fragment large

4
cli.c
View file

@ -2,7 +2,7 @@
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_name = "$Name: $"; char const *cvs_name = "$Name: $";
char const *cvs_id_cli = "$Id: cli.c,v 1.68 2005-11-14 20:19:08 bodea Exp $"; char const *cvs_id_cli = "$Id: cli.c,v 1.69 2005-12-05 14:10:42 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
@ -426,8 +426,6 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
cli_print(cli, "\tUnique SID:\t%u", session[s].unique_id); cli_print(cli, "\tUnique SID:\t%u", session[s].unique_id);
cli_print(cli, "\tOpened:\t\t%u seconds", session[s].opened ? abs(time_now - session[s].opened) : 0); cli_print(cli, "\tOpened:\t\t%u seconds", session[s].opened ? abs(time_now - session[s].opened) : 0);
cli_print(cli, "\tIdle time:\t%u seconds", session[s].last_packet ? abs(time_now - session[s].last_packet) : 0); cli_print(cli, "\tIdle time:\t%u seconds", session[s].last_packet ? abs(time_now - session[s].last_packet) : 0);
cli_print(cli, "\tNext Recv:\t%u", session[s].nr);
cli_print(cli, "\tNext Send:\t%u", session[s].ns);
cli_print(cli, "\tBytes In/Out:\t%u/%u", session[s].cout, session[s].cin); cli_print(cli, "\tBytes In/Out:\t%u/%u", session[s].cout, session[s].cin);
cli_print(cli, "\tPkts In/Out:\t%u/%u", session[s].pout, session[s].pin); cli_print(cli, "\tPkts In/Out:\t%u/%u", session[s].pout, session[s].pin);
cli_print(cli, "\tMRU:\t\t%d", session[s].mru); cli_print(cli, "\tMRU:\t\t%d", session[s].mru);

4
cluster.c
View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.48 2005-12-05 12:47:12 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.49 2005-12-05 14:10:42 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1272,8 +1272,6 @@ static uint8_t *convert_session(struct oldsession *old)
new.ip = old->ip; new.ip = old->ip;
new.ip_pool_index = old->ip_pool_index; new.ip_pool_index = old->ip_pool_index;
new.unique_id = old->unique_id; new.unique_id = old->unique_id;
new.nr = old->nr;
new.ns = old->ns;
new.magic = old->magic; new.magic = old->magic;
new.pin = old->pin; new.pin = old->pin;
new.pout = old->pout; new.pout = old->pout;

9
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.101 2005-12-05 13:56:12 bodea Exp $ // $Id: l2tpns.h,v 1.102 2005-12-05 14:10:42 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -236,12 +236,11 @@ typedef struct
uint8_t ipv6cp:4; // IPV6CP state uint8_t ipv6cp:4; // IPV6CP state
uint8_t ccp:4; // CCP state uint8_t ccp:4; // CCP state
} ppp; } ppp;
char pad[2]; // unused char reserved_1[2]; // unused: padding
in_addr_t ip; // IP of session set by RADIUS response (host byte order). in_addr_t ip; // IP of session set by RADIUS response (host byte order).
int ip_pool_index; // index to IP pool int ip_pool_index; // index to IP pool
uint32_t unique_id; // unique session id uint32_t unique_id; // unique session id
uint16_t nr; // next receive char reserved_2[4]; // unused: was ns/nr
uint16_t ns; // next send
uint32_t magic; // ppp magic number uint32_t magic; // ppp magic number
uint32_t pin, pout; // packet counts uint32_t pin, pout; // packet counts
uint32_t cin, cout; // byte counts uint32_t cin, cout; // byte counts
@ -271,7 +270,7 @@ typedef struct
uint8_t walled_garden; // is this session gardened? uint8_t walled_garden; // is this session gardened?
uint8_t ipv6prefixlen; // IPv6 route prefix length uint8_t ipv6prefixlen; // IPv6 route prefix length
struct in6_addr ipv6route; // Static IPv6 route struct in6_addr ipv6route; // Static IPv6 route
char reserved[11]; // Space to expand structure without changing HB_VERSION char reserved_3[11]; // Space to expand structure without changing HB_VERSION
} }
sessiont; sessiont;

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
* Sun Dec 4 2005 Brendan O'Dea <bod@optus.net> 2.1.13-1 * Tue Dec 6 2005 Brendan O'Dea <bod@optus.net> 2.1.13-1
- 2.1.13 release, see /usr/share/doc/l2tpns-2.1.13/Changes - 2.1.13 release, see /usr/share/doc/l2tpns-2.1.13/Changes