session server REFACTOR move server_opts to header

CESNET · Nov 15, 2024 · b61032e · b61032e
1 parent 8bfccdb
commit b61032e
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 16 deletions.
diff --git a/src/messages_server.c b/src/messages_server.c
@@ -30,8 +30,6 @@
 #include "messages_server.h"
 #include "netconf.h"
 
-extern struct nc_server_opts server_opts;
-
 API struct nc_server_reply *
 nc_server_reply_ok(void)
 {

diff --git a/src/server_config.c b/src/server_config.c
@@ -33,8 +33,6 @@
 #include "server_config_p.h"
 #include "session_p.h"
 
-extern struct nc_server_opts server_opts;
-
 /* returns a parent node of 'node' that matches the name 'name' */
 static const struct lyd_node *
 nc_server_config_get_parent(const struct lyd_node *node, const char *name)

diff --git a/src/server_config_ks.c b/src/server_config_ks.c
@@ -27,8 +27,6 @@
 #include "server_config_p.h"
 #include "session_p.h"
 
-extern struct nc_server_opts server_opts;
-
 /**
  * @brief Get the pointer to an asymmetric key structure based on node's location in the YANG data.
  *

diff --git a/src/server_config_ts.c b/src/server_config_ts.c
@@ -27,8 +27,6 @@
 #include "server_config_p.h"
 #include "session_p.h"
 
-extern struct nc_server_opts server_opts;
-
 /**
  * @brief Get the pointer to a certificate bag structure based on node's location in the YANG data.
  *

diff --git a/src/session.c b/src/session.c
@@ -50,8 +50,6 @@
 /* in milliseconds */
 #define NC_CLOSE_REPLY_TIMEOUT 200
 
-extern struct nc_server_opts server_opts;
-
 void
 nc_timeouttime_get(struct timespec *ts, uint32_t add_ms)
 {

diff --git a/src/session_p.h b/src/session_p.h
@@ -32,6 +32,8 @@
 #include "session_server_ch.h"
 #include "session_wrapper.h"
 
+extern struct nc_server_opts server_opts;
+
 /**
  * Enumeration of diff operation types.
  */

diff --git a/src/session_server_ssh.c b/src/session_server_ssh.c
@@ -47,8 +47,6 @@
 #include "session_p.h"
 #include "session_wrapper.h"
 
-extern struct nc_server_opts server_opts;
-
 /**
  * @brief Stores the private key data as a temporary file.
  *

diff --git a/src/session_server_tls.c b/src/session_server_tls.c
@@ -33,8 +33,6 @@
 #include "session_p.h"
 #include "session_wrapper.h"
 
-extern struct nc_server_opts server_opts;
-
 static int
 nc_server_tls_ks_ref_get_cert_key(const char *referenced_key_name, const char *referenced_cert_name,
         char **privkey_data, enum nc_privkey_format *privkey_type, char **cert_data)

diff --git a/src/session_wrapper.h b/src/session_wrapper.h
@@ -69,8 +69,6 @@ struct nc_tls_verify_cb_data {
     void *chain;                        /**< Certificate chain used to verify the client cert. */
 };
 
-extern struct nc_server_opts server_opts;
-
 /**
  * @brief Creates a new TLS session from the given configuration.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,8 +69,6 @@ struct nc_tls_verify_cb_data { @@
         void *chain;                        /**< Certificate chain used to verify the client cert. */
     };
-    extern struct nc_server_opts server_opts;
     /**
      * @brief Creates a new TLS session from the given configuration.
      *
@@ Expand Down @@