sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:d8bd9825: mqueue: Add rpc mqueue.sizes

by Alex Hermann

Module: kamailio Branch: master Commit: d8bd9825fa401ad0a3489d246f29d05485b72831 URL: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:29:40+02:00 mqueue: Add rpc mqueue.sizes Return sizes for all queues --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… Patch: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 5309098058..7d785ac90b 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -300,6 +300,24 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); ... &kamcmd; mqueue.fetch xyz ... +</programlisting> + </example> + </section> + + <section id="mqueue.r.get_sizes"> + <title>mqueue.get_sizes</title> + <para> + Get the size for all memory queues. + </para> + <para> + Parameters: none + </para> + <example> + <title><function>mqueue.get_sizes</function> usage</title> + <programlisting format="linespecific"> +... +&kamcmd; mqueue.get_sizes +... </programlisting> </example> </section> diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 93204bba3c..4dd61c3e72 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -173,6 +173,9 @@ mq_head_t *mq_head_get(str *name) mq_head_t *mh = NULL; mh = _mq_head_list; + if (!name) { + return mh; + } while(mh!=NULL) { if(name->len == mh->name.len diff --git a/src/modules/mqueue/mqueue_api.h b/src/modules/mqueue/mqueue_api.h index 843a7d7967..d60dfdf29a 100644 --- a/src/modules/mqueue/mqueue_api.h +++ b/src/modules/mqueue/mqueue_api.h @@ -77,6 +77,7 @@ int mq_head_add(str *name, int msize); int mq_head_fetch(str *name); void mq_pv_free(str *name); int mq_item_add(str *qname, str *key, str *val); +mq_head_t *mq_head_get(str *name); int _mq_get_csize(str *); int mq_set_dbmode(str *, int dbmode); diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index e3b984484e..325c84b472 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -327,6 +327,34 @@ static const char* mqueue_rpc_get_size_doc[2] = { 0 }; +static void mqueue_rpc_get_sizes(rpc_t* rpc, void* ctx) +{ + mq_head_t* mh = mq_head_get(NULL); + void* vh; + int size; + + while(mh!=NULL) + { + if (rpc->add(ctx, "{", &vh) < 0) { + rpc->fault(ctx, 500, "Server error"); + return; + } + lock_get(&mh->lock); + size = mh->csize; + lock_release(&mh->lock); + rpc->struct_add(vh, "Sd", + "name", &mh->name, + "size", size + ); + mh = mh->next; + } +} + +static const char* mqueue_rpc_get_sizes_doc[2] = { + "Get sizes of all mqueues.", + 0 +}; + static void mqueue_rpc_fetch(rpc_t* rpc, void* ctx) { str mqueue_name; @@ -392,6 +420,7 @@ static const char* mqueue_rpc_fetch_doc[2] = { rpc_export_t mqueue_rpc[] = { {"mqueue.get_size", mqueue_rpc_get_size, mqueue_rpc_get_size_doc, 0}, + {"mqueue.get_sizes", mqueue_rpc_get_sizes, mqueue_rpc_get_sizes_doc, RET_ARRAY}, {"mqueue.fetch", mqueue_rpc_fetch, mqueue_rpc_fetch_doc, 0}, {0, 0, 0, 0} };

3 years, 9 months

git:master:e676498f: Merge pull request #2514 from gaaf/features/mqueue

by GitHub

Module: kamailio Branch: master Commit: e676498f4d0a46ae81e4e07e56ff64c97a075faf URL: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-20T13:52:13+02:00 Merge pull request #2514 from gaaf/features/mqueue mqueue: RPC features --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… Patch: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 5309098058..7d785ac90b 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -300,6 +300,24 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); ... &kamcmd; mqueue.fetch xyz ... +</programlisting> + </example> + </section> + + <section id="mqueue.r.get_sizes"> + <title>mqueue.get_sizes</title> + <para> + Get the size for all memory queues. + </para> + <para> + Parameters: none + </para> + <example> + <title><function>mqueue.get_sizes</function> usage</title> + <programlisting format="linespecific"> +... +&kamcmd; mqueue.get_sizes +... </programlisting> </example> </section> diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 93204bba3c..4dd61c3e72 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -173,6 +173,9 @@ mq_head_t *mq_head_get(str *name) mq_head_t *mh = NULL; mh = _mq_head_list; + if (!name) { + return mh; + } while(mh!=NULL) { if(name->len == mh->name.len diff --git a/src/modules/mqueue/mqueue_api.h b/src/modules/mqueue/mqueue_api.h index 843a7d7967..d60dfdf29a 100644 --- a/src/modules/mqueue/mqueue_api.h +++ b/src/modules/mqueue/mqueue_api.h @@ -77,6 +77,7 @@ int mq_head_add(str *name, int msize); int mq_head_fetch(str *name); void mq_pv_free(str *name); int mq_item_add(str *qname, str *key, str *val); +mq_head_t *mq_head_get(str *name); int _mq_get_csize(str *); int mq_set_dbmode(str *, int dbmode); diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 860014cca9..325c84b472 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -294,13 +294,13 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) int mqueue_sz = 0; if (rpc->scan(ctx, "S", &mqueue_name) < 1) { - rpc->fault(ctx, 500, "No queue name"); + rpc->fault(ctx, 400, "No queue name"); return; } if(mqueue_name.len <= 0 || mqueue_name.s == NULL) { LM_ERR("bad mqueue name\n"); - rpc->fault(ctx, 500, "Invalid queue name"); + rpc->fault(ctx, 400, "Invalid queue name"); return; } @@ -308,7 +308,7 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) if(mqueue_sz < 0) { LM_ERR("no such mqueue\n"); - rpc->fault(ctx, 500, "No such queue"); + rpc->fault(ctx, 404, "No such queue"); return; } @@ -327,6 +327,34 @@ static const char* mqueue_rpc_get_size_doc[2] = { 0 }; +static void mqueue_rpc_get_sizes(rpc_t* rpc, void* ctx) +{ + mq_head_t* mh = mq_head_get(NULL); + void* vh; + int size; + + while(mh!=NULL) + { + if (rpc->add(ctx, "{", &vh) < 0) { + rpc->fault(ctx, 500, "Server error"); + return; + } + lock_get(&mh->lock); + size = mh->csize; + lock_release(&mh->lock); + rpc->struct_add(vh, "Sd", + "name", &mh->name, + "size", size + ); + mh = mh->next; + } +} + +static const char* mqueue_rpc_get_sizes_doc[2] = { + "Get sizes of all mqueues.", + 0 +}; + static void mqueue_rpc_fetch(rpc_t* rpc, void* ctx) { str mqueue_name; @@ -392,6 +420,7 @@ static const char* mqueue_rpc_fetch_doc[2] = { rpc_export_t mqueue_rpc[] = { {"mqueue.get_size", mqueue_rpc_get_size, mqueue_rpc_get_size_doc, 0}, + {"mqueue.get_sizes", mqueue_rpc_get_sizes, mqueue_rpc_get_sizes_doc, RET_ARRAY}, {"mqueue.fetch", mqueue_rpc_fetch, mqueue_rpc_fetch_doc, 0}, {0, 0, 0, 0} };

3 years, 9 months

git:master:943f548d: mqueue: Use HTTP status codes for rpc

by Alex Hermann

Module: kamailio Branch: master Commit: 943f548dc391dc0921ccb1cdc336f2fdfa4f3e0d URL: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:29:40+02:00 mqueue: Use HTTP status codes for rpc --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… Patch: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 860014cca9..e3b984484e 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -294,13 +294,13 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) int mqueue_sz = 0; if (rpc->scan(ctx, "S", &mqueue_name) < 1) { - rpc->fault(ctx, 500, "No queue name"); + rpc->fault(ctx, 400, "No queue name"); return; } if(mqueue_name.len <= 0 || mqueue_name.s == NULL) { LM_ERR("bad mqueue name\n"); - rpc->fault(ctx, 500, "Invalid queue name"); + rpc->fault(ctx, 400, "Invalid queue name"); return; } @@ -308,7 +308,7 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) if(mqueue_sz < 0) { LM_ERR("no such mqueue\n"); - rpc->fault(ctx, 500, "No such queue"); + rpc->fault(ctx, 404, "No such queue"); return; }

3 years, 9 months

git:master:0ea69b16: core: Zero terminate str copies made with (pkg|shm)_str_dup()

by Alex Hermann

Module: kamailio Branch: master Commit: 0ea69b16db298842f58a6fcaaab2c0ee1a137b94 URL: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-20T10:21:00+02:00 core: Zero terminate str copies made with (pkg|shm)_str_dup() As discussed in #2512, zero-terminating all copies is preferred as most str usage is already with zero-terminated str.s. --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… Patch: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 6ef2e079bc..5fcb245cd8 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

3 years, 9 months

git:master:305f884e: Merge pull request #2519 from gaaf/features/core-str-copy

by GitHub

Module: kamailio Branch: master Commit: 305f884e0981b64eed9a96410d131d8f9a69eb3d URL: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-20T13:50:35+02:00 Merge pull request #2519 from gaaf/features/core-str-copy core: Zero terminate str copies made with (pkg|shm)_str_dup() --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… Patch: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… --- diff --git a/src/core/ut.h b/src/core/ut.h index 6ef2e079bc..5fcb245cd8 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

3 years, 9 months

git:master:449f9faf: tls: typedef'ed several structs, enums and unions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 449f9faf54238bcf1d6c1bf1b42738e79aad9bfd URL: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-20T12:40:06+02:00 tls: typedef'ed several structs, enums and unions --- Modified: src/modules/tls/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… Patch: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… --- diff --git a/src/modules/tls/tls_server.h b/src/modules/tls/tls_server.h index fb86bc277e..51ba176b46 100644 --- a/src/modules/tls/tls_server.h +++ b/src/modules/tls/tls_server.h @@ -34,25 +34,25 @@ #include "tls_domain.h" #include "tls_ct_wrq.h" -enum tls_conn_states { +typedef enum tls_conn_states { S_TLS_NONE = 0, S_TLS_ACCEPTING, S_TLS_CONNECTING, S_TLS_ESTABLISHED - }; + } tls_conn_states_t; -struct tls_rd_buf { +typedef struct tls_rd_buf { unsigned int pos; /* current position */ unsigned int size; /* total size (buf) */ unsigned char buf[1]; -}; +} tls_rd_buf_t; /* tls conn flags */ #define F_TLS_CON_WR_WANTS_RD 1 /* write wants read */ #define F_TLS_CON_HANDSHAKED 2 /* connection is handshaked */ #define F_TLS_CON_RENEGOTIATION 4 /* renegotiation by clinet */ -struct tls_extra_data { +typedef struct tls_extra_data { tls_domains_cfg_t* cfg; /* Configuration used for this connection */ SSL* ssl; /* SSL context used for the connection */ BIO* rwbio; /* bio used for read/write @@ -62,7 +62,7 @@ struct tls_extra_data { struct tls_rd_buf* enc_rd_buf; unsigned int flags; enum tls_conn_states state; -}; +} tls_extra_data_t; /* return true if write wants read */

3 years, 9 months

git:master:44a21a8d: core: typedef'ed several structs, enums and unions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44a21a8dc021e8ee5bbd27b2714e3da89694dec9 URL: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-20T12:36:55+02:00 core: typedef'ed several structs, enums and unions --- Modified: src/core/ip_addr.h Modified: src/core/tcp_conn.h Modified: src/core/tls_hooks.h --- Diff: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da… Patch: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da…

3 years, 9 months

[kamailio/kamailio] Fixes/flags (#2511)

by Alex Hermann

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) - [x] Cleanup #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Redefine some flags as enum instead of separate define. This makes it easier to see what flags are accepted by functions and with the right compiler flags, the compiler will warn when the wrong flags are used. No functional changes are intended. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2511 -- Commit Summary -- * core/tcp: Convert RD_CONN_ flags to enum * core/ip_addr: Reformat and redefine si_flags as bitshifts * core/ip_addr: Convert SND_F_ flags to enum * core/tcp: Convert F_TCP_REQ_ flags to enum -- File Changes -- M src/core/ip_addr.h (18) M src/core/tcp_conn.h (43) M src/core/tcp_read.c (14) M src/core/tcp_read.h (14) M src/core/tls_hooks.h (3) M src/modules/tls/tls_server.c (2) M src/modules/tls/tls_server.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2511.patch https://github.com/kamailio/kamailio/pull/2511.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2511

3 years, 9 months

git:master:ecb9fada: core/tcp: Convert F_TCP_REQ_ flags to enum

by Henning Westerholt

Module: kamailio Branch: master Commit: ecb9fada5b7a07707ae64233948f94be2bca1e8c URL: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/tcp: Convert F_TCP_REQ_ flags to enum Easier to recognize the correct flags in the forest of flags. --- Modified: src/core/tcp_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… Patch: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index d9a69b6929..ded595fdcd 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -121,6 +121,27 @@ enum conn_cmds { /* CONN_RELEASE, EOF, ERROR, DESTROY can be used by "reader" processes * CONN_GET_FD, CONN_NEW*, CONN_QUEUED_WRITE only by writers */ +/* tcp_req flags */ +enum tcp_req_flags { + F_TCP_REQ_HAS_CLEN = (1<<0), + F_TCP_REQ_COMPLETE = (1<<1), +#ifdef READ_HTTP11 + F_TCP_REQ_BCHUNKED = (1<<2), +#endif +#ifdef READ_MSRP + F_TCP_REQ_MSRP_NO = (1<<3), + F_TCP_REQ_MSRP_FRAME = (1<<4), + F_TCP_REQ_MSRP_BODY = (1<<5), +#endif + F_TCP_REQ_HEP3 = (1<<6), +}; + +#define TCP_REQ_HAS_CLEN(tr) ((tr)->flags & F_TCP_REQ_HAS_CLEN) +#define TCP_REQ_COMPLETE(tr) ((tr)->flags & F_TCP_REQ_COMPLETE) +#ifdef READ_HTTP11 +#define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) +#endif + struct tcp_req{ struct tcp_req* next; /* sockaddr ? */ @@ -135,32 +156,12 @@ struct tcp_req{ #ifdef READ_HTTP11 int chunk_size; #endif - unsigned int flags; /* F_TCP_REQ_HAS_CLEN | F_TCP_REQ_COMPLETE */ + enum tcp_req_flags flags; /* F_TCP_REQ_HAS_CLEN | F_TCP_REQ_COMPLETE */ int bytes_to_go; /* how many bytes we have still to read from the body*/ enum tcp_req_errors error; enum tcp_req_states state; }; -/* tcp_req flags */ -#define F_TCP_REQ_HAS_CLEN 1 -#define F_TCP_REQ_COMPLETE 2 -#ifdef READ_HTTP11 -#define F_TCP_REQ_BCHUNKED 4 -#endif -#ifdef READ_MSRP -#define F_TCP_REQ_MSRP_NO 8 -#define F_TCP_REQ_MSRP_FRAME 16 -#define F_TCP_REQ_MSRP_BODY 32 -#endif -#define F_TCP_REQ_HEP3 64 - -#define TCP_REQ_HAS_CLEN(tr) ((tr)->flags & F_TCP_REQ_HAS_CLEN) -#define TCP_REQ_COMPLETE(tr) ((tr)->flags & F_TCP_REQ_COMPLETE) -#ifdef READ_HTTP11 -#define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) -#endif - - struct tcp_connection; /* tcp port alias structure */

3 years, 9 months

git:master:d09098cc: core/ip_addr: Convert SND_F_ flags to enum

by Henning Westerholt

Module: kamailio Branch: master Commit: d09098cc9cb3cd0059f8e4fbff6e33eae5b9c28a URL: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/ip_addr: Convert SND_F_ flags to enum Easier to recognize the correct flags in the forest of flags. --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… Patch: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index b366586ca9..8e712cc307 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -134,9 +134,11 @@ typedef struct socket_info { /* send flags */ -#define SND_F_FORCE_CON_REUSE 1 /* reuse an existing connection or fail */ -#define SND_F_CON_CLOSE 2 /* close the connection after sending */ -#define SND_F_FORCE_SOCKET 4 /* send socket in dst is forced */ +enum send_flags { + SND_F_FORCE_CON_REUSE = (1 << 0), /* reuse an existing connection or fail */ + SND_F_CON_CLOSE = (1 << 1), /* close the connection after sending */ + SND_F_FORCE_SOCKET = (1 << 2), /* send socket in dst is forced */ +}; typedef struct snd_flags { unsigned short f; /* snd flags */

3 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020