logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0005-Allow-building-daemon-without-remote-control.patch (4625B)

    

  1. From 91e0865f0bd42d28d50ddd1fc1fae6cfaab17e46 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 1 Dec 2021 16:08:12 -0800
  4. Subject: [PATCH] Allow building daemon without remote control
  6. ---
  7.  daemon/daemon.c   | 13 +++++++++++++
  8.  daemon/unbound.c  |  5 +++++
  9.  daemon/worker.c   |  8 ++++++++
  10.  util/fptr_wlist.c |  4 ++++
  11.  4 files changed, 30 insertions(+)
  13. diff --git a/daemon/daemon.c b/daemon/daemon.c
  14. index 0e3923b4..27132ce1 100644
  15. --- a/daemon/daemon.c
  16. +++ b/daemon/daemon.c
  17. @@ -68,7 +68,9 @@
  18.  
  19.  #include "daemon/daemon.h"
  20.  #include "daemon/worker.h"
  21. +#ifdef WITH_REMOTE
  22.  #include "daemon/remote.h"
  23. +#endif
  24.  #include "daemon/acl_list.h"
  25.  #include "util/log.h"
  26.  #include "util/config_file.h"
  27. @@ -378,9 +380,16 @@ daemon_open_shared_ports(struct daemon* daemon)
  28.  	if(daemon->cfg->remote_control_enable && 
  29.  		daemon->cfg->control_port != daemon->rc_port) {
  30.  		listening_ports_free(daemon->rc_ports);
  31. +#ifdef WITH_REMOTE
  32.  		if(!(daemon->rc_ports=daemon_remote_open_ports(daemon->cfg)))
  33.  			return 0;
  34.  		daemon->rc_port = daemon->cfg->control_port;
  35. +#else
  36. +		log_err("unbound built without remote control");
  37. +		daemon->rc_ports = NULL;
  38. +		daemon->rc_port = 0;
  39. +		return 0;
  40. +#endif
  41.  	}
  42.  	return 1;
  43.  }
  44. @@ -738,8 +747,10 @@ daemon_cleanup(struct daemon* daemon)
  45.  	daemon->views = NULL;
  46.  	if(daemon->env->auth_zones)
  47.  		auth_zones_cleanup(daemon->env->auth_zones);
  48. +#ifdef WITH_REMOTE
  49.  	/* key cache is cleared by module desetup during next daemon_fork() */
  50.  	daemon_remote_clear(daemon->rc);
  51. +#endif
  52.  	for(i=0; i<daemon->num; i++)
  53.  		worker_delete(daemon->workers[i]);
  54.  	free(daemon->workers);
  55. @@ -764,7 +775,9 @@ daemon_delete(struct daemon* daemon)
  56.  	if(!daemon)
  57.  		return;
  58.  	modstack_desetup(&daemon->mods, daemon->env);
  59. +#ifdef WITH_REMOTE
  60.  	daemon_remote_delete(daemon->rc);
  61. +#endif
  62.  	for(i = 0; i < daemon->num_ports; i++)
  63.  		listening_ports_free(daemon->ports[i]);
  64.  	free(daemon->ports);
  65. diff --git a/daemon/unbound.c b/daemon/unbound.c
  66. index 2baf4dba..7925d91b 100644
  67. --- a/daemon/unbound.c
  68. +++ b/daemon/unbound.c
  69. @@ -490,8 +490,13 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
  70.  	w_config_adjust_directory(cfg);
  71.  #endif
  72.  
  73. +
  74. +#ifdef WITH_REMOTE
  75.  	if(!(daemon->rc = daemon_remote_create(cfg)))
  76.  		fatal_exit("could not set up remote-control");
  77. +#else
  78. +	daemon->rc = NULL;
  79. +#endif
  80.  
  81.  	/* read ssl keys while superuser and outside chroot */
  82.  #ifdef HAVE_SSL
  83. diff --git a/daemon/worker.c b/daemon/worker.c
  84. index 5d2483cd..f3c32279 100644
  85. --- a/daemon/worker.c
  86. +++ b/daemon/worker.c
  87. @@ -376,10 +376,12 @@ worker_handle_control_cmd(struct tube* ATTR_UNUSED(tube), uint8_t* msg,
  88.  		verbose(VERB_ALGO, "got control cmd stats_noreset");
  89.  		server_stats_reply(worker, 0);
  90.  		break;
  91. +#ifdef WITH_REMOTE
  92.  	case worker_cmd_remote:
  93.  		verbose(VERB_ALGO, "got control cmd remote");
  94.  		daemon_remote_exec(worker);
  95.  		break;
  96. +#endif
  97.  	default:
  98.  		log_err("bad command %d", (int)cmd);
  99.  		break;
  100. @@ -1731,11 +1733,13 @@ worker_init(struct worker* worker, struct config_file *cfg,
  101.  			return 0;
  102.  		}
  103.  #endif /* LIBEVENT_SIGNAL_PROBLEM */
  104. +#ifdef WITH_REMOTE
  105.  		if(!daemon_remote_open_accept(worker->daemon->rc, 
  106.  			worker->daemon->rc_ports, worker)) {
  107.  			worker_delete(worker);
  108.  			return 0;
  109.  		}
  110. +#endif
  111.  #ifdef UB_ON_WINDOWS
  112.  		wsvc_setup_worker(worker);
  113.  #endif /* UB_ON_WINDOWS */
  114. @@ -2007,16 +2011,20 @@ void worker_start_accept(void* arg)
  115.  {
  116.  	struct worker* worker = (struct worker*)arg;
  117.  	listen_start_accept(worker->front);
  118. +#ifdef WITH_REMOTE
  119.  	if(worker->thread_num == 0)
  120.  		daemon_remote_start_accept(worker->daemon->rc);
  121. +#endif
  122.  }
  123.  
  124.  void worker_stop_accept(void* arg)
  125.  {
  126.  	struct worker* worker = (struct worker*)arg;
  127.  	listen_stop_accept(worker->front);
  128. +#ifdef WITH_REMOTE
  129.  	if(worker->thread_num == 0)
  130.  		daemon_remote_stop_accept(worker->daemon->rc);
  131. +#endif
  132.  }
  133.  
  134.  /* --- fake callbacks for fptr_wlist to work --- */
  135. diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
  136. index f8dac65c..f98ec5f3 100644
  137. --- a/util/fptr_wlist.c
  138. +++ b/util/fptr_wlist.c
  139. @@ -118,8 +118,10 @@ fptr_whitelist_comm_point_raw(comm_point_callback_type *fptr)
  140.  {
  141.  	if(fptr == &tube_handle_listen) return 1;
  142.  	else if(fptr == &tube_handle_write) return 1;
  143. +#ifdef WITH_REMOTE
  144.  	else if(fptr == &remote_accept_callback) return 1;
  145.  	else if(fptr == &remote_control_callback) return 1;
  146. +#endif
  147.  	return 0;
  148.  }
  149.  
  150. @@ -587,7 +589,9 @@ int fptr_whitelist_print_func(void (*fptr)(char*,void*))
  151.  {
  152.  	if(fptr == &config_print_func) return 1;
  153.  	else if(fptr == &config_collate_func) return 1;
  154. +#ifdef WITH_REMOTE
  155.  	else if(fptr == &remote_get_opt_ssl) return 1;
  156. +#endif
  157.  	return 0;
  158.  }
  159.  
  160. -- 
  161. 2.34.1