Revision 92cc1e74 proto/rip/rip.h

View differences:

proto/rip/rip.h
38 38

  
39 39
#define RIP_DEFAULT_ECMP_LIMIT	16
40 40
#define RIP_DEFAULT_INFINITY	16
41
#define RIP_DEFAULT_UPDATE_TIME	30
42
#define RIP_DEFAULT_TIMEOUT_TIME 180
43
#define RIP_DEFAULT_GARBAGE_TIME 120
41
#define RIP_DEFAULT_UPDATE_TIME	  (30 S_)
42
#define RIP_DEFAULT_TIMEOUT_TIME (180 S_)
43
#define RIP_DEFAULT_GARBAGE_TIME (120 S_)
44 44

  
45 45

  
46 46
struct rip_config
......
52 52
  u8 ecmp;				/* Maximum number of nexthops in ECMP route, or 0 */
53 53
  u8 infinity;				/* Maximum metric value, representing infinity */
54 54

  
55
  u32 min_timeout_time;			/* Minimum of interface timeout_time */
56
  u32 max_garbage_time;			/* Maximum of interface garbage_time */
55
  btime min_timeout_time;		/* Minimum of interface timeout_time */
56
  btime max_garbage_time;		/* Maximum of interface garbage_time */
57 57
};
58 58

  
59 59
struct rip_iface_config
......
78 78
  u16 tx_length;			/* TX packet length limit (including headers), 0 for MTU */
79 79
  int tx_tos;
80 80
  int tx_priority;
81
  u32 update_time;			/* Periodic update interval */
82
  u32 timeout_time;			/* Route expiration timeout */
83
  u32 garbage_time;			/* Unreachable entry GC timeout */
81
  btime update_time;			/* Periodic update interval */
82
  btime timeout_time;			/* Route expiration timeout */
83
  btime garbage_time;			/* Unreachable entry GC timeout */
84 84
  list *passwords;			/* Passwords for authentication */
85 85
};
86 86

  
......
120 120
  list neigh_list;			/* List of iface neighbors (struct rip_neighbor) */
121 121

  
122 122
  /* Update scheduling */
123
  bird_clock_t next_regular;		/* Next time when regular update should be called */
124
  bird_clock_t next_triggered;		/* Next time when triggerd update may be called */
125
  bird_clock_t want_triggered;		/* Nonzero if triggered update is scheduled */
123
  btime next_regular;			/* Next time when regular update should be called */
124
  btime next_triggered;			/* Next time when triggerd update may be called */
125
  btime want_triggered;			/* Nonzero if triggered update is scheduled */
126 126

  
127 127
  /* Active update */
128 128
  int tx_active;			/* Update session is active */
129 129
  ip_addr tx_addr;			/* Update session destination address */
130
  bird_clock_t tx_changed;		/* Minimal changed time for triggered update */
130
  btime tx_changed;			/* Minimal changed time for triggered update */
131 131
  struct fib_iterator tx_fit;		/* FIB iterator in RIP routing table (p.rtable) */
132 132
};
133 133

  
......
137 137
  struct rip_iface *ifa;		/* Associated interface, may be NULL if stale */
138 138
  struct neighbor *nbr;			/* Associaded core neighbor, may be NULL if stale */
139 139
  struct bfd_request *bfd_req;		/* BFD request, if BFD is used */
140
  bird_clock_t last_seen;		/* Time of last received and accepted message */
140
  btime last_seen;			/* Time of last received and accepted message */
141 141
  u32 uc;				/* Use count, number of routes linking the neighbor */
142 142
  u32 csn;				/* Last received crypto sequence number */
143 143
};
......
153 153
  struct iface *iface;			/* Outgoing route iface (for next hop) */
154 154
  ip_addr next_hop;			/* Outgoing route next hop */
155 155

  
156
  bird_clock_t changed;			/* Last time when the outgoing route metric changed */
156
  btime changed;			/* Last time when the outgoing route metric changed */
157 157

  
158 158
  struct fib_node n;
159 159
};
......
167 167
  u16 metric;				/* Route metric (after increase) */
168 168
  u16 tag;				/* Route tag */
169 169

  
170
  bird_clock_t expires;			/* Time of route expiration */
170
  btime expires;			/* Time of route expiration */
171 171
};
172 172

  
173 173

  
......
211 211

  
212 212
/* packets.c */
213 213
void rip_send_request(struct rip_proto *p, struct rip_iface *ifa);
214
void rip_send_table(struct rip_proto *p, struct rip_iface *ifa, ip_addr addr, bird_clock_t changed);
214
void rip_send_table(struct rip_proto *p, struct rip_iface *ifa, ip_addr addr, btime changed);
215 215
int rip_open_socket(struct rip_iface *ifa);
216 216

  
217 217

  

Also available in: Unified diff