Browse Source

MT#55283 use correct ARG_NONE type

Turns out `bool` and `gboolean` are not safely interchangeable as
they're different sizes. Doh.

Change-Id: I3cfda6584ce3f6cb142fef4a9ee9743ee4eebbe0
pull/1722/head
Richard Fuchs 2 years ago
parent
commit
91a8f4be04
4 changed files with 33 additions and 33 deletions
  1. +14
    -14
      include/main.h
  2. +3
    -3
      perf-tester/main.c
  3. +8
    -8
      recording-daemon/main.c
  4. +8
    -8
      recording-daemon/main.h

+ 14
- 14
include/main.h View File

@ -67,14 +67,14 @@ struct rtpengine_config {
endpoint_t homer_ep; endpoint_t homer_ep;
int homer_protocol; int homer_protocol;
int homer_id; int homer_id;
bool no_fallback;
bool reject_invalid_sdp;
bool save_interface_ports;
gboolean no_fallback;
gboolean reject_invalid_sdp;
gboolean save_interface_ports;
int port_min; int port_min;
int port_max; int port_max;
int redis_db; int redis_db;
int redis_write_db; int redis_write_db;
bool no_redis_required;
gboolean no_redis_required;
int redis_allowed_errors; int redis_allowed_errors;
int redis_disable_time; int redis_disable_time;
int redis_cmd_timeout; int redis_cmd_timeout;
@ -83,13 +83,13 @@ struct rtpengine_config {
int redis_delete_async_interval; int redis_delete_async_interval;
char *redis_auth; char *redis_auth;
char *redis_write_auth; char *redis_write_auth;
bool active_switchover;
gboolean active_switchover;
int num_threads; int num_threads;
int media_num_threads; int media_num_threads;
char *spooldir; char *spooldir;
char *rec_method; char *rec_method;
char *rec_format; char *rec_format;
bool rec_egress;
gboolean rec_egress;
char *iptables_chain; char *iptables_chain;
int load_limit; int load_limit;
int cpu_limit; int cpu_limit;
@ -98,20 +98,20 @@ struct rtpengine_config {
int priority; int priority;
char *idle_scheduling; char *idle_scheduling;
int idle_priority; int idle_priority;
bool log_keys;
gboolean log_keys;
char *mysql_host; char *mysql_host;
int mysql_port; int mysql_port;
char *mysql_user; char *mysql_user;
char *mysql_pass; char *mysql_pass;
char *mysql_query; char *mysql_query;
endpoint_t dtmf_udp_ep; endpoint_t dtmf_udp_ep;
bool dtmf_via_ng;
bool dtmf_no_suppress;
gboolean dtmf_via_ng;
gboolean dtmf_no_suppress;
int dtmf_digit_delay; int dtmf_digit_delay;
bool dtmf_no_log_injects;
gboolean dtmf_no_log_injects;
enum endpoint_learning endpoint_learning; enum endpoint_learning endpoint_learning;
int jb_length; int jb_length;
bool jb_clock_drift;
gboolean jb_clock_drift;
enum { enum {
DCC_EC_PRIME256v1 = 0, DCC_EC_PRIME256v1 = 0,
DCC_RSA, DCC_RSA,
@ -138,7 +138,7 @@ struct rtpengine_config {
double silence_detect_double; double silence_detect_double;
uint32_t silence_detect_int; uint32_t silence_detect_int;
str cn_payload; str cn_payload;
bool player_cache;
gboolean player_cache;
int audio_buffer_length; int audio_buffer_length;
int audio_buffer_delay; int audio_buffer_delay;
enum { enum {
@ -148,7 +148,7 @@ struct rtpengine_config {
UAP_ALWAYS, UAP_ALWAYS,
} use_audio_player; } use_audio_player;
char *software_id; char *software_id;
bool poller_per_thread;
gboolean poller_per_thread;
char *mqtt_host; char *mqtt_host;
int mqtt_port; int mqtt_port;
char *mqtt_tls_alpn; char *mqtt_tls_alpn;
@ -174,7 +174,7 @@ struct rtpengine_config {
MOS_CQ = 0, MOS_CQ = 0,
MOS_LQ, MOS_LQ,
} mos; } mos;
bool measure_rtp;
gboolean measure_rtp;
int cpu_affinity; int cpu_affinity;
char *janus_secret; char *janus_secret;
}; };


+ 3
- 3
perf-tester/main.c View File

@ -150,13 +150,13 @@ static const struct testparams testparams[] = {
static char *source_codec = "PCMA"; static char *source_codec = "PCMA";
static char *dest_codec = "opus"; static char *dest_codec = "opus";
static int init_threads = 0; static int init_threads = 0;
static bool bidirectional = false;
static gboolean bidirectional = false;
static int max_cpu = 0; static int max_cpu = 0;
static bool system_cpu;
static gboolean system_cpu;
static int break_in = 200; static int break_in = 200;
static int measure_time = 500; static int measure_time = 500;
static int repeats = 1; static int repeats = 1;
static bool cpu_freq;
static gboolean cpu_freq;
static int freq_granularity = 50; static int freq_granularity = 50;


+ 8
- 8
recording-daemon/main.c View File

@ -39,17 +39,17 @@ enum output_storage_enum output_storage = OUTPUT_STORAGE_FILE;
char *spool_dir = NULL; char *spool_dir = NULL;
char *output_dir = NULL; char *output_dir = NULL;
static char *output_format = NULL; static char *output_format = NULL;
bool output_mixed;
gboolean output_mixed;
enum mix_method mix_method; enum mix_method mix_method;
int mix_num_inputs = MIX_MAX_INPUTS; int mix_num_inputs = MIX_MAX_INPUTS;
bool output_single;
bool output_enabled = 1;
gboolean output_single;
gboolean output_enabled = 1;
mode_t output_chmod; mode_t output_chmod;
mode_t output_chmod_dir; mode_t output_chmod_dir;
uid_t output_chown = -1; uid_t output_chown = -1;
gid_t output_chgrp = -1; gid_t output_chgrp = -1;
char *output_pattern = NULL; char *output_pattern = NULL;
bool decoding_enabled;
gboolean decoding_enabled;
char *c_mysql_host, char *c_mysql_host,
*c_mysql_user, *c_mysql_user,
*c_mysql_pass, *c_mysql_pass,
@ -60,12 +60,12 @@ static char *tls_send_to = NULL;
endpoint_t tls_send_to_ep; endpoint_t tls_send_to_ep;
int tls_resample = 8000; int tls_resample = 8000;
char *notify_uri; char *notify_uri;
bool notify_post;
bool notify_nverify;
gboolean notify_post;
gboolean notify_nverify;
int notify_threads = 5; int notify_threads = 5;
int notify_retries = 10; int notify_retries = 10;
bool notify_record;
bool notify_purge;
gboolean notify_record;
gboolean notify_purge;
static GQueue threads = G_QUEUE_INIT; // only accessed from main thread static GQueue threads = G_QUEUE_INIT; // only accessed from main thread


+ 8
- 8
recording-daemon/main.h View File

@ -22,17 +22,17 @@ extern int num_threads;
extern enum output_storage_enum output_storage; extern enum output_storage_enum output_storage;
extern char *spool_dir; extern char *spool_dir;
extern char *output_dir; extern char *output_dir;
extern bool output_mixed;
extern gboolean output_mixed;
extern enum mix_method mix_method; extern enum mix_method mix_method;
extern int mix_num_inputs; extern int mix_num_inputs;
extern bool output_single;
extern bool output_enabled;
extern gboolean output_single;
extern gboolean output_enabled;
extern mode_t output_chmod; extern mode_t output_chmod;
extern mode_t output_chmod_dir; extern mode_t output_chmod_dir;
extern uid_t output_chown; extern uid_t output_chown;
extern gid_t output_chgrp; extern gid_t output_chgrp;
extern char *output_pattern; extern char *output_pattern;
extern bool decoding_enabled;
extern gboolean decoding_enabled;
extern char *c_mysql_host, extern char *c_mysql_host,
*c_mysql_user, *c_mysql_user,
*c_mysql_pass, *c_mysql_pass,
@ -42,12 +42,12 @@ extern char *forward_to;
extern endpoint_t tls_send_to_ep; extern endpoint_t tls_send_to_ep;
extern int tls_resample; extern int tls_resample;
extern char *notify_uri; extern char *notify_uri;
extern bool notify_post;
extern bool notify_nverify;
extern gboolean notify_post;
extern gboolean notify_nverify;
extern int notify_threads; extern int notify_threads;
extern int notify_retries; extern int notify_retries;
extern bool notify_record;
extern bool notify_purge;
extern gboolean notify_record;
extern gboolean notify_purge;
extern volatile int shutdown_flag; extern volatile int shutdown_flag;


Loading…
Cancel
Save