diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index 57e3188a7..e7800b4c7 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -38,8 +38,8 @@ static pcre_extra *info_ree; static pcre *streams_re; static pcre_extra *streams_ree; -int trust_address_def; -int dtls_passive_def; +bool trust_address_def; +bool dtls_passive_def; INLINE int call_ng_flags_prefix(struct sdp_ng_flags *out, str *s_ori, const char *prefix, diff --git a/daemon/main.c b/daemon/main.c index cb7e64e78..0b9b8364b 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -413,11 +413,11 @@ static void options(int *argc, char ***argv) { AUTO_CLEANUP_GBUF(log_facility_rtcp_s); AUTO_CLEANUP_GBUF(log_facility_dtmf_s); AUTO_CLEANUP_GBUF(log_format); - int sip_source = 0; + bool sip_source = false; AUTO_CLEANUP_GBUF(homerp); AUTO_CLEANUP_GBUF(homerproto); char *endptr; - int codecs = 0; + bool codecs = false; double max_load = 0; double max_cpu = 0; AUTO_CLEANUP_GBUF(dtmf_udp_ep); @@ -426,7 +426,7 @@ static void options(int *argc, char ***argv) { double silence_detect = 0; AUTO_CLEANUP_GVBUF(cn_payload); AUTO_CLEANUP_GVBUF(dtx_cn_params); - int debug_srtp = 0; + bool debug_srtp = false; AUTO_CLEANUP_GBUF(amr_dtx); #ifdef HAVE_MQTT AUTO_CLEANUP_GBUF(mqtt_publish_scope); @@ -753,7 +753,7 @@ static void options(int *argc, char ***argv) { } if (!sip_source) - trust_address_def = 1; + trust_address_def = true; rtpe_config.cpu_limit = max_cpu * 100; rtpe_config.load_limit = max_load * 100; diff --git a/include/call_interfaces.h b/include/call_interfaces.h index 41db9fd9f..12128e74c 100644 --- a/include/call_interfaces.h +++ b/include/call_interfaces.h @@ -204,8 +204,8 @@ struct sdp_ng_flags { }; -extern int trust_address_def; -extern int dtls_passive_def; +extern bool trust_address_def; +extern bool dtls_passive_def; str *call_request_tcp(char **); str *call_lookup_tcp(char **); diff --git a/include/main.h b/include/main.h index cec7d24a2..b5d94f427 100644 --- a/include/main.h +++ b/include/main.h @@ -67,14 +67,14 @@ struct rtpengine_config { endpoint_t homer_ep; int homer_protocol; int homer_id; - int no_fallback; - int reject_invalid_sdp; - int save_interface_ports; + bool no_fallback; + bool reject_invalid_sdp; + bool save_interface_ports; int port_min; int port_max; int redis_db; int redis_write_db; - int no_redis_required; + bool no_redis_required; int redis_allowed_errors; int redis_disable_time; int redis_cmd_timeout; @@ -83,13 +83,13 @@ struct rtpengine_config { int redis_delete_async_interval; char *redis_auth; char *redis_write_auth; - int active_switchover; + bool active_switchover; int num_threads; int media_num_threads; char *spooldir; char *rec_method; char *rec_format; - int rec_egress; + bool rec_egress; char *iptables_chain; int load_limit; int cpu_limit; @@ -98,20 +98,20 @@ struct rtpengine_config { int priority; char *idle_scheduling; int idle_priority; - int log_keys; + bool log_keys; char *mysql_host; int mysql_port; char *mysql_user; char *mysql_pass; char *mysql_query; endpoint_t dtmf_udp_ep; - int dtmf_via_ng; - int dtmf_no_suppress; + bool dtmf_via_ng; + bool dtmf_no_suppress; int dtmf_digit_delay; - int dtmf_no_log_injects; + bool dtmf_no_log_injects; enum endpoint_learning endpoint_learning; int jb_length; - int jb_clock_drift; + bool jb_clock_drift; enum { DCC_EC_PRIME256v1 = 0, DCC_RSA, @@ -138,7 +138,7 @@ struct rtpengine_config { double silence_detect_double; uint32_t silence_detect_int; str cn_payload; - int player_cache; + bool player_cache; int audio_buffer_length; int audio_buffer_delay; enum { @@ -148,7 +148,7 @@ struct rtpengine_config { UAP_ALWAYS, } use_audio_player; char *software_id; - int poller_per_thread; + bool poller_per_thread; char *mqtt_host; int mqtt_port; char *mqtt_tls_alpn; @@ -174,7 +174,7 @@ struct rtpengine_config { MOS_CQ = 0, MOS_LQ, } mos; - int measure_rtp; + bool measure_rtp; int cpu_affinity; char *janus_secret; }; diff --git a/recording-daemon/main.c b/recording-daemon/main.c index 3b43a884a..6cecfd0a7 100644 --- a/recording-daemon/main.c +++ b/recording-daemon/main.c @@ -39,17 +39,17 @@ enum output_storage_enum output_storage = OUTPUT_STORAGE_FILE; char *spool_dir = NULL; char *output_dir = NULL; static char *output_format = NULL; -int output_mixed; +bool output_mixed; enum mix_method mix_method; int mix_num_inputs = MIX_MAX_INPUTS; -int output_single; -int output_enabled = 1; +bool output_single; +bool output_enabled = 1; mode_t output_chmod; mode_t output_chmod_dir; uid_t output_chown = -1; gid_t output_chgrp = -1; char *output_pattern = NULL; -int decoding_enabled; +bool decoding_enabled; char *c_mysql_host, *c_mysql_user, *c_mysql_pass, @@ -60,12 +60,12 @@ static char *tls_send_to = NULL; endpoint_t tls_send_to_ep; int tls_resample = 8000; char *notify_uri; -int notify_post; -int notify_nverify; +bool notify_post; +bool notify_nverify; int notify_threads = 5; int notify_retries = 10; -int notify_record; -int notify_purge; +bool notify_record; +bool notify_purge; static GQueue threads = G_QUEUE_INIT; // only accessed from main thread @@ -257,10 +257,10 @@ static void options(int *argc, char ***argv) { g_free(output_format); output_format = NULL; } else if (!output_mixed && !output_single) - output_mixed = output_single = 1; + output_mixed = output_single = true; if (output_enabled || tls_send_to_ep.port) - decoding_enabled = 1; + decoding_enabled = true; if (!os_str || !strcmp(os_str, "file")) output_storage = OUTPUT_STORAGE_FILE; diff --git a/recording-daemon/main.h b/recording-daemon/main.h index d4e27e4c1..183a6bf33 100644 --- a/recording-daemon/main.h +++ b/recording-daemon/main.h @@ -22,17 +22,17 @@ extern int num_threads; extern enum output_storage_enum output_storage; extern char *spool_dir; extern char *output_dir; -extern int output_mixed; +extern bool output_mixed; extern enum mix_method mix_method; extern int mix_num_inputs; -extern int output_single; -extern int output_enabled; +extern bool output_single; +extern bool output_enabled; extern mode_t output_chmod; extern mode_t output_chmod_dir; extern uid_t output_chown; extern gid_t output_chgrp; extern char *output_pattern; -extern int decoding_enabled; +extern bool decoding_enabled; extern char *c_mysql_host, *c_mysql_user, *c_mysql_pass, @@ -42,12 +42,12 @@ extern char *forward_to; extern endpoint_t tls_send_to_ep; extern int tls_resample; extern char *notify_uri; -extern int notify_post; -extern int notify_nverify; +extern bool notify_post; +extern bool notify_nverify; extern int notify_threads; extern int notify_retries; -extern int notify_record; -extern int notify_purge; +extern bool notify_record; +extern bool notify_purge; extern volatile int shutdown_flag;