From 12bb0706e064ad49dbe4518e8b33ab6006618f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:13:10 +0200 Subject: [PATCH 01/14] benchmark: typo --- src/modules/benchmark/doc/benchmark_devel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/benchmark/doc/benchmark_devel.xml b/src/modules/benchmark/doc/benchmark_devel.xml index 4774e5fe46b..01a6aaf6b19 100644 --- a/src/modules/benchmark/doc/benchmark_devel.xml +++ b/src/modules/benchmark/doc/benchmark_devel.xml @@ -32,7 +32,7 @@ bm_register(name, mode, id) - This function register a new timer and/or returns the internal ID + This function registers a new timer and/or returns the internal ID associated with the timer. mode controls the creation of new timer if not found. id is to be used by start and log timer functions. From e7369819b764b2b38d6fd970364dc7a7fc117faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:15:06 +0200 Subject: [PATCH 02/14] carrierroute: typos --- src/modules/carrierroute/cr_fixup.c | 4 ++-- src/modules/carrierroute/cr_map.c | 4 ++-- src/modules/carrierroute/cr_map.h | 4 ++-- src/modules/carrierroute/cr_rule.h | 2 +- src/modules/carrierroute/doc/carrierroute_admin.xml | 12 ++++++------ src/modules/carrierroute/doc/carrierroute_db.xml | 2 +- src/modules/carrierroute/prime_hash.c | 6 +++--- src/modules/carrierroute/prime_hash.h | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/modules/carrierroute/cr_fixup.c b/src/modules/carrierroute/cr_fixup.c index c4793e8cdb0..072de809a9e 100644 --- a/src/modules/carrierroute/cr_fixup.c +++ b/src/modules/carrierroute/cr_fixup.c @@ -36,7 +36,7 @@ /** - * The fixup funcions will use the initial mapping. + * The fixup functions will use the initial mapping. * If the mapping changes afterwards (eg. due to cr_reload_routes), * the names used in the routing script will not be mapped * to the correct IDs! @@ -60,7 +60,7 @@ static int carrier_name_2_id(const str *name) { /** - * The fixup funcions will use the initial mapping. + * The fixup functions will use the initial mapping. * If the mapping changes afterwards (eg. due to cr_reload_routes), * the names used in the routing script will not be mapped * to the correct IDs! diff --git a/src/modules/carrierroute/cr_map.c b/src/modules/carrierroute/cr_map.c index 60000294332..e233915f002 100644 --- a/src/modules/carrierroute/cr_map.c +++ b/src/modules/carrierroute/cr_map.c @@ -39,7 +39,7 @@ * @param size the size of the list * @param name the name, we are looking for * - * @return values: on succcess the id for this name, -1 on failure + * @return values: on success the id for this name, -1 on failure */ int map_name2id(struct name_map_t * map, int size, const str * name) { int i; @@ -62,7 +62,7 @@ int map_name2id(struct name_map_t * map, int size, const str * name) { * @param size the size of the list * @param id the id, we are looking for * - * @return values: on succcess the name for this id, NULL on failure + * @return values: on success the name for this id, NULL on failure */ str * map_id2name(struct name_map_t * map, int size, int id) { struct name_map_t key; diff --git a/src/modules/carrierroute/cr_map.h b/src/modules/carrierroute/cr_map.h index 0fbd53d2df6..36e8c7669c5 100644 --- a/src/modules/carrierroute/cr_map.h +++ b/src/modules/carrierroute/cr_map.h @@ -49,7 +49,7 @@ struct name_map_t { * @param size the size of the list * @param name the name, we are looking for * - * @return values: on succcess the id for this name, -1 on failure + * @return values: on success the id for this name, -1 on failure */ int map_name2id(struct name_map_t * map, int size, const str * name); @@ -61,7 +61,7 @@ int map_name2id(struct name_map_t * map, int size, const str * name); * @param size the size of the list * @param id the id, we are looking for * - * @return values: on succcess the name for this id, NULL on failure + * @return values: on success the name for this id, NULL on failure */ str * map_id2name(struct name_map_t * map, int size, int id); diff --git a/src/modules/carrierroute/cr_rule.h b/src/modules/carrierroute/cr_rule.h index a80c0532981..6fb93857dcc 100644 --- a/src/modules/carrierroute/cr_rule.h +++ b/src/modules/carrierroute/cr_rule.h @@ -44,7 +44,7 @@ struct route_rule { double prob; /*!< The probability for that rule, only useful when using crc32 hashing */ double orig_prob; /*!< The original probability for that rule, only useful when using crc32 hashing */ str host; /*!< The new target host for the request */ - int strip; /*!< the number of digits to be stripped off from uri befor prepending prefix */ + int strip; /*!< the number of digits to be stripped off from uri before prepending prefix */ str local_prefix; /*!< the pefix to be attached to the new destination */ str local_suffix; /*!< the suffix to be appended to the localpart of the new destination */ str comment; /*!< A comment for the route rule */ diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index b35a24902d0..1176d9239fc 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -26,7 +26,7 @@ source is configurable, two different hash functions are available. - This modules scales up to more than a few million users, and is able to handle + This module scales up to more than a few million users, and is able to handle more than several hundred thousand routing table entries. We received reports of some setups that used more than a million routing table entries. It also supports a large number of carriers and domains which can be efficiently looked up in most of @@ -37,7 +37,7 @@ Routing tables can be reloaded and edited (in config file mode) with the RPC interface, the config file is updated according to the changes. This is not - implemented for the db interface, because its easier to do the changes + implemented for the db interface, because it is easier to do the changes directly on the db. But the reload and dump functions work of course here as well. @@ -80,7 +80,7 @@ a database module, when a database is used as configuration data source. Only SQL based databases are supported, as this module needs the capability to - issue raw queries. Its not possible to use the dbtext or db_berkeley module at the moment. + issue raw queries. It is not possible to use the dbtext or db_berkeley module at the moment. @@ -423,7 +423,7 @@ cr_tree_rewrite_uri(tree, domain) - dstvar - Name of the writaable config variable + dstvar - Name of the writable config variable (e.g., an AVP) where to store the carrier id. @@ -887,7 +887,7 @@ domain register { -2 gateways. For any (failure) reply code the respective next domain is chosen. After that no more failure routes are available, an error will be returned from the cr_next_domain function. Not all table - columns are show here for brevity. + columns are shown here for brevity. For each failure route domain and carrier that is added to the carrierfailureroute @@ -920,7 +920,7 @@ domain register { does forwarding according some flags, e.g. the customer came from a certain carrier, and has call-forwarding deactivated. In order to use the routing that is specified above, a matching carrierroute table must be provided, that holds - domain entries for this routing rules. Not all table columns are show here for + domain entries for this routing rules. Not all table columns are shown here for brevity. diff --git a/src/modules/carrierroute/doc/carrierroute_db.xml b/src/modules/carrierroute/doc/carrierroute_db.xml index fdc0ddfc45b..70d855f90cf 100644 --- a/src/modules/carrierroute/doc/carrierroute_db.xml +++ b/src/modules/carrierroute/doc/carrierroute_db.xml @@ -141,7 +141,7 @@ modparam("carrierroute", "carrierroute_mask_col", "mask") If all probabilities for a given prefix, tree and domain don't add to 100%, the prefix values will be adjusted according the given prob values. E.g. if three hosts with prob values of 0.5, 0.5 and 0.4 are defined, the resulting - probabilities are 35.714, 35.714 and 28.571%. But its better to choose meaningful + probabilities are 35.714, 35.714 and 28.571%. But it is better to choose meaningful values in the first place because of clarity. diff --git a/src/modules/carrierroute/prime_hash.c b/src/modules/carrierroute/prime_hash.c index 52af95ee6e7..b93cde1dc98 100644 --- a/src/modules/carrierroute/prime_hash.c +++ b/src/modules/carrierroute/prime_hash.c @@ -21,7 +21,7 @@ /*! * \file * \brief - * Functions for determinung a pseudo random number over a message's + * Functions for determining a pseudo random number over a message's * header field, based on CRC32 or a prime number algorithm. */ @@ -109,8 +109,8 @@ static int validate_msg(struct sip_msg * msg) { LM_ERR("Message has no From header\n"); return -1; } - //TODO it would make more sense to do the parsing just if its needed - // but parse_from_header is smart enough, so its probably not a huge problem + //TODO it would make more sense to do the parsing just if it is needed + // but parse_from_header is smart enough, so it is probably not a huge problem if (parse_from_header(msg) < 0) { LM_ERR("Error while parsing From header field\n"); return -1; diff --git a/src/modules/carrierroute/prime_hash.h b/src/modules/carrierroute/prime_hash.h index 5ec6f2530a4..4be5aef0928 100644 --- a/src/modules/carrierroute/prime_hash.h +++ b/src/modules/carrierroute/prime_hash.h @@ -22,7 +22,7 @@ /*! * \file * \brief - * Functions for determinung a pseudo random number over a message's + * Functions for determining a pseudo random number over a message's * header field, based on CRC32 or a prime number algorithm. */ @@ -64,7 +64,7 @@ typedef int (*hash_func_t)(struct sip_msg * msg, /*! * \brief CRC32 hash function * Returns an integer number between 0 and denominator - 1 based on - * the hash source from the msg. The hash algorith is CRC32. + * the hash source from the msg. The hash algorithm is CRC32. */ int hash_func (struct sip_msg * msg, enum hash_source source, int denominator); From 7194460e9d0dbe3e67e957d34b0e1b655e585311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:18:46 +0200 Subject: [PATCH 03/14] cdp: typos --- src/modules/cdp/authstatemachine.c | 8 ++++---- src/modules/cdp/configexample/ConfigExample.xml | 2 +- src/modules/cdp/diameter.h | 2 +- src/modules/cdp/diameter_avp.c | 8 ++++---- src/modules/cdp/diameter_ims.h | 2 +- src/modules/cdp/diameter_ims_code_cmd.h | 2 +- src/modules/cdp/diameter_msg.c | 4 ++-- src/modules/cdp/diameter_peer.c | 2 +- src/modules/cdp/doc/cdp_admin.xml | 2 +- src/modules/cdp/doc/cdp_devel.xml | 2 +- src/modules/cdp/peerstatemachine.c | 4 ++-- src/modules/cdp/receiver.c | 4 ++-- src/modules/cdp/session.c | 2 +- src/modules/cdp/session.h | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index db0e244b69b..c98198b6880 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -413,9 +413,9 @@ int auth_client_statefull_sm_process(cdp_session_t* s, int event, AAAMessage* ms Send_ASA(s, msg); break; - // Just added this because it might happen if the other peer doesnt + // Just added this because it might happen if the other peer doesn't // send a valid STA, then the session stays open forever... - // We dont accept that... we have lifetime+grace_period for that + // We don't accept that... we have lifetime+grace_period for that // This is not in the Diameter RFC ... case AUTH_EV_SESSION_TIMEOUT: case AUTH_EV_SESSION_GRACE_TIMEOUT: @@ -425,7 +425,7 @@ int auth_client_statefull_sm_process(cdp_session_t* s, int event, AAAMessage* ms LM_INFO("state machine: AUTH_EV_RECV_STA about to clean up\n"); if (msg) AAAFreeMessage(&msg); // if might be needed in frequency // If I register a ResponseHandler then i Free the STA there not here.. - // but i dont have interest in that now.. + // but I don't have interest in that now.. cdp_session_cleanup(s, NULL); s = 0; rv = 1; @@ -471,7 +471,7 @@ void auth_server_statefull_sm_process(cdp_session_t* s, int event, AAAMessage* m case AUTH_EV_RECV_REQ: // The RequestHandler will generate a Send event for the answer // and we will only then now if the user is authorised or not - // if its not authorised it will move back to idle and cleanup the session + // if it is not authorised it will move back to idle and cleanup the session // so no big deal // but this is not the Diameter RFC... x->state = AUTH_ST_OPEN; diff --git a/src/modules/cdp/configexample/ConfigExample.xml b/src/modules/cdp/configexample/ConfigExample.xml index 9a5d9312907..74c59d87ee0 100644 --- a/src/modules/cdp/configexample/ConfigExample.xml +++ b/src/modules/cdp/configexample/ConfigExample.xml @@ -51,7 +51,7 @@ > diff --git a/src/modules/cdp/diameter.h b/src/modules/cdp/diameter.h index 5a7cb0e0c53..575d196354e 100644 --- a/src/modules/cdp/diameter.h +++ b/src/modules/cdp/diameter.h @@ -104,7 +104,7 @@ (AVP_CODE_SIZE+AVP_FLAGS_SIZE+AVP_LENGTH_SIZE+\ AVP_VENDOR_ID_SIZE*(((_flags_)&AAA_AVP_FLAG_VENDOR_SPECIFIC)!=0) ) -/* mesage codes */ +/* message codes */ #ifndef __IS_BIG_ENDIAN #define AS_MSG_CODE 0x12010000 #define AC_MSG_CODE 0x0f010000 diff --git a/src/modules/cdp/diameter_avp.c b/src/modules/cdp/diameter_avp.c index ae66ab3e743..160dc9d1e7f 100644 --- a/src/modules/cdp/diameter_avp.c +++ b/src/modules/cdp/diameter_avp.c @@ -74,7 +74,7 @@ void set_avp_fields( AAA_AVPCode code, AAA_AVP *avp) avp->type = AAA_AVP_STRING_TYPE; break; case 27: /*AVP_Session_Timeout*/ - case 258: /*AVP_Auth_Aplication_Id*/ + case 258: /*AVP_Auth_Application_Id*/ case 262: /*AVP_Redirect_Max_Cache_Time*/ case 265: /*AVP_Supported_Vendor_Id*/ case 266: /*AVP_Vendor_Id*/ @@ -195,7 +195,7 @@ AAAReturnCode AAAAddAVPToMessage( } if (!position) { - /* insert at the begining */ + /* insert at the beginning */ avp->next = msg->avpList.head; avp->prev = 0; msg->avpList.head = avp; @@ -240,7 +240,7 @@ AAAReturnCode AAAAddAVPToMessage( /** * This function finds an AVP with matching code and vendor id. * @param msg - message to look into - * @param startAvp - where to start the search. Usefull when you want to find the next one. + * @param startAvp - where to start the search. Useful when you want to find the next one. * Even this one will be checked and can be returned if it fits. * @param avpCode - code of the AVP to match * @param vendorId - vendor id to match @@ -706,7 +706,7 @@ AAA_AVP_LIST AAAUngroupAVPS(str buf) /** * Find an avp into a list of avps. * @param avpList - the list to look into - * @param startAvp - where to start the search. Usefull when you want to find the next one. + * @param startAvp - where to start the search. Useful when you want to find the next one. * Even this one will be checked and can be returned if it fits. * @param avpCode - the AVP code to match * @param vendorId - the vendor id to match diff --git a/src/modules/cdp/diameter_ims.h b/src/modules/cdp/diameter_ims.h index 50a23b3f8a1..6003c63baa5 100644 --- a/src/modules/cdp/diameter_ims.h +++ b/src/modules/cdp/diameter_ims.h @@ -63,7 +63,7 @@ #define IMS_vendor_id_CableLabs_char "4491" /**< char value for ETSI's Vendor Id */ #define IMS_vendor_id_CableLabs_len 4 /**< len of char value for 3GPP's Vendor Id */ -/* Command Codes alocated for IMS */ +/* Command Codes allocated for IMS */ /* The Gq Interface */ #define IMS_AAR 265 /**< Bearer-Authorization Request */ #define IMS_AAA 265 /**< Bearer-Authorization Answer */ diff --git a/src/modules/cdp/diameter_ims_code_cmd.h b/src/modules/cdp/diameter_ims_code_cmd.h index ed0d60c53d6..48710875e76 100644 --- a/src/modules/cdp/diameter_ims_code_cmd.h +++ b/src/modules/cdp/diameter_ims_code_cmd.h @@ -45,7 +45,7 @@ #define __DIAMETER_IMS_CODE_CMD_H -/* Command Codes alocated for IMS */ +/* Command Codes allocated for IMS */ /* The Gq Interface */ #define IMS_AAR 265 /**< Bearer-Authorization Request */ #define IMS_AAA 265 /**< Bearer-Authorization Answer */ diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c index b9ac88954c7..c3a6480d60e 100644 --- a/src/modules/cdp/diameter_msg.c +++ b/src/modules/cdp/diameter_msg.c @@ -449,7 +449,7 @@ AAAReturnCode AAASetMessageResultCode( /** - * This function convert message from the network format to the AAAMessage structure (decoder). + * This function converts message from the network format to the AAAMessage structure (decoder). * @param source - the source char buffer * @param sourceLen - the length of the input buffer * @param attach_buf - whether to attach the input buffer to the message @@ -502,7 +502,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, msg_len = get_3bytes( ptr ); ptr += MESSAGE_LENGTH_SIZE; if (msg_len>sourceLen) { - LM_ERR("AAATranslateMessage: AAA message len [%d] bigger then" + LM_ERR("AAATranslateMessage: AAA message len [%d] bigger than" " buffer len [%d]\n",msg_len,sourceLen); goto error; } diff --git a/src/modules/cdp/diameter_peer.c b/src/modules/cdp/diameter_peer.c index 38386be5d94..1d42484898d 100644 --- a/src/modules/cdp/diameter_peer.c +++ b/src/modules/cdp/diameter_peer.c @@ -358,7 +358,7 @@ void diameter_peer_destroy() lock_release(shutdownx_lock); return; }else { - /* indicating that we are shuting down */ + /* indicating that we are shutting down */ *shutdownx = 1; lock_release(shutdownx_lock); } diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index 698e3e3c040..e8feef84173 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -272,7 +272,7 @@ if(!cdp_has_app("16777216")) {
cdp.enable_peer - enabe/re-enable a diameter peer + enable/re-enable a diameter peer
diff --git a/src/modules/cdp/doc/cdp_devel.xml b/src/modules/cdp/doc/cdp_devel.xml index 4c299de248a..c40988c510e 100644 --- a/src/modules/cdp/doc/cdp_devel.xml +++ b/src/modules/cdp/doc/cdp_devel.xml @@ -508,7 +508,7 @@ - AAA_AVP *startAvp - at which AVP to start the search. usefull + AAA_AVP *startAvp - at which AVP to start the search. Useful for looking for more of the same name diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index a4520d797d1..833eaf04eb5 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1259,8 +1259,8 @@ void Rcv_Process(peer *p, AAAMessage *msg) case ACCT_CC_CLIENT: if (is_req(msg)){ LM_WARN("unhandled receive request on Credit Control Acct session\n"); - AAASessionsUnlock(session->hash); //must be called because we dont call state machine here - session = 0; //we dont call SM here so we mustnt set to 0 + AAASessionsUnlock(session->hash); //must be called because we don't call state machine here + session = 0; //we don't call SM here so we must not set to 0 } else { cc_acc_client_stateful_sm_process(session, ACC_CC_EV_RECV_ANS, msg); session = 0; diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 7098f848a08..a43a8904801 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -446,7 +446,7 @@ int receiver_init(peer *p) } /** - * The Receiver Process - calls the receiv_loop and it never returns. + * The Receiver Process - calls the receive_loop and it never returns. * @param p - the peer it is associated with or NULL for the unknown peers receiver * @returns never, when disconnected it will exit */ @@ -470,7 +470,7 @@ void receiver_process(peer *p) done: if (!*shutdownx){ - LM_INFO("receiver_process(): [%.*s]... Receiver process cleaning-up - should not happen unless shuting down!\n", + LM_INFO("receiver_process(): [%.*s]... Receiver process cleaning-up - should not happen unless shutting down!\n", p?p->fqdn.len:0,p?p->fqdn.s:0); } diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index 01ce8614432..ce286107a66 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -453,7 +453,7 @@ int cdp_sessions_timer(time_t now, void* ptr) int res_valid_for = x->u.cc_acc.reserved_units_validity_time; int last_reservation = x->u.cc_acc.reserved_units; int buffer_time = 15; //15 seconds - TODO: add as config parameter - //we should check for reservation expiries if the state is open + //we should check for reservation expiring if the state is open if(x->u.cc_acc.state==ACC_CC_ST_OPEN){ if (last_res_timestamp) { //we have obv already started reservations diff --git a/src/modules/cdp/session.h b/src/modules/cdp/session.h index 701fb426531..16da177c010 100644 --- a/src/modules/cdp/session.h +++ b/src/modules/cdp/session.h @@ -125,7 +125,7 @@ typedef struct _cdp_auth_session_t { time_t lifetime; /**< absolute time for auth lifetime -1 means forever */ time_t grace_period; /**< grace_period in seconds */ unsigned int last_requested_lifetime; /**< the following 3 timers are used to store what we are */ - unsigned int last_requested_timeout; /** Date: Sun, 2 Apr 2023 15:20:58 +0200 Subject: [PATCH 04/14] cnxcc: typos --- src/modules/cnxcc/doc/cnxcc_admin.xml | 2 +- src/modules/cnxcc/example/kamailio-cnxcc.cfg | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 322a227bfb7..2be0abdb541 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -450,7 +450,7 @@ if (!cnxcc_terminate_all("$var(customer)")) {
cnxcc.check_client - Retrives all calls from a particular identifier. + Retrieves all calls from a particular identifier. Parameters: client/customer identifier diff --git a/src/modules/cnxcc/example/kamailio-cnxcc.cfg b/src/modules/cnxcc/example/kamailio-cnxcc.cfg index 9b11b26a8dc..236b2384902 100644 --- a/src/modules/cnxcc/example/kamailio-cnxcc.cfg +++ b/src/modules/cnxcc/example/kamailio-cnxcc.cfg @@ -6,12 +6,12 @@ # # Kamailio SIP Server v3.2 - default configuration script -# - web: http://www.kamailio.org +# - web: https://www.kamailio.org # - git: http://sip-router.org # # Direct your questions about this file to: # -# Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php +# Refer to the Core CookBook at https://www.kamailio.org/w/documentation/ # for an explanation of possible statements, functions and parameters. # # Several features can be enabled using '#!define WITH_FEATURE' directives: @@ -321,7 +321,7 @@ modparam("registrar", "max_expires", 3600) modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) -/* by default ww do not adjust the direct of the sequential requests. +/* by default we do not adjust the direct of the sequential requests. if you enable this parameter, be sure the enable "append_fromtag" in "rr" module */ modparam("acc", "detect_direction", 0) @@ -984,7 +984,7 @@ route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { - xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n"); + xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } @@ -1036,7 +1036,7 @@ route[TOVOICEMAIL] { # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { - xlog("SCRIPT: VoiceMail rotuing enabled but IP not defined\n"); + xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if($avp(oexten)==$null) From e4dea16cb2b2c756213aef60c11a1597636d51cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:22:43 +0200 Subject: [PATCH 05/14] cplp: typos --- src/modules/cplc/cpl_env.h | 4 ++-- src/modules/cplc/cpl_nonsig.c | 12 ++++++------ src/modules/cplc/cpl_proxy.h | 4 ++-- src/modules/cplc/cplc.c | 2 +- src/modules/cplc/doc/cplc_admin.xml | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/modules/cplc/cpl_env.h b/src/modules/cplc/cpl_env.h index 7dc03d2bdb6..46367b5235e 100644 --- a/src/modules/cplc/cpl_env.h +++ b/src/modules/cplc/cpl_env.h @@ -33,7 +33,7 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/sl/sl.h" -struct cpl_enviroment { +struct cpl_environment { char *log_dir; /* dir where the user log should be dumped */ int proxy_recurse; /* numbers of proxy redirection accepted */ int proxy_route; /* script route to be run before proxy */ @@ -59,7 +59,7 @@ struct cpl_functions { sl_api_t slb; /* Structure with pointers to sl funcs */ }; -extern struct cpl_enviroment cpl_env; +extern struct cpl_environment cpl_env; extern struct cpl_functions cpl_fct; #endif diff --git a/src/modules/cplc/cpl_nonsig.c b/src/modules/cplc/cpl_nonsig.c index 4a97dc65110..ed3109567c7 100644 --- a/src/modules/cplc/cpl_nonsig.c +++ b/src/modules/cplc/cpl_nonsig.c @@ -43,8 +43,8 @@ #define MAX_LOG_FILE_NAME 32 -#define FILE_NAME_SUFIX ".log" -#define FILE_NAME_SUFIX_LEN (sizeof(FILE_NAME_SUFIX)-1) +#define FILE_NAME_SUFFIX ".log" +#define FILE_NAME_SUFFIX_LEN (sizeof(FILE_NAME_SUFFIX)-1) #define LOG_SEPARATOR ": " #define LOG_SEPARATOR_LEN (sizeof(LOG_SEPARATOR)-1) @@ -56,7 +56,7 @@ #define LOG_TERMINATOR_LEN (sizeof(LOG_TERMINATOR)-1) -static char file[MAX_LOG_DIR_SIZE+1+MAX_LOG_FILE_NAME+FILE_NAME_SUFIX_LEN+1]; +static char file[MAX_LOG_DIR_SIZE+1+MAX_LOG_FILE_NAME+FILE_NAME_SUFFIX_LEN+1]; static char *file_ptr; @@ -72,8 +72,8 @@ static inline void write_log( struct cpl_cmd *cmd) if (cmd->s1.len>MAX_LOG_FILE_NAME) cmd->s1.len = MAX_LOG_FILE_NAME; memcpy(file_ptr, cmd->s1.s, cmd->s1.len ); - memcpy(file_ptr+cmd->s1.len,FILE_NAME_SUFIX,FILE_NAME_SUFIX_LEN); - file_ptr[cmd->s1.len+FILE_NAME_SUFIX_LEN] = 0; + memcpy(file_ptr+cmd->s1.len,FILE_NAME_SUFFIX,FILE_NAME_SUFFIX_LEN); + file_ptr[cmd->s1.len+FILE_NAME_SUFFIX_LEN] = 0; /* get current date+time -> wr_vec[0] */ time( &now ); @@ -192,7 +192,7 @@ static inline void send_mail( struct cpl_cmd *cmd) /* just debug */ for(i=0;i free the shm */ + /* once I copy locally all the data from shm mem -> free the shm */ shm_free( cmd->s1.s ); /* set an alarm -> sending the email shouldn't take more than 10 sec */ diff --git a/src/modules/cplc/cpl_proxy.h b/src/modules/cplc/cpl_proxy.h index aaf2f8132a6..38763bdf69d 100644 --- a/src/modules/cplc/cpl_proxy.h +++ b/src/modules/cplc/cpl_proxy.h @@ -153,7 +153,7 @@ static void reply_callback( struct cell* t, int type, struct tmcb_params* ps) if (type&TMCB_RESPONSE_OUT) { /* the purpose of the final reply is to trash down the interpreter - * structure! it's the safest place to do that, since this callback + * structure! It's the safest place to do that, since this callback * it's called only once per transaction for final codes (>=200) ;-) */ if (ps->code>=200) { LM_DBG("code=%d, final reply received\n", ps->code); @@ -168,7 +168,7 @@ static void reply_callback( struct cell* t, int type, struct tmcb_params* ps) goto exit; } - LM_DBG("negativ reply received\n"); + LM_DBG("negative reply received\n"); intr->flags |= CPL_PROXY_DONE; intr->msg = ps->req; diff --git a/src/modules/cplc/cplc.c b/src/modules/cplc/cplc.c index fce3ab6b45d..aa822b40c82 100644 --- a/src/modules/cplc/cplc.c +++ b/src/modules/cplc/cplc.c @@ -66,7 +66,7 @@ static str timer_avp = STR_NULL; /* name of variable timer AVP */ static str proxy_route = STR_NULL; static str redirect_route = STR_NULL; -struct cpl_enviroment cpl_env = { +struct cpl_environment cpl_env = { 0, /* no cpl logging */ 0, /* recurse proxy level is 0 */ 0, /* no script route to be run before proxy */ diff --git a/src/modules/cplc/doc/cplc_admin.xml b/src/modules/cplc/doc/cplc_admin.xml index 403c71238ae..4c2aa4c00e2 100644 --- a/src/modules/cplc/doc/cplc_admin.xml +++ b/src/modules/cplc/doc/cplc_admin.xml @@ -500,7 +500,7 @@ modparam("cplc","ignore3xx",1) guaranty that the CPL script interpretation ended when &kamailio; script ended also (for the same INVITE ;-)) - this can happen when the CPL script does a PROXY and the script interpretation - pause after proxying and it will be resume when some reply is + pause after proxying and it will be resumed when some reply is received (this can happen in a different process of SER). If the function returns to script, the SIP server should continue with the normal behavior as if no script existed. @@ -555,7 +555,7 @@ modparam("cplc","ignore3xx",1) can continue in stateful mode); is_stateless is the fastest and less resources consumer (transaction is created only if proxying is done), but there is minimal protection against - retransmissions (since replies are send stateless); + retransmissions (since replies are sent stateless); force_stateful is a good compromise - all signaling is done stateful (retransmission protection) and in the same time, if returning to script, it will be in stateless mode (easy to @@ -591,7 +591,7 @@ cpl_run_script("incoming","force_stateful"); checks if the current REGISTER request is related or not with CPL script upload/download/ remove. If it is, all the needed operation will be done. For checking if the REGISTER is CPL - related, the function looks fist to "Content-Type" header. If + related, the function looks first to "Content-Type" header. If it exists and has a the mime type set to "application/cpl+xml" means this is a CPL script upload/remove operation. The distinction between to case is made by looking at @@ -599,9 +599,9 @@ cpl_run_script("incoming","force_stateful"); "script;action=store", means it's an upload; if it's "script;action=remove", means it's a remove operation; other values are considered to be errors. If no "Content-Type" - header is present, the function looks to "Accept" header and - if it contains the "*" or "application/cpl-xml" the request - it will be consider one for downloading CPL scripts. + header is present, the function looks for "Accept" header and + if it contains "*" or "application/cpl-xml" the request + will be considered for downloading CPL scripts. The functions returns to script only if the REGISTER is not related to CPL. In other case, the function will send by itself the necessary replies (stateless - using sl), including From 8e598f00cf954712bf0a0c0e31cd7a5b47bc1aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:24:08 +0200 Subject: [PATCH 06/14] ctl: typos --- src/modules/ctl/binrpc.h | 8 ++++---- src/modules/ctl/binrpc_run.c | 10 +++++----- src/modules/ctl/ctl.cfg | 2 +- src/modules/ctl/fifo_server.c | 6 +++--- src/modules/ctl/io_listener.c | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 7d77ce6568f..c3b8c4811e6 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -31,14 +31,14 @@ * represented) * CL = cookie length -1 (number of bytes on which the cookie is represented) * E.g.: LL= 0 => total_len is represented on 1 byte (LL+1) - * CL= 3 => cookie is represneted on 4 bytes (CL+1) + * CL= 3 => cookie is represented on 4 bytes (CL+1) */ /* record format: * 1b 3b 4b * |S | size | type || ... || ... || * * if S==0, size is the size (in bytes) of the value (if size==0 => null value) - * if S==1, optional_value_len is present, and size is it's size + * if S==1, optional_value_len is present, and size is its size * (if size==0 => and type==array or struct => marks end, else * error, reserved) * Examples: @@ -344,7 +344,7 @@ inline static int binrpc_build_hdr( int type, int body_len, -/* changes the length of a header (enough space must be availale) */ +/* changes the length of a header (enough space must be available) */ inline static int binrpc_hdr_change_len(unsigned char* hdr, int hdr_len, int new_len) { @@ -417,7 +417,7 @@ inline static int binrpc_add_skip(struct binrpc_pkt* pkt, int bytes) * adds only the string mark and len, you'll have to memcpy the contents * manually later (and also use binrpc_add_skip(pkt, l) or increase * pkt->crt directly if you want to continue adding to this pkt). - * Usefull for optimizing str writing (e.g. writev(iovec)) + * Useful for optimizing str writing (e.g. writev(iovec)) * WARNING: use with care, low level function, binrpc_addstr or * binrpc_add_str_type are probably what you want. * WARNING1: BINRPC_T_STR and BINRPC_T_AVP must be 0 term, the len passed to diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 41c501320d4..3265a63c2ab 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -420,7 +420,7 @@ static void _rpc_fault(struct binrpc_ctx* ctx, int code, if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" - " more then once\n", ctx->method?ctx->method:""); + " more than once\n", ctx->method?ctx->method:""); return; } err=0; @@ -483,7 +483,7 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" - " more then once\n", ctx->method?ctx->method:""); + " more than once\n", ctx->method?ctx->method:""); return; } va_start(ap, fmt); @@ -505,7 +505,7 @@ static int rpc_fault_prepare(struct binrpc_ctx* ctx, int code, char* fmt, ...) if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" - " more then once\n", ctx->method?ctx->method:""); + " more than once\n", ctx->method?ctx->method:""); return -1; } va_start(ap, fmt); @@ -576,7 +576,7 @@ static int rpc_send(struct binrpc_ctx* ctx) if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" - " more then once\n", ctx->method?ctx->method:""); + " more than once\n", ctx->method?ctx->method:""); goto error; } b_len=body_get_len(&ctx->out.pkt, &ctx->out.structs); @@ -617,7 +617,7 @@ static int rpc_send(struct binrpc_ctx* ctx) * needed (after bytes_needed new bytes received this * function will be called again * reply, - buffer where the reply will be written - * reply_len - intially filled with the reply buffer len, + * reply_len - initially filled with the reply buffer len, * after the call will contain how much of that * buffer was really used * returns: number of bytes processed on success/partial success diff --git a/src/modules/ctl/ctl.cfg b/src/modules/ctl/ctl.cfg index 4966e7c4db2..7e4fe2e210e 100644 --- a/src/modules/ctl/ctl.cfg +++ b/src/modules/ctl/ctl.cfg @@ -44,7 +44,7 @@ modparam("ctl", "binrpc", "tcp:3012") # tcp any , port 3012 modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 # old fifo support -modparam("ctl", "fifo", "fifo:/tmp/ser_fifo") # clasic fifo +modparam("ctl", "fifo", "fifo:/tmp/ser_fifo") # classic fifo modparam("ctl", "fifo", "/tmp/ser_fifo2") modparam("ctl", "fifo", "udp:*:2050") # fifo protocol over udp modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 584ec624f49..0d9e7bcbe03 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -110,7 +110,7 @@ struct readline_handle{ enum text_flags { CHUNK_SEEN = (1 << 0), - CHUNK_POSITIONAL = (1 << 1), /* Positinal parameter, should be followed by \n */ + CHUNK_POSITIONAL = (1 << 1), /* Positional parameter, should be followed by \n */ CHUNK_MEMBER_NAME = (1 << 2), /* Struct member name, should be followed by : */ CHUNK_MEMBER_VALUE = (1 << 3) /* Struct member value, should be followed by , if * there is another member name and \n if not */ @@ -178,7 +178,7 @@ static int rpc_send (rpc_ctx_t* ctx); / static void rpc_fault (rpc_ctx_t* ctx, int code, char* fmt, ...); /* Signal a failure to the client */ static int rpc_add (rpc_ctx_t* ctx, char* fmt, ...); /* Add a new piece of data to the result */ static int rpc_scan (rpc_ctx_t* ctx, char* fmt, ...); /* Retrieve request parameters */ -static int rpc_rpl_printf (rpc_ctx_t* ctx, char* fmt, ...); /* Add printf-like formated data to the result set */ +static int rpc_rpl_printf (rpc_ctx_t* ctx, char* fmt, ...); /* Add printf-like formatted data to the result set */ static int rpc_struct_add (struct text_chunk* s, char* fmt, ...); /* Create a new structure */ static int rpc_struct_scan (struct rpc_struct* s, char* fmt, ...); /* Scan attributes of a structure */ static int rpc_struct_printf(struct text_chunk* s, char* name, char* fmt, ...); @@ -457,7 +457,7 @@ static struct rpc_struct* new_struct(rpc_ctx_t* ctx, str* line) /* Create value chunk */ v = new_chunk_unescape(&value); if (!v) { - rpc_fault(ctx, 400, "Error while processing struct membeer '%.*s'" + rpc_fault(ctx, 400, "Error while processing struct member '%.*s'" " on line %d", name.len, ZSW(name.s), ctx->line_no); goto err; } diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index 64f74a80d03..5de2e9cb05f 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -323,7 +323,7 @@ void io_listen_loop(int fd_no, struct ctrl_socket* cs_lst) * from this fd (e.g.: we are closing it ) * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). - * Usefull to detect when there are no more io events queued for + * Useful to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. * >0 on successfull read from the fd (when there might be more io * queued -- the receive buffer might still be non-empty) @@ -382,7 +382,7 @@ static int handle_ctrl_dgram(struct ctrl_socket* cs) * from this fd (e.g.: we are closing it ) * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). - * Usefull to detect when there are no more io events queued for + * Useful to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. * >0 on successfull accept from the fd (when there might be more io * queued -- the receive buffer might still be non-empty) @@ -458,7 +458,7 @@ static int handle_new_connect(struct ctrl_socket* cs) * from this fd (e.g.: we are closing it ) * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). - * Usefull to detect when there are no more io events queued for + * Useful to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. * >0 on successfull read from the fd (when there might be more io * queued -- the receive buffer might still be non-empty) @@ -572,7 +572,7 @@ static int handle_stream_read(struct stream_connection* s_c, int idx) * from this fd (e.g.: we are closing it ) * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). - * Usefull to detect when there are no more io events queued for + * Useful to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. * >0 on successfull read from the fd (when there might be more io * queued -- the receive buffer might still be non-empty) @@ -685,7 +685,7 @@ static int handle_fifo_read(struct ctrl_socket* cs, int idx) * return: -1 on error * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). - * Usefull to detect when there are no more io events queued for + * Useful to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. * >0 on successfull read from the fd (when there might be more io * queued -- the receive buffer might still be non-empty) From ed6e12567ce364d5d7507592714861784c65f7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:24:52 +0200 Subject: [PATCH 07/14] corex: typos --- src/modules/corex/corex_mod.c | 2 +- src/modules/corex/doc/corex_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 7e61f1f93d7..c0cf7cac0d5 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -1142,7 +1142,7 @@ static int ki_has_ruri_user(sip_msg_t *msg) if(msg==NULL) return -1; - if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have a ruri */ + if(msg->first_line.type == SIP_REPLY) /* REPLY doesn't have a ruri */ return -1; if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) { diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 2675a559aca..0346c2bc3fd 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -567,7 +567,7 @@ setxflag("$var(flag)");
<function moreinfo="none">isxflagset(flag)</function> - Return true of the extended message (transaction) flag is set. + Return true if the extended message (transaction) flag is set. Meaning of the parameters is as follows: From 8ade5fc3514aba0a89dfd66b376af42e750d0432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:25:21 +0200 Subject: [PATCH 08/14] crypto: typo --- src/modules/crypto/crypto_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 2099b25148c..35f84d6c3f8 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -493,7 +493,7 @@ static int ki_crypto_aes_decrypt_helper(sip_msg_t* msg, str *ins, str *keys, (unsigned char *)etext.s, pv_get_buffer_size()-1); if (etext.len < 0) { EVP_CIPHER_CTX_free(de); - LM_ERR("base64 inpuy with encrypted value is too large (need %d)\n", + LM_ERR("base64 input with encrypted value is too large (need %d)\n", -etext.len); return -1; } From d33334b3cd382b405dfaeda758c531fffc75cf90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:25:49 +0200 Subject: [PATCH 09/14] enum: typos --- src/modules/enum/doc/enum_admin.xml | 2 +- src/modules/enum/enum.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/enum/doc/enum_admin.xml b/src/modules/enum/doc/enum_admin.xml index 46e68f14f2c..34e848dd4c9 100644 --- a/src/modules/enum/doc/enum_admin.xml +++ b/src/modules/enum/doc/enum_admin.xml @@ -362,7 +362,7 @@ enum_pv_query("$avp(i:100)","e164.arpa.","+sip+voice:sip"); The function performs an enum query and rewrites the Request-URI with - the result of the query. This the Infrastructure-ENUM version of enum_query(). + the result of the query. This is the Infrastructure-ENUM version of enum_query(). The only difference to enum_query() is in the calculation of the FQDN where NAPTR records are looked for. diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index 7d1d1553fb1..c292c195d9a 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -209,7 +209,7 @@ static inline int sip_match(struct naptr_rdata *naptr, str *service) && (strncasecmp(naptr->services + 4 + service->len, ":sip", 4) == 0); } else { /* handle compound NAPTRs and multiple services */ - str bakservice, baknaptr; /* we bakup the str */ + str bakservice, baknaptr; /* we backup the str */ int naptrlen, len; /* length of the extracted service */ /* RFC 3761, NAPTR service field must start with E2U+ */ From 8322f37c6dcbb80d29b78d33749fd2275825d6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:26:20 +0200 Subject: [PATCH 10/14] evapi: typo --- src/modules/evapi/doc/evapi_admin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evapi/doc/evapi_admin.xml b/src/modules/evapi/doc/evapi_admin.xml index 04ea4efd214..9d2f1e3a694 100644 --- a/src/modules/evapi/doc/evapi_admin.xml +++ b/src/modules/evapi/doc/evapi_admin.xml @@ -251,7 +251,7 @@ evapi_relay("{ \"event\": \"test\",\n \"data\": { \"fU\": \"$fU\" }\n}"); - The above exaple will send the following message over tcp: + The above example will send the following message over tcp: TCP message From 65468e82684ae4a5bbfc6a21148dce457171a439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:26:39 +0200 Subject: [PATCH 11/14] exec: typo --- src/modules/exec/kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/exec/kill.c b/src/modules/exec/kill.c index dc6c0090e1a..98ceafe9cce 100644 --- a/src/modules/exec/kill.c +++ b/src/modules/exec/kill.c @@ -26,7 +26,7 @@ * Module: \ref exec * * in this file, we implement the ability to send a kill signal to - * a child after some time; its a quick ugly hack, for example kill + * a child after some time; it is a quick ugly hack, for example kill * is sent without any knowledge whether the kid is still alive * * also, it was never compiled without FAST_LOCK -- nothing will From efdec54d2efdb062b1dfac5544b92af0806afbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:28:26 +0200 Subject: [PATCH 12/14] htable: typos --- src/modules/htable/doc/htable_admin.xml | 8 ++++---- src/modules/htable/ht_db.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 0493f422567..84f20e7b328 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -357,7 +357,7 @@ $ kamcmd htable.dump htable autoexpire -time in seconds to delete an item - from a hash table if no update was done to it. If is missing or set + from a hash table if no update was done to it. If it is missing or set to 0, the items won't expire. @@ -793,7 +793,7 @@ sht_print(); Delete the item with the name 'itname' from hash table 'htname'. - This API function equivaluent to '$sht(htname=>itname) = $null'. + This API function is equivalent to '$sht(htname=>itname) = $null'. This function can be used from ANY_ROUTE. @@ -1559,10 +1559,10 @@ kamcmd htable.seti test x[0] 123 ... -# set expire for $sht(test=>x) to 120 secs +# set expire for $sht(test=>x) to 120 secs kamctl rpc htable.setex test x 120 -# set expire for $sht(test=>10) to 120 secs +# set expire for $sht(test=>10) to 120 secs kamctl rpc htable.setex test s:10 120 ... diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 1f9dac458c6..db2a52ce8b1 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -648,7 +648,7 @@ int ht_db_save_table(ht_t *ht, str *dbtable) /** - * delete databse table + * delete database table */ int ht_db_delete_records(str *dbtable) { From 83f06ab100e7e4de78c4afbacaa1cf1c6aa885a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:29:07 +0200 Subject: [PATCH 13/14] http_async_client: typos --- src/modules/http_async_client/doc/http_async_client_admin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index f28ea0ce249..f514986725d 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -431,7 +431,7 @@ route[HTTP_REPLY] {
Pseudo Variables - The $http_req_id read-only variable can be used in REQUEST_ROUTE to retrive the unique identifier for a query after sending it or in the HTTP callback route to retrive the id of the query the reply belongs to. Useful mainly in non-transactional context. + The $http_req_id read-only variable can be used in REQUEST_ROUTE to retrieve the unique identifier for a query after sending it or in the HTTP callback route to retrieve the id of the query the reply belongs to. Useful mainly in non-transactional context. <literal>$http_req_id</literal> variable usage From 34aec010b5fccd03974954b70a0c8e2a7047602e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 2 Apr 2023 15:32:18 +0200 Subject: [PATCH 14/14] http_client: typos --- src/modules/http_client/TODO.txt | 6 +++--- src/modules/http_client/doc/http_client_admin.xml | 10 +++++----- src/modules/http_client/http_client.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/http_client/TODO.txt b/src/modules/http_client/TODO.txt index 3a23dd87311..d1a3617e68a 100644 --- a/src/modules/http_client/TODO.txt +++ b/src/modules/http_client/TODO.txt @@ -84,7 +84,7 @@ Development API match_header[len]= '\0'; https://curl.haxx.se/libcurl/c/CURLOPT_HEADERFUNCTION.html -- It also does get a headers from the reply, which needs a callback +- It also does get a header from the reply, which needs a callback - auth_identify sets the CURLOPT_CAINFO option https://curl.haxx.se/libcurl/c/CURLOPT_CAINFO.html This can be set in the httpconf object @@ -103,11 +103,11 @@ Solved issues -------------- - https://github.com/kamailio/kamailio/issues/541 - closed Support setting proxy - Comitted another patch, which included default and per-connection proxy + Committed another patch, which included default and per-connection proxy settings. - https://github.com/kamailio/kamailio/issues/515 - closed Support various auth methods - digest, basic etc - Comitted another patch, which included default and per-connection settings + Committed another patch, which included default and per-connection settings - https://github.com/kamailio/kamailio/pull/481 - closed Support TLS client certificates - https://github.com/kamailio/kamailio/pull/435 - closed diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 446b68a00f7..9da71d5210e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -23,7 +23,7 @@ servers and a set of settings that apply to the specific connection. - The http_client module has multiple settings, some of them applies to + The http_client module has multiple settings, some of them apply to a defined connection. You can set timeouts, max data sizes for download and much more either using modparam settings or parameters to the connection definition. @@ -46,7 +46,7 @@ this module. - The http_client module use the CURL library setting up connections. + The http_client module uses the CURL library setting up connections. The CURL library by default use the system configured DNS resolvers, not the Kamailio resolver. @@ -731,7 +731,7 @@ modparam("http_client", "netinterface", "eth0") <function>http_connect()</function> usage ... -modparam("http_client", "httpcon", "apiserver=>http://kamailio.org/api/"); +modparam("http_client", "httpcon", "apiserver=>https://kamailio.org/api/"); ... # POST Request $var(res) = http_connect("apiserver", "/mailbox", "application/json", "{ ok, {200, ok}}", "$avp(gurka)"); @@ -792,7 +792,7 @@ xlog("L_INFO", "API-server HTTP connection: $avp(route) Result code $var(res)\n" <function>http_connect_raw()</function> usage ... -modparam("http_client", "httpcon", "apiserver=>http://kamailio.org/api/"); +modparam("http_client", "httpcon", "apiserver=>https://kamailio.org/api/"); ... # POST Request $var(res) = http_connect_raw("apiserver", "/mailbox", "application/json", "{ ok, {200, ok}}", "$avp(gurka)"); @@ -863,7 +863,7 @@ http_get_redirect("apiserver", "$var(targeturl)"); the first line or the entire reply body (if any) is stored in result parameter, which must be a writable pseudo variable. See the query_result - parameter for controling what value to be stored in the result + parameter for controlling what value to be stored in the result variable. diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 3064f5ac3e0..01c7067ae6f 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -693,7 +693,7 @@ static int ki_curl_connect_post_helper(sip_msg_t *_m, str *con, str *url, if(dst->setf) { dst->setf(_m, &dst->pvp, (int)EQ_T, &val); } else { - LM_WARN("target pv is not writtable\n"); + LM_WARN("target pv is not writable\n"); } if(result.s != NULL)