ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.h
(Generate patch)

Comparing gvpe/src/conf.h (file contents):
Revision 1.29 by pcg, Sat Mar 26 03:16:24 2005 UTC vs.
Revision 1.30 by pcg, Mon Mar 28 20:39:18 2005 UTC

… …
38#define DEFAULT_DNS_TIMEOUT_FACTOR 8.F // initial retry timeout multiple 38#define DEFAULT_DNS_TIMEOUT_FACTOR 8.F // initial retry timeout multiple
39#define DEFAULT_DNS_SEND_INTERVAL .01F // minimum send interval 39#define DEFAULT_DNS_SEND_INTERVAL .01F // minimum send interval
40#define DEFAULT_DNS_OVERLAP_FACTOR .5F // RTT * LATENCY_FACTOR == sending rate 40#define DEFAULT_DNS_OVERLAP_FACTOR .5F // RTT * LATENCY_FACTOR == sending rate
41#define DEFAULT_DNS_MAX_OUTSTANDING 100 // max. number of outstanding requests 41#define DEFAULT_DNS_MAX_OUTSTANDING 100 // max. number of outstanding requests
42 42
43enum { 43enum
44{
44 PROT_UDPv4 = 0x01, // udp over ipv4 45 PROT_UDPv4 = 0x01, // udp over ipv4
45 PROT_IPv4 = 0x02, // generic ip protocol 46 PROT_IPv4 = 0x02, // generic ip protocol
46 PROT_TCPv4 = 0x04, // tcp over ipv4 (server) 47 PROT_TCPv4 = 0x04, // tcp over ipv4 (server)
47 PROT_ICMPv4 = 0x08, // icmp over ipv4 48 PROT_ICMPv4 = 0x08, // icmp over ipv4
48 PROT_DNSv4 = 0x10, // dns tunnel ipv4 (server) 49 PROT_DNSv4 = 0x10, // dns tunnel ipv4 (server)
… …
53 54
54// select the "best" protocol of the available ones 55// select the "best" protocol of the available ones
55u8 best_protocol (u8 protset); 56u8 best_protocol (u8 protset);
56const char *strprotocol (u8 protocol); 57const char *strprotocol (u8 protocol);
57 58
58struct conf_node { 59struct conf_node
60{
59 int id; // the id of this node, a 12-bit-number 61 int id; // the id of this node, a 12-bit-number
60 62
61 RSA *rsa_key; // his public key 63 RSA *rsa_key; // his public key
62 char *nodename; // nodename, an internal nickname. 64 char *nodename; // nodename, an internal nickname.
63 char *hostname; // hostname, if known, or NULL. 65 char *hostname; // hostname, if known, or NULL.
… …
81 void print (); 83 void print ();
82 84
83 ~conf_node (); 85 ~conf_node ();
84}; 86};
85 87
86struct configuration { 88struct configuration
89{
87 typedef vector<conf_node *> node_vector; 90 typedef vector<conf_node *> node_vector;
88 node_vector nodes; 91 node_vector nodes;
89 conf_node default_node; 92 conf_node default_node;
90 conf_node *thisnode; 93 conf_node *thisnode;
91 int mtu; // the mtu used for outgoing tunnel packets 94 int mtu; // the mtu used for outgoing tunnel packets
… …
121 int dns_max_outstanding; 124 int dns_max_outstanding;
122#endif 125#endif
123 126
124 void init (); 127 void init ();
125 void cleanup (); 128 void cleanup ();
126 void read_config (bool need_keys);
127 void clear_config (); 129 void clear ();
128 130
129 // create a filename from string, replacing %s by the nodename 131 // create a filename from string, replacing %s by the nodename
130 // and using relative paths under confbase. 132 // and using relative paths under confbase.
131 char *config_filename (const char *name, const char *dflt); 133 char *config_filename (const char *name, const char *dflt);
132 134
… …
134 136
135 configuration (); 137 configuration ();
136 ~configuration (); 138 ~configuration ();
137}; 139};
138 140
141struct configuration_parser
142{
143 configuration &conf;
144
145 bool need_keys;
146 conf_node *node;
147
148 int argc;
149 char **argv;
150
151 configuration_parser (configuration &conf, bool need_keys, int argc, char **argv);
152
153 const char *parse_line (char *line);
154 void parse_argv ();
155};
156
139extern struct configuration conf; 157extern struct configuration conf;
140 158
141#define THISNODE ::conf.thisnode 159#define THISNODE ::conf.thisnode
142 160
143#endif 161#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines