Added getoptions() and made minor adjustment to poptReadDefaultOptions()

svn:r25

1 files changed, 15 insertions, 1 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 0f4647fb2..e09b154f5 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -284,7 +284,18 @@ typedef struct
   void *next;
 } tracked_onion_t;
 
-
+typedef struct
+{
+   char *LogLevel;
+   char *RouterFile;
+   char *PrivateKeyFile;
+   float CoinWeight;
+   int ORPort;
+   int OPPort;
+   int APPort;
+   int MaxConn;
+   int TrafficShaping;
+} or_options_t;
 
 
     /* all the function prototypes go here */
@@ -366,6 +377,9 @@ void command_process_destroy_cell(cell_t *cell, connection_t *conn);
 /* loads the configuration file */
 int getconfig(char *filename, config_opt_t *options);
 
+/* create or_options_t from command-line args and config files(s) */
+int getoptions(int argc, char **argv, or_options_t *options);
+
 /********************************* connection.c ***************************/
 
 connection_t *connection_new(int type);