Third time lucky

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index c58bd1aaa1116d8214ea56e9d927f7d8699b5f98..29dd4f0f250c3344d7c4e6825de9c88c2c28ca5c 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -21,9 +21,9 @@
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
-       int     port;           /* Port to forward. */
-       char   *host;           /* Host to connect. */
-       int     host_port;      /* Port to connect on host. */
+       u_short   port;         /* Port to forward. */
+       char     *host;         /* Host to connect. */
+       u_short   host_port;    /* Port to connect on host. */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -85,42 +85,53 @@ typedef struct {
 }       Options;
 
 
-/* Initializes options to special values that indicate that they have not
-   yet been set.  Read_config_file will only set options with this value.
-   Options are processed in the following order: command line, user config
-   file, system config file.  Last, fill_default_options is called. */
+/*
+ * Initializes options to special values that indicate that they have not yet
+ * been set.  Read_config_file will only set options with this value. Options
+ * are processed in the following order: command line, user config file,
+ * system config file.  Last, fill_default_options is called.
+ */
 void    initialize_options(Options * options);
 
-/* Called after processing other sources of option data, this fills those
-   options for which no value has been specified with their default values. */
+/*
+ * Called after processing other sources of option data, this fills those
+ * options for which no value has been specified with their default values.
+ */
 void    fill_default_options(Options * options);
 
-/* Processes a single option line as used in the configuration files.
-   This only sets those values that have not already been set.
-   Returns 0 for legal options */
+/*
+ * Processes a single option line as used in the configuration files. This
+ * only sets those values that have not already been set. Returns 0 for legal
+ * options
+ */
 int 
 process_config_line(Options * options, const char *host,
     char *line, const char *filename, int linenum,
     int *activep);
 
-/* Reads the config file and modifies the options accordingly.  Options should
-   already be initialized before this call.  This never returns if there
-   is an error.  If the file does not exist, this returns immediately. */
+/*
+ * Reads the config file and modifies the options accordingly.  Options
+ * should already be initialized before this call.  This never returns if
+ * there is an error.  If the file does not exist, this returns immediately.
+ */
 void 
 read_config_file(const char *filename, const char *host,
     Options * options);
 
-/* Adds a local TCP/IP port forward to options.  Never returns if there
-   is an error. */
+/*
+ * Adds a local TCP/IP port forward to options.  Never returns if there is an
+ * error.
+ */
 void 
-add_local_forward(Options * options, int port, const char *host,
-    int host_port);
+add_local_forward(Options * options, u_short port, const char *host,
+    u_short host_port);
 
-/* Adds a remote TCP/IP port forward to options.  Never returns if there
-   is an error. */
+/*
+ * Adds a remote TCP/IP port forward to options.  Never returns if there is
+ * an error.
+ */
 void 
-add_remote_forward(Options * options, int port, const char *host,
-    int host_port);
-
+add_remote_forward(Options * options, u_short port, const char *host,
+    u_short host_port);
 
 #endif                         /* READCONF_H */