June 2014 - sr-dev - kamailio.org

[tracker] Assignee added: Assignment operators don't work
by sip-router 04 Sep '26

04 Sep '26

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#100 - Assignment operators don't work User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=100 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 10

git:master: pv: use suip2a(...) for $snd(..)
by Daniel-Constantin Mierla 04 Dec '25

04 Dec '25

Module: sip-router Branch: master Commit: e151a9e99b1fed7805eaed5d16ca3d6466e1f517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e151a9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:37:07 2011 +0200 pv: use suip2a(...) for $snd(..) - fixes FS#140, reported by Klaus Darilion --- modules_k/pv/pv_branch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index a9dd1bc..4081429 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -395,7 +395,7 @@ int pv_get_sndto(struct sip_msg *msg, pv_param_t *param, (int)snd_inf->len); default: /* 0 - ip */ - s.s = su2a(snd_inf->to, sizeof(*snd_inf->to)); + s.s = suip2a(snd_inf->to, sizeof(*snd_inf->to)); s.len = strlen(s.s); return pv_get_strval(msg, param, res, &s); }

2 1

Outbound flow failure handling merged to master
by Hugh Waite 23 Nov '16

23 Nov '16

Hello, As you will see I have merged my branch back into master. These changes add a new event route [tm:branch-failure] to the tm module which is run when any failure response is received on a transaction. The event_route uses a new route type BRANCH_ROUTE which limits the functions that can be run in the route. The functions t_check_status(), t_next_contact_flow(), t_relay() and unregister() can be used in this route. A new pv $T_reply_ruid is accessible in this route which can be used to unregister a single contact entry. The following example route can be used on a registrar to handle failed or invalid flows: event_route[tm:branch-failure] { xlog("L_INFO", "event_route[tm:branch-failure]\n"); if (t_check_status("430|403")) { if (!unregister("location", "$tu", "$T_reply_ruid")) { xlog("L_WARN", "failed to unregister $tu with ruid $T_reply_ruid\n"); } if (!t_next_contact_flow()) { xlog("L_INFO", "No more flows\n"); } else { xlog("L_INFO", "Next flow\n"); t_relay(); } } } Any bugs, memory leaks etc. let me know! Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

4 11

TM possible deadlock
by Jason Penton 09 Apr '15

09 Apr '15

Hi All, I have been experiencing a deadlock when a timeout occurs on a t_relayed() INVITE. Going through the code I have noticed a possible chance of deadlock (without re-entrant enabled). Here is my thinking: t_should_relay_response() is called with REPLY_LOCK when the timer process fires on the fr_inv_timer (no response from the INVITE that was relayed, other than 100 provisional) and a 408 is generated. However, from within that function there are calls to run_failure_handlers() which in turn *could* try and lock the reply (viz. somebody having a t_reply() call in the cfg file - in failure route block). This would result in another lock on the same transaction's REPLY_LOCK.... Has anybody else experienced something like this? this is on master btw. Cheers Jason

2 16

Fw: query related to NOTIFY message size
by Piyush.Bansal＠relianceada.com 17 Oct '14

17 Oct '14

please help ----- Forwarded by Piyush Bansal/RCOM/RelianceADA on 10/10/2013 10:51 AM ----- From: Piyush Bansal/RCOM/RelianceADA To: serusers(a)iptel.org, serdev(a)iptel.org Date: 10/09/2013 12:14 PM Subject: query related to NOTIFY message size Hi there, I have certain queries regarding batch SUBSCRIBE and NOTIFY. I have a user who has 100 buddies in his buddy list. If any of his buddy changes his/her presence status, that user gets a NOTIFY message with presence status of all the 100 buddies. In that case, the message size is exceeding 500 KB. Thats quite a higher value for a UDP packet. Can anybody suggest- 1. If there is any way to restrict the size of the packet. 2. How to ensure that the packet is received correctly by the client. Thanks and Regards, --Piyush Bansal The information contained in this electronic message (email) and any attachments to this email are intended for the exclusive use of the addressee(s) and access to this email by any one else is unauthorised. The email may contain proprietary, confidential or privileged information or information relating to Reliance Group. If you are not the intended recipient, please notify the sender by telephone, fax, or return email and delete this communication and any attachments thereto, immediately from your computer. Any dissemination, distribution, or copying of this communication and the attachments thereto (in whole or part), in any manner, is strictly prohibited and actionable at law. The recipient acknowledges that emails are susceptible to alteration and their integrity can not be guaranteed and that Company does not guarantee that any e-mail is virus-free and accept no liability for any damage caused by any virus transmitted by this email.

4 10

RFC: updating default values
by Daniel-Constantin Mierla 02 Oct '14

02 Oct '14

Hello, I am opening this discussion to decide if there is need to adjust some of the default values we have in Kamailio. Many of them were set even like 10 years ago, so they might not be very actual anymore. The main goal is to get the best possible settings for common usage. To start with, here are some values that should be reviewed: - default private memory is 4MB - if the config is not that small, it might not be sufficient free pkg to play with (e.g., for sql_query() result, storage of $var(...) values). Should it be increased to 8MB or other value? Debian/Centos have startup script that sets its value to 8 via command line - default shared memory is 32MB - for a decent deployment with tm, location, lcr/dispatcher, permissions, and anti-flood, it might leave not much free space. Should we double it or set to a different value - usrloc - db_ops_ruid should enabled (1) - seems stable, without it there are problems updating/deleting location records when UA changes the call-id for same contact address. - usrloc - hash_size - now is 9, which results in 512 slots, meaning is ok for few thousands of registered users, for more, performance will decrease when doing save/lookup location -- should it be made 10 (1024 slots for internal hash table)? - auth_db - load_credentials defaults to 'rpid', meaning that the query to get the password will retrieve also the rpid column. I haven't see rpid being used that much lately (replaced by PAI/PPI). I would make this parameter empty by default to avoid querying for an extra column that is likely to be empty. Perhaps there are more, I just wanted to get started. Reply with your comments to above list as well as add new items you thinks their default values should be adjusted. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

4 7

Kamailio on OS/X Mavericks
by Olle E. Johansson 04 Aug '14

04 Aug '14

Hi! Kamailio by default doesn't compile on OS/X Mavericks. $ make generating autover.h ... /Applications/Xcode.app/Contents/Developer/usr/bin/make --no-print-directory -wC . cfg-defs target architecture <x86_64>, host architecture <x86_64> making config... CC (gcc) [kamailio] action.o error: invalid value '9' in '-O9' make: *** [action.o] Error 1 $ gcc --version Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) Target: x86_64-apple-darwin13.0.0 Thread model: posix Anyone that has found an optimal way to patch the Makefile? /O

3 6

Dialog module issue on OS/X
by Olle E. Johansson 30 Jul '14

30 Jul '14

I could not load the dialog module, because of a linking problem with the symbol destroy_dlg. Found that it's declared "inline" twice which may cause an issue. With this change, that I don't dare to commit myself, I could load dialog and explore it. Can someone take a look at this, someone that understands dialog and stuff? This was on OS/X. Thanks /O diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 6994256..174ef15 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -214,7 +214,7 @@ static inline void unlink_unsafe_dlg(dlg_entry_t *d_entry, dlg_cell_t *dlg) * \brief Destroy a dialog, run callbacks and free memory * \param dlg destroyed dialog */ -inline void destroy_dlg(dlg_cell_t *dlg); +void destroy_dlg(dlg_cell_t *dlg); /*!

2 3

git:master: modules/acc: added reason_from_reason_hf module paramater
by Juha Heinanen 29 Jul '14

29 Jul '14

Module: sip-router Branch: master Commit: 7f136429e5b676077c4f71c5cc178dd0c125951b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f13642… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 31 10:34:19 2014 +0300 modules/acc: added reason_from_reason_hf module paramater - in schema, increased size of sip_reason field to 128 chars --- lib/srdb1/schema/acc.xml | 2 +- lib/srdb1/schema/entities.xml | 2 +- lib/srdb1/schema/missed_calls.xml | 2 +- modules/acc/README | 33 +++++++++++++++++++++++++-------- modules/acc/acc_logic.c | 21 ++++++++++++++++++++- modules/acc/acc_mod.c | 2 ++ modules/acc/acc_mod.h | 1 + modules/acc/doc/acc_admin.xml | 20 ++++++++++++++++++++ 8 files changed, 71 insertions(+), 12 deletions(-) diff --git a/lib/srdb1/schema/acc.xml b/lib/srdb1/schema/acc.xml index 719298e..2d8d66b 100644 --- a/lib/srdb1/schema/acc.xml +++ b/lib/srdb1/schema/acc.xml @@ -9,7 +9,7 @@ <table id="acc" xmlns:db="http://docbook.org/ns/docbook"> <name>acc</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the ACC module to report on transactions - accounted calls. More information is available at: &KAMAILIO_MOD_DOC;acc.html diff --git a/lib/srdb1/schema/entities.xml b/lib/srdb1/schema/entities.xml index 526ac55..bb3ddf3 100644 --- a/lib/srdb1/schema/entities.xml +++ b/lib/srdb1/schema/entities.xml @@ -13,7 +13,7 @@ <!ENTITY avp_val_len "128"> <!ENTITY ip_add_len "50"> <!ENTITY sip_code_len "3"> -<!ENTITY sip_reason_len "32"> +<!ENTITY sip_reason_len "128"> <!ENTITY cseq_len "11"> <!ENTITY callid_len "255"> <!ENTITY expires_len "11"> diff --git a/lib/srdb1/schema/missed_calls.xml b/lib/srdb1/schema/missed_calls.xml index 7a66440..8c824ab 100644 --- a/lib/srdb1/schema/missed_calls.xml +++ b/lib/srdb1/schema/missed_calls.xml @@ -9,7 +9,7 @@ <table id="missed_calls" xmlns:db="http://docbook.org/ns/docbook"> <name>missed_calls</name> - <version>3</version> + <version>4</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the ACC module for keeping track of missed calls. This table is similar to the 'acc' table. More information is available at: &KAMAILIO_MOD_DOC;acc.html</db:para> diff --git a/modules/acc/README b/modules/acc/README index ea72fd6..8316b52 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -131,6 +131,7 @@ Sven Knoblich 6.48. time_attr (str) 6.49. time_exten (str) 6.50. time_format (str) + 6.51. reason_from_reason_hf (int) 7. Functions @@ -193,10 +194,11 @@ Sven Knoblich 1.48. time_attr example 1.49. time_exten example 1.50. time_format example - 1.51. acc_log_request usage - 1.52. acc_db_request usage - 1.53. acc_rad_request usage - 1.54. acc_diam_request usage + 1.51. reason_from_reason_hf + 1.52. acc_log_request usage + 1.53. acc_db_request usage + 1.54. acc_rad_request usage + 1.55. acc_diam_request usage Chapter 1. Admin Guide @@ -291,6 +293,7 @@ Chapter 1. Admin Guide 6.48. time_attr (str) 6.49. time_exten (str) 6.50. time_format (str) + 6.51. reason_from_reason_hf (int) 7. Functions @@ -705,6 +708,7 @@ $dlg_var(callee) = $avp(callee); #callee='C' 6.48. time_attr (str) 6.49. time_exten (str) 6.50. time_format (str) + 6.51. reason_from_reason_hf (int) 6.1. early_media (integer) @@ -1350,6 +1354,19 @@ modparam("acc", "time_exten", "micorsecs") modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S") ... +6.51. reason_from_reason_hf (int) + + Tells where to take sip_reason from. If value is 0, sip_reason is taken + from status line. Otherwise, sip_reason is taken from Reason header + field(s) if present. Currently only the first Reason header is used. + + Default value is 0. + + Example 1.51. reason_from_reason_hf +... +modparam("acc", "reason_from_reason_hf", 1) +... + 7. Functions 7.1. acc_log_request(comment) @@ -1370,7 +1387,7 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S") This function can be used from ANY_ROUTE. - Example 1.51. acc_log_request usage + Example 1.52. acc_log_request usage ... acc_log_request("Some comment"); $var(code) = 404; @@ -1392,7 +1409,7 @@ acc_log_request("$var(code) Error: $avp(reason)"); This function can be used from ANY_ROUTE. - Example 1.52. acc_db_request usage + Example 1.53. acc_db_request usage ... acc_db_request("Some comment", "SomeTable"); acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); @@ -1410,7 +1427,7 @@ acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); This function can be used from ANY_ROUTE. - Example 1.53. acc_rad_request usage + Example 1.54. acc_rad_request usage ... acc_rad_request("Some comment"); acc_rad_request("$var(code) Error: $avp(reason)"); @@ -1427,7 +1444,7 @@ acc_rad_request("$var(code) Error: $avp(reason)"); This function can be used from ANY_ROUTE. - Example 1.54. acc_diam_request usage + Example 1.55. acc_diam_request usage ... acc_diam_request("Some comment"); acc_diam_request("$var(code) Error: $avp(reason)"); diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index 0641388..452e171 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -42,6 +42,7 @@ #include "../../sr_module.h" #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" +#include "../../lib/kcore/cmpapi.h" #include "../../modules/tm/tm_load.h" #include "../rr/api.h" #include "../../flags.h" @@ -132,6 +133,8 @@ static inline void env_set_text(char *p, int len) static inline void env_set_code_status( int code, struct sip_msg *reply) { static char code_buf[INT2STR_MAX_LEN]; + str reason = {"Reason", 6}; + struct hdr_field *hf; acc_env.code = code; if (reply==FAKED_REPLY || reply==NULL) { @@ -143,7 +146,23 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.reason.len = strlen(acc_env.reason.s); } else { acc_env.code_s = reply->first_line.u.reply.status; - acc_env.reason = reply->first_line.u.reply.reason; + hf = NULL; + if (reason_from_reason_hf) { + /* TODO: take reason from all Reason headers */ + if(parse_headers(reply, HDR_EOH_F, 0) < 0) { + LM_ERR("error parsing headers\n"); + } else { + for (hf=reply->headers; hf; hf=hf->next) { + if (cmp_hdrname_str(&hf->name, &reason)==0) + break; + } + } + } + if (hf == NULL) { + acc_env.reason = reply->first_line.u.reply.reason; + } else { + acc_env.reason = hf->body; + } } } diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index ff94baa..347e054 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -110,6 +110,7 @@ static char* leg_info_str = 0; /*!< multi call-leg support */ struct acc_extra *leg_info = 0; int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */ char *acc_time_format = "%Y-%m-%d %H:%M:%S"; +int reason_from_reason_hf = 0; /*!< assign reason from reason hf if present */ /* ----- time mode variables ------- */ /*! \name AccTimeModeVariables Time Mode Variables */ @@ -258,6 +259,7 @@ static param_export_t params[] = { {"multi_leg_info", STR_PARAM, &leg_info_str }, {"detect_direction", INT_PARAM, &detect_direction }, {"acc_prepare_flag", INT_PARAM, &acc_prepare_flag }, + {"reason_from_reason_hf", INT_PARAM, &reason_from_reason_hf }, /* syslog specific */ {"log_flag", INT_PARAM, &log_flag }, {"log_missed_flag", INT_PARAM, &log_missed_flag }, diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h index 98cef33..68911dc 100644 --- a/modules/acc/acc_mod.h +++ b/modules/acc/acc_mod.h @@ -50,6 +50,7 @@ extern int failed_transaction_flag; extern unsigned short failed_filter[]; extern int detect_direction; extern int acc_prepare_flag; +extern int reason_from_reason_hf; extern int log_facility; extern int log_level; diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index 54b9517..b0a1217 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1479,6 +1479,26 @@ modparam("acc", "time_format", "%Y/%m/%d %H:%M:%S") </programlisting> </example> </section> + <section id="acc.p.reason_from_reason_hf"> + <title><varname>reason_from_reason_hf</varname> (int)</title> + <para> + Tells where to take sip_reason from. If value is 0, + sip_reason is taken from status line. Otherwise, sip_reason + is taken from Reason header field(s) if present. + Currently only the first Reason header is used. + </para> + <para> + Default value is 0. + </para> + <example> + <title>reason_from_reason_hf</title> + <programlisting format="linespecific"> +... +modparam("acc", "reason_from_reason_hf", 1) +... +</programlisting> + </example> + </section> </section> <section>

3 2

[PATCH 1/1] websocket: remove libunistring dependency
by Timo Teräs 17 Jul '14

17 Jul '14

libunistring is old, slow, messy code and uncompilable on new systems. remove the sole user of it, and replace it with inline utf8 decoder implementation from http://bjoern.hoehrmann.de/utf-8/decoder/dfa/. improves performance and portability as libunistring is not needed. --- @Peter, Hugh: Would it be ok for me to push this? modules/websocket/Makefile | 2 +- modules/websocket/README | 1 - modules/websocket/doc/websocket_admin.xml | 3 -- modules/websocket/utf8_decode.h | 52 +++++++++++++++++++++++++++++++ modules/websocket/ws_frame.c | 4 +-- 5 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 modules/websocket/utf8_decode.h diff --git a/modules/websocket/Makefile b/modules/websocket/Makefile index bb7c809..c686a82 100644 --- a/modules/websocket/Makefile +++ b/modules/websocket/Makefile @@ -27,7 +27,7 @@ else # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" endif -LIBS+= $(TLS_EXTRA_LIBS) -lunistring +LIBS+= $(TLS_EXTRA_LIBS) # Static linking, if you'd like to use TLS and WEBSOCKET at the same time # diff --git a/modules/websocket/README b/modules/websocket/README index 49d8693..bdba3e4 100644 --- a/modules/websocket/README +++ b/modules/websocket/README @@ -316,7 +316,6 @@ onreply_route[WS_REPLY] { The following libraries must be installed before running Kamailio with this module loaded: * OpenSSL. - * GNU libunistring. 4. Parameters diff --git a/modules/websocket/doc/websocket_admin.xml b/modules/websocket/doc/websocket_admin.xml index fa7d300..e40dc09 100644 --- a/modules/websocket/doc/websocket_admin.xml +++ b/modules/websocket/doc/websocket_admin.xml @@ -262,9 +262,6 @@ onreply_route[WS_REPLY] { <listitem> <para><emphasis>OpenSSL</emphasis>.</para> </listitem> - <listitem> - <para><emphasis>GNU libunistring</emphasis>.</para> - </listitem> </itemizedlist> </para> </section> diff --git a/modules/websocket/utf8_decode.h b/modules/websocket/utf8_decode.h new file mode 100644 index 0000000..b274fe7 --- /dev/null +++ b/modules/websocket/utf8_decode.h @@ -0,0 +1,52 @@ +#include <stdint.h> +#include <stddef.h> + +// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern(a)hoehrmann.de> +// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. + +#define UTF8_ACCEPT 0 +#define UTF8_REJECT 12 + +static const uint8_t utf8d[] = { + // The first part of the table maps bytes to character classes that + // to reduce the size of the transition table and create bitmasks. + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, + 10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8, + + // The second part is a transition table that maps a combination + // of a state of the automaton and a character class to a state. + 0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12, + 12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12, + 12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12, + 12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12, + 12,36,12,12,12,12,12,12,12,12,12,12, +}; + +static inline uint32_t decode(uint32_t* state, uint32_t* codep, uint32_t byte) +{ + uint32_t type = utf8d[byte]; + + *codep = (*state != UTF8_ACCEPT) ? + (byte & 0x3fu) | (*codep << 6) : + (0xff >> type) & (byte); + + *state = utf8d[256 + *state + type]; + return *state; +} + +static inline int IsUTF8(uint8_t* s, size_t len) +{ + uint32_t codepoint, state = 0; + + while (len--) + decode(&state, &codepoint, *s++); + + return state == UTF8_ACCEPT; +} + diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index a3a4cef..3562437 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -22,7 +22,7 @@ */ #include <limits.h> -#include <unistr.h> +#include "utf8_decode.h" #include "../../events.h" #include "../../receive.h" #include "../../stats.h" @@ -695,7 +695,7 @@ int ws_frame_transmit(void *data) frame.fin = 1; /* Can't be sure whether this message is UTF-8 or not so check to see if it "might" be UTF-8 and send as binary if it definitely isn't */ - frame.opcode = (u8_check((uint8_t *) wsev->buf, wsev->len) == NULL) ? + frame.opcode = IsUTF8((uint8_t *) wsev->buf, wsev->len) ? OPCODE_TEXT_FRAME : OPCODE_BINARY_FRAME; frame.payload_len = wsev->len; frame.payload_data = wsev->buf; -- 1.8.5.1

3 10