Skip to content

Commit

Permalink
Merge branch 'dilyanpalauzov-typos'
Browse files Browse the repository at this point in the history
* dilyanpalauzov-typos: (35 commits)
  modules: readme files regenerated - db_redis ... [skip ci]
  ndb_redis: Makefile - updated find command for libhiredis_ssl
  db_redis: Makefile - updated find command for libhiredis_ssl
  ndb_redis: Fixing format
  db_redis: Format fixes
  ndb_redis: Searching SSL support in gcc search library path
  db_redis: Searching SSL support in gcc search library path
  ndb_redis: Missing uprotected redisSSLContext
  ndb_redis: Fixing global variables names
  db_redis: Fixing global variables
  db_redis: Fixing Makefile
  db_redis: Fixing build
  ndb_redis: Format fixes
  db_redis: Missing format fixes
  db_redis: Fixing format
  ndb_redis: Adding TLS support
  db_redis: Adding TLS support
  utils: typos
  test/misc/code: typos
  usrloc: typo
  ...
  • Loading branch information
miconda committed Jun 20, 2023
2 parents d7ae9f1 + 290f50e commit ba2e365
Show file tree
Hide file tree
Showing 44 changed files with 110 additions and 112 deletions.
2 changes: 1 addition & 1 deletion src/Makefile
Expand Up @@ -32,7 +32,7 @@ include Makefile.targets
err_fail?=1

# whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default
# ($(MAIN_NAME).cfg will never be overwritten by make install, this is usefull
# ($(MAIN_NAME).cfg will never be overwritten by make install, this is useful
# when creating packages)
skip_cfg_install?=

Expand Down
12 changes: 6 additions & 6 deletions src/Makefile.defs
Expand Up @@ -589,7 +589,7 @@ data_target = $(prefix)/$(data_dir)
# uses a faster malloc
# -DDBG_QM_MALLOC
# qm_malloc debug code, will cause pkg_malloc and shm_malloc
# to keep and display lot of debuging information: file name,
# to keep and display lot of debugging information: file name,
# function, line number of malloc/free call for each block,
# extra error checking (trying to free the same pointer
# twice, trying to free a pointer alloc'ed with a different
Expand All @@ -615,7 +615,7 @@ data_target = $(prefix)/$(data_dir)
# -DMEM_JOIN_FREE
# enable the join of free memory chunks (see also mem_join cfg param)
# -DFAST_LOCK
# uses fast arhitecture specific locking (see the arh. specific section)
# uses fast architecture specific locking (see the arch. specific section)
# -DUSE_SYSV_SEM
# uses sys v sems for locking (slower & limited number)
# -DUSE_PTHREAD_MUTEX
Expand Down Expand Up @@ -999,9 +999,9 @@ ifeq ($(CC_NAME), icc)
CFLAGS+=-O3 -ipo -ipo_obj -unroll $(PROFILE) \
-tpp6 -xK #-openmp #optimize for PIII
# -prefetch doesn't seem to work
#( ty to inline acroos files, unroll loops,prefetch,
#( try to inline across files, unroll loops, prefetch,
# optimize for PIII, use PIII instructions & vect.,
# mutlithread loops)
# multithread loops)
else
#other compilers
$(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
Expand Down Expand Up @@ -1082,9 +1082,9 @@ ifeq ($(CC_NAME), icc)
CFLAGS+=-O3 -ipo -ipo_obj -unroll $(PROFILE) \
-tpp6 -xK #-openmp #optimize for PIII
# -prefetch doesn't seem to work
#( ty to inline acroos files, unroll loops,prefetch,
#( try to inline across files, unroll loops, prefetch,
# optimize for PIII, use PIII instructions & vect.,
# mutlithread loops)
# multithread loops)
else
#other compilers
$(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.groups
Expand Up @@ -214,7 +214,7 @@ mod_list_erlang=erlang
# - modules depending on systemd library
mod_list_systemd=log_systemd systemdops

# - modules depending on libnsq (+libev libevbuffsock liblcurl libjson-c) library
# - modules depending on libnsq (+libev libevbuffsock libcurl libjson-c) library
mod_list_nsq=nsq

# - modules depending on librabbitmq library
Expand Down
6 changes: 3 additions & 3 deletions src/Makefile.targets
Expand Up @@ -16,7 +16,7 @@ clean_targets:= clean proper distclean-old realclean maintainer-clean local-clea
clean-modules proper-modules realclean-modules \
distclean-modules maintainer-clean-modules \
clean-utils proper-utils realclean-utils distclean-utils \
maintaner-clean-utils \
maintainer-clean-utils \
clean-libs proper-libs realclean-libs distclean-libs \
maintainer-clean-libs \
clean-tmp clean_doxygen clean-extra-names \
Expand All @@ -26,7 +26,7 @@ doc_targets:= README man install-doc install-man install-ser-man \
$(foreach m,$(modules_dirs),$(m)-doc $(m)-readme $(m)-man) \
$(foreach m,$(modules_dirs),install-$(m)-doc install-$(m)-man)

# auxiliary: maintance, debugging, etc. (don't affect code/objects)
# auxiliary: maintenance, debugging, etc. (don't affect code/objects)
aux_targets:= TAGS tar dist cfg-defs cfg config config.mak print-modules \
dbg dbinstall librpath.lst makecfg.lst modules.lst modules-cfg \
modules-list modules-lst mk-install_dirs autover.h deb
Expand All @@ -36,6 +36,6 @@ ext_targets:= every-module modules-all $(modules_dirs) libs utils \
$(foreach m,$(modules_dirs),install-$(m)) \
install-share

# all the targets that don't require code dependecies in the current dir.
# all the targets that don't require code dependencies in the current dir.
nodep_targets:= $(clean_targets) $(doc_targets) $(aux_targets) $(ext_targets)

6 changes: 3 additions & 3 deletions src/core/async_task.c
Expand Up @@ -143,7 +143,7 @@ int async_task_init(void)
int nrg = 0;
async_wgroup_t *awg;

LM_DBG("start initializing asynk task framework\n");
LM_DBG("start initializing async task framework\n");
if(_async_wgroup_list == NULL || _async_wgroup_list->workers <= 0)
return 0;

Expand Down Expand Up @@ -184,7 +184,7 @@ int async_task_child_init(int rank)
if(_async_wgroup_list == NULL || _async_wgroup_list->workers <= 0)
return 0;

LM_DBG("child initializing asynk task framework\n");
LM_DBG("child initializing async task framework\n");

if(rank == PROC_INIT) {
if(async_task_init_sockets() < 0) {
Expand Down Expand Up @@ -406,7 +406,7 @@ int async_task_push(async_task_t *task)

len = write(_async_wgroup_list->sockets[1], &task, sizeof(async_task_t *));
if(len <= 0) {
LM_ERR("failed to pass the task to asynk workers\n");
LM_ERR("failed to pass the task to async workers\n");
return -1;
}
LM_DBG("task sent [%p]\n", task);
Expand Down
2 changes: 1 addition & 1 deletion src/core/forward.c
Expand Up @@ -72,7 +72,7 @@


/* return a socket_info_pointer to the sending socket; as opposed to
* get_send_socket, which returns process's default socket, get_out_socket
* get_send_socket, which returns process' default socket, get_out_socket
* attempts to determine the outbound interface which will be used;
* it uses a temporary connected socket to determine it; it will
* be very likely noticeably slower, but it can deal better with
Expand Down
2 changes: 1 addition & 1 deletion src/core/mem/dl_malloc.c
Expand Up @@ -304,7 +304,7 @@ MORECORE default: sbrk
MORECORE_CONTIGUOUS default: 1 (true)
If true, take advantage of fact that consecutive calls to MORECORE
with positive arguments always return contiguous increasing
addresses. This is true of unix sbrk. It does not hurt too much to
addresses. This is true for unix sbrk. It does not hurt too much to
set it true anyway, since malloc copes with non-contiguities.
Setting it false when definitely non-contiguous saves time
and possibly wasted space it would take to discover this though.
Expand Down
2 changes: 1 addition & 1 deletion src/core/msg_translator.c
Expand Up @@ -2768,7 +2768,7 @@ int branch_builder(unsigned int hash_index,
}


/* uses only the send_info->send_socket, send_info->proto and
/* uses only the send_info->send_socket, send_info->proto, send_info->id and
* send_info->comp (so that a send_info used for sending can be passed
* to this function w/o changes and the correct via will be built) */
char *via_builder(unsigned int *len, sip_msg_t *msg,
Expand Down
2 changes: 1 addition & 1 deletion src/core/parser/msg_parser.h
Expand Up @@ -445,7 +445,7 @@ typedef struct sip_msg
* runing failure handlers - see modules/tm/t_reply.c */
} sip_msg_t;

/*! \brief pointer to a fakes message which was never received ;
/*! \brief pointer to a faked message which was never received ;
(when this message is "relayed", it is generated out
of the original request)
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/parser/parse_via.c
Expand Up @@ -1090,7 +1090,7 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end,
state = F_COMP_VALUE;
break;
/* '=' in any other COMP value state is an error,
* and it will be catched by the default branch */
* and it will be caught by the default branch */
#endif
case P_STRING:
break;
Expand Down
2 changes: 1 addition & 1 deletion src/core/socket_info.c
Expand Up @@ -2065,7 +2065,7 @@ static int fix_socket_list(struct socket_info **list, int *type_flags)
ail = ail_next;
continue;
}
/* 2. check if the extra addresses contain a duplicates for
/* 2. check if the extra addresses contain a duplicate for
* other addresses in the same list */
for(tmp_ail = ail->next; tmp_ail;) {
tmp_ail_next = tmp_ail->next;
Expand Down
2 changes: 1 addition & 1 deletion src/core/tcp_main.c
Expand Up @@ -4464,7 +4464,7 @@ inline static int handle_tcpconn_ev(
if ((tcpconn->refcnt!=0)){
/* FIXME: might be valid for sigio_rt iff fd flags are not cleared
* (there is a short window in which it could generate a sig
* that would be catched by tcp_main) */
* that would be caught by tcp_main) */
LM_CRIT("handle_tcpconn_ev: io event on referenced"
" tcpconn (%p), refcnt=%d, fd=%d\n",
tcpconn, tcpconn->refcnt, tcpconn->s);
Expand Down
29 changes: 13 additions & 16 deletions src/main.c
Expand Up @@ -360,7 +360,7 @@ int timerlog = L_WARN;
good for trouble-shooting
*/
int sip_warning = 0;
/* should localy-generated messages include server's signature?
/* should locally-generated messages include server's signature?
be default yes, good for trouble-shooting
*/
int server_signature=1;
Expand Down Expand Up @@ -405,8 +405,8 @@ int disable_core_dump=0; /* by default enabled */
int open_files_limit=-1; /* don't touch it by default */

/* memory options */
int shm_force_alloc=0; /* force immediate (on startup) page allocation
(by writting 0 in the pages), useful if
int shm_force_alloc = 0; /* force immediate (on startup) page allocation
(by writing 0 in the pages), useful if
mlock_pages is also 1 */
int mlock_pages=0; /* default off, try to disable swapping */

Expand Down Expand Up @@ -1048,9 +1048,8 @@ static void free_name_lst(struct name_lst* lst)
}



/* parse h and returns a name lst (flags are set to SI_IS_MHOMED if
* h contains more then one name or contains a name surrounded by '(' ')' )
* h contains more than one name or contains a name surrounded by '(' ')' )
* valid formats: "hostname"
* "(hostname, hostname1, hostname2)"
* "(hostname hostname1 hostname2)"
Expand Down Expand Up @@ -1131,7 +1130,7 @@ static struct name_lst* parse_name_lst(char* h, int h_len)
* where proto= udp|tcp|tls|sctp
* @param s - string (like above)
* @param host - will be filled with the host part
* Note: for multi-homing it wil contain all the addresses
* Note: for multi-homing it will contain all the addresses
* (e.g.: "sctp:(1.2.3.4, 5.6.7.8)" => host="(1.2.3.4, 5.6.7.8)")
* @param hlen - will be filled with the length of the host part.
* @param port - will be filled with the port if present or 0 if it's not.
Expand Down Expand Up @@ -1200,7 +1199,7 @@ int parse_phostport(char* s, char** host, int* hlen,
*host=first+1;
*hlen=(int)(p-*host);
}else{
/* valid port => its host:port */
/* valid port => it is host:port */
*proto=0;
*host=s;
*hlen=(int)(first-*host);
Expand All @@ -1222,14 +1221,13 @@ int parse_phostport(char* s, char** host, int* hlen,
}



/** get protocol host, port and MH addresses list from a string representation.
* parses [proto:]host[:port] or
* [proto:](host_1, host_2, ... host_n)[:port]
* where proto= udp|tcp|tls|sctp
* @param s - string (like above)
* @param host - will be filled with the host part
* Note: for multi-homing it wil contain all the addresses
* Note: for multi-homing it will contain all the addresses
* (e.g.: "sctp:(1.2.3.4, 5.6.7.8)" => host="(1.2.3.4, 5.6.7.8)")
* @param hlen - will be filled with the length of the host part.
* @param port - will be filled with the port if present or 0 if it's not.
Expand All @@ -1247,15 +1245,14 @@ static struct name_lst* parse_phostport_mh(char* s, char** host, int* hlen,
}



/** Update \c cfg_file variable to contain full pathname or '-' (for stdin)
* allocated in system memory. The function updates
* the value of \c cfg_file global variable to contain full absolute pathname
* to the main configuration file. The function uses CFG_FILE macro to
* determine the default path to the configuration file if the user did not
* specify one using the command line option. If \c cfg_file contains an
* absolute pathname then it is cloned unmodified, if it contains a relative
* pathanme than the value returned by \c getcwd function will be added at the
* pathname then the value returned by \c getcwd function will be added at the
* beginning. This function must be run before changing its current working
* directory to / (in daemon mode).
* @return Zero on success, negative number
Expand Down Expand Up @@ -2060,10 +2057,10 @@ int main(int argc, char** argv)
/* command line options */
options= ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:";
/* Handle special command line arguments, that must be treated before
* intializing the various subsystem or before parsing other arguments:
* initializing the various subsystem or before parsing other arguments:
* - get the startup debug and log_stderr values
* - look if pkg mem size is overriden on the command line (-M) and get
* the new value here (before intializing pkg_mem).
* - look if pkg mem size is overridden on the command line (-M) and get
* the new value here (before initializing pkg_mem).
* - look if there is a -h, e.g. -f -h construction won't be caught
* later
*/
Expand Down Expand Up @@ -2870,7 +2867,7 @@ int main(int argc, char** argv)
ksr_sockets_index();
if (default_core_cfg.dns_try_ipv6 && !(socket_types & SOCKET_T_IPV6)){
/* if we are not listening on any ipv6 address => no point
* to try to resovle ipv6 addresses */
* to try to resolve ipv6 addresses */
default_core_cfg.dns_try_ipv6=0;
}
/* print all the listen addresses */
Expand Down Expand Up @@ -3111,7 +3108,7 @@ int main(int argc, char** argv)
#ifdef KSR_PTHREAD_MUTEX_SHARED

/**
* code to set PTHREAD_PROCESS_SHARED attribute for phtread mutex to cope
* code to set PTHREAD_PROCESS_SHARED attribute for pthread mutex to cope
* with libssl 1.1+ thread-only mutex initialization
*/

Expand Down
2 changes: 1 addition & 1 deletion src/modules/lwsc/api.h
Expand Up @@ -39,7 +39,7 @@ typedef int (*lwsc_api_request_f)(
typedef struct lwsc_api
{
int loaded;
lwsc_api_request_f request; /* send and receice data */
lwsc_api_request_f request; /* send and receive data */
} lwsc_api_t;

typedef int (*bind_lwsc_f)(lwsc_api_t *api);
Expand Down
2 changes: 1 addition & 1 deletion src/modules/lwsc/lwsc_mod.c
Expand Up @@ -545,7 +545,7 @@ static lwsc_endpoint_t *lwsc_get_endpoint(str *wsurl, str *wsproto)

ep->wsctx = lws_create_context(&ep->crtinfo);
if(!ep->wsctx) {
LM_ERR("failed to intialize context for ws url [%.*s]\n", wsurl->len,
LM_ERR("failed to initialize context for ws url [%.*s]\n", wsurl->len,
wsurl->s);
goto error;
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mangler/contact_ops.c
Expand Up @@ -316,7 +316,7 @@ int encode2format(struct sip_msg *msg, str *uri, struct uri_format *format)
format->first = start - string + scheme_len + 1 /* ':' */;
format->second = end - string;
/* --------------------------testing ------------------------------- */
/* sip:gva@pass@10.0.0.1;;transport=udp>;expires=2 INCORECT BEHAVIOR OF parse_uri,myfunction works good */
/* sip:gva@pass@10.0.0.1;;transport=udp>;expires=2 INCORRECT BEHAVIOR OF parse_uri,myfunction works good */
foo = parse_uri(start, end - start, &sipUri);
if(foo != 0) {
LOG(L_ERR,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/mangler/mangler.c
Expand Up @@ -156,7 +156,7 @@ int prepare()
{

/* using pre-compiled expressions to speed things up*/
compile_expresions(PORT_REGEX, IP_REGEX);
compile_expressions(PORT_REGEX, IP_REGEX);

#ifdef DEMO
load_tm_f load_tm;
Expand Down Expand Up @@ -195,7 +195,7 @@ static int mod_init(void)
static void destroy(void)
{
/*free some compiled regex expressions */
free_compiled_expresions();
free_compiled_expressions();
#ifdef DEMO
fprintf(stdout, "Freeing pre-compiled expressions\n");
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/modules/mangler/mangler.cfg
Expand Up @@ -42,7 +42,7 @@ loadmodule "modules/mangler/mangler.so"
#loadmodule "/usr/lib/ser/modules/auth.so"

# ----------------- setting module-specific parameters ---------------
# seting separator for encoded contact
# setting separator for encoded contact
modparam("mangler","contact_flds_separator","*")


Expand Down Expand Up @@ -78,7 +78,7 @@ route{
* message */
if (method == "INVITE"){
sdp_mangle_ip("0.0.0.0/0","PUBLIC_IP");
/* diferent mangling based on what phone we use */
/* different mangling based on what phone we use */
if (src_ip==10.0.0.1) sdp_mangle_port("+1000");
if (src_ip==10.0.0.2) sdp_mangle_port("-1000");
};
Expand Down

0 comments on commit ba2e365

Please sign in to comment.