d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some constifications

Browse Source
This commit is contained in:
phk 2009-04-05 16:01:56 +00:00
parent 0aa4473504
commit d7fb1c4ef8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/routed/defs.h
View File

@ -450,7 +450,7 @@ extern naddr myaddr; /* main address of this system */
extern int stopint; /* !=0 to stop */
extern int rip_sock; /* RIP socket */
extern struct interface *rip_sock_mcast; /* current multicast interface */
extern const struct interface *rip_sock_mcast; /* current multicast interface */
extern int rt_sock; /* routing socket */
extern int rt_sock_seqno;
extern int rdisc_sock; /* router-discovery raw socket */

2
sbin/routed/main.c
View File

@ -88,7 +88,7 @@ static struct timeval flush_kern_timer;
static fd_set fdbits;
static int sock_max;
int rip_sock = -1; /* RIP socket */
struct interface *rip_sock_mcast; /* current multicast interface */
const struct interface *rip_sock_mcast; /* current multicast interface */
int rt_sock; /* routing socket */
int rt_sock_seqno;

8
sbin/routed/rdisc.c
View File

@ -73,21 +73,23 @@ union ad_u {
int rdisc_sock = -1; /* router-discovery raw socket */
static struct interface *rdisc_sock_mcast; /* current multicast interface */
static const struct interface *rdisc_sock_mcast; /* current multicast interface */
struct timeval rdisc_timer;
int rdisc_ok; /* using solicited route */
#define MAX_ADS 16 /* at least one per interface */
static struct dr { /* accumulated advertisements */
struct dr { /* accumulated advertisements */
struct interface *dr_ifp;
naddr dr_gate; /* gateway */
time_t dr_ts; /* when received */
time_t dr_life; /* lifetime in host byte order */
n_long dr_recv_pref; /* received but biased preference */
n_long dr_pref; /* preference adjusted by metric */
} *cur_drp, drs[MAX_ADS];
};
static const struct dr *cur_drp;
static struct dr drs[MAX_ADS];
/* convert between signed, balanced around zero,
* and unsigned zero-based preferences */