- int want_ping; /* 0 if there's no need to check for activity */
- struct conn_list_t *nexthop; /* nearest meta-hop in this direction */
+ int want_ping; /* 0 if there's no need to check for activity. Shouldn't this go into status? (GS) */
+
+ char *mychallenge; /* challenge we received from him */
+ char *hischallenge; /* challenge we sent to him */
+
+ struct conn_list_t *nexthop; /* nearest meta-hop in this direction, will be changed to myuplink (GS) */
+ struct conn_list_t *hisuplink; /* his nearest meta-hop in our direction */
+ struct conn_list_t *myuplink; /* our nearest meta-hop in his direction */
+
+ struct subnet_t *subnets; /* Pointer to a list of subnets belonging to this connection */
+