From d8084f5cee10da1da979223a672f1c6fae48cbfd Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 18 May 2023 16:43:44 +0300 Subject: [PATCH] Added .clang-format and used it to format baresip.c --- .clang-format | 90 +++++++ app/src/main/cpp/baresip.c | 487 +++++++++++++++++++------------------ 2 files changed, 337 insertions(+), 240 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..179ee39e --- /dev/null +++ b/.clang-format @@ -0,0 +1,90 @@ +--- +Language: Cpp +# BasedOnStyle: LLVM +AccessModifierOffset: -4 +AlignAfterOpenBracket: DontAlign +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: NonAssignment +BreakBeforeBraces: Mozilla +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +ColumnLimit: 100 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 4 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +UseTab: Never +TabWidth: 4 +... + diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c index e34c34f0..62637f6d 100644 --- a/app/src/main/cpp/baresip.c +++ b/app/src/main/cpp/baresip.c @@ -8,15 +8,18 @@ #include "logger.h" #if defined(__ARM_ARCH_7A__) - #define long long long +#define long long long #endif -enum { ASYNC_WORKERS = 4 }; +enum +{ + ASYNC_WORKERS = 4 +}; typedef struct baresip_context { - JavaVM *javaVM; - jclass mainActivityClz; + JavaVM *javaVM; + jclass mainActivityClz; jobject mainActivityObj; } BaresipContext; @@ -93,24 +96,24 @@ static struct re_printf pf_null = {vprintf_null, 0}; static void signal_handler(int sig) { - static bool term = false; + static bool term = false; - if (term) { + if (term) { module_app_unload(); - mod_close(); - exit(0); - } + mod_close(); + exit(0); + } - term = true; + term = true; LOGI("terminated by signal (%d)\n", sig); ua_stop_all(false); } static void ua_exit_handler(void *arg) { - (void)arg; - LOGD("ua exited -- stopping main runloop\n"); - re_cancel(); + (void)arg; + LOGD("ua exited -- stopping main runloop\n"); + re_cancel(); } static const char *ua_event_reg_str(enum ua_event ev) @@ -126,22 +129,28 @@ static const char *ua_event_reg_str(enum ua_event ev) return "registering failed"; case UA_EVENT_UNREGISTERING: return "unregistering"; - default: return "?"; + default: + return "?"; } } static const char *translate_errorcode(uint16_t scode) { - switch (scode) { - case 404: return ""; /* ignore */ - case 486: case 603: return "busy"; - case 487: return ""; /* ignore */ - default: return "error"; - } + switch (scode) { + case 404: + return ""; /* ignore */ + case 486: + case 603: + return "busy"; + case 487: + return ""; /* ignore */ + default: + return "error"; + } } -static void ua_event_handler(struct ua *ua, enum ua_event ev, - struct call *call, const char *prm, void *arg) +static void ua_event_handler( + struct ua *ua, enum ua_event ev, struct call *call, const char *prm, void *arg) { (void)arg; const char *tone; @@ -200,9 +209,9 @@ static void ua_event_handler(struct ua *ua, enum ua_event ev, if (prm[0] == '0') len = re_snprintf(event_buf, sizeof event_buf, "call secure"); else if (prm[0] == '1') - len = re_snprintf(event_buf, sizeof event_buf, "call verify,%s", prm+2); + len = re_snprintf(event_buf, sizeof event_buf, "call verify,%s", prm + 2); else if (prm[0] == '2') - len = re_snprintf(event_buf, sizeof event_buf, "call verified,%s", prm+2); + len = re_snprintf(event_buf, sizeof event_buf, "call verified,%s", prm + 2); else len = re_snprintf(event_buf, sizeof event_buf, "unknown menc event"); break; @@ -221,8 +230,7 @@ static void ua_event_handler(struct ua *ua, enum ua_event ev, len = re_snprintf(event_buf, sizeof event_buf, "mwi notify,%s", prm); break; case UA_EVENT_MODULE: - err = re_regex(prm, strlen(prm), "[^,]*,[^,]*,[~]*", - &module, &module_event, &data); + err = re_regex(prm, strlen(prm), "[^,]*,[^,]*,[~]*", &module, &module_event, &data); if (err) return; if (!pl_strcmp(&module_event, "dump")) { @@ -240,13 +248,13 @@ static void ua_event_handler(struct ua *ua, enum ua_event ev, re_thread_leave(); JNIEnv *env; - jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void**)&env, JNI_VERSION_1_6); + jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void **)&env, JNI_VERSION_1_6); if (res != JNI_OK) { LOGE("failed to get environment: %d\n", res); return; } - jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "uaEvent", - "(Ljava/lang/String;JJ)V"); + jmethodID methodId = + (*env)->GetMethodID(env, g_ctx.mainActivityClz, "uaEvent", "(Ljava/lang/String;JJ)V"); jstring jEvent = (*env)->NewStringUTF(env, event_buf); LOGD("sending ua/call %ld/%ld event %s\n", (long)ua, (long)call, event_buf); (*env)->CallVoidMethod(env, g_ctx.mainActivityObj, methodId, jEvent, (jlong)ua, (jlong)call); @@ -254,8 +262,8 @@ static void ua_event_handler(struct ua *ua, enum ua_event ev, re_thread_enter(); } -static void message_handler(struct ua *ua, const struct pl *peer, const struct pl *ctype, - struct mbuf *body, void *arg) +static void message_handler( + struct ua *ua, const struct pl *peer, const struct pl *ctype, struct mbuf *body, void *arg) { (void)arg; char ctype_buf[128]; @@ -269,13 +277,13 @@ static void message_handler(struct ua *ua, const struct pl *peer, const struct p re_thread_leave(); JNIEnv *env; - jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void**)&env, JNI_VERSION_1_6); + jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void **)&env, JNI_VERSION_1_6); if (res != JNI_OK) { LOGE("failed to get environment: %d\n", res); return; } jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "messageEvent", - "(JLjava/lang/String;Ljava/lang/String;[B)V"); + "(JLjava/lang/String;Ljava/lang/String;[B)V"); jstring jPeer = (*env)->NewStringUTF(env, peer_buf); pl_strcpy(ctype, ctype_buf, 256); jstring jCtype = (*env)->NewStringUTF(env, ctype_buf); @@ -289,7 +297,8 @@ static void message_handler(struct ua *ua, const struct pl *peer, const struct p void *temp = (*env)->GetPrimitiveArrayCritical(env, (jarray)jMsg, 0); memcpy(temp, mbuf_buf(body), size); (*env)->ReleasePrimitiveArrayCritical(env, jMsg, temp, 0); - LOGD("sending message %ld/%s/%s/%.*s\n", (long)ua, peer_buf, ctype_buf, (int)size, mbuf_buf(body)); + LOGD("sending message %ld/%s/%s/%.*s\n", (long)ua, peer_buf, ctype_buf, (int)size, + mbuf_buf(body)); (*env)->CallVoidMethod(env, g_ctx.mainActivityObj, methodId, (jlong)ua, jPeer, jCtype, jMsg); (*env)->DeleteLocalRef(env, jCtype); (*env)->DeleteLocalRef(env, jPeer); @@ -308,19 +317,18 @@ static void send_resp_handler(int err, const struct sip_msg *msg, void *arg) } pl_strcpy(&(msg->reason), reason_buf, 64); - LOGD("send_response_handler received response '%u %s' at %s\n", msg->scode, - reason_buf, (char *)arg); + LOGD("send_response_handler received response '%u %s' at %s\n", msg->scode, reason_buf, + (char *)arg); re_thread_leave(); JNIEnv *env; - jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void**)&env, JNI_VERSION_1_6); + jint res = (*g_ctx.javaVM)->GetEnv(g_ctx.javaVM, (void **)&env, JNI_VERSION_1_6); if (res != JNI_OK) { LOGE("failed to get environment: %d\n", res); return; } - jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, - "messageResponse", - "(ILjava/lang/String;Ljava/lang/String;)V"); + jmethodID methodId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "messageResponse", + "(ILjava/lang/String;Ljava/lang/String;)V"); jstring javaReason = (*env)->NewStringUTF(env, reason_buf); jstring javaTime = (*env)->NewStringUTF(env, (char *)arg); (*env)->CallVoidMethod(env, g_ctx.mainActivityObj, methodId, msg->scode, javaReason, javaTime); @@ -329,7 +337,8 @@ static void send_resp_handler(int err, const struct sip_msg *msg, void *arg) re_thread_enter(); } -enum { +enum +{ ID_UA_STOP_ALL }; @@ -353,8 +362,8 @@ static void *loggingFunction(void *arg) ssize_t readSize; char buf[128]; - while((readSize = read(pfd[0], buf, sizeof buf - 1)) > 0) { - if(buf[readSize - 1] == '\n') { + while ((readSize = read(pfd[0], buf, sizeof buf - 1)) > 0) { + if (buf[readSize - 1] == '\n') { --readSize; } buf[readSize] = 0; @@ -382,7 +391,7 @@ static int runLoggingThread() return 0; } -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { LOGD("at JNI_OnLoad\n"); @@ -395,9 +404,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) return JNI_VERSION_1_6; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instance, jstring jPath, - jstring jAddrs, jint jLogLevel) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_BaresipService_baresipStart( + JNIEnv *env, jobject instance, jstring jPath, jstring jAddrs, jint jLogLevel) { LOGI("starting baresip\n"); @@ -479,8 +487,7 @@ Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instanc // net_debug_log(); - err = ua_init("baresip v" BARESIP_VERSION " (" ARCH "/" OS ")", - true, true, true); + err = ua_init("baresip v" BARESIP_VERSION " (" ARCH "/" OS ")", true, true, true); if (err) { LOGE("ua_init() failed (%d)\n", err); strcpy(start_error, "ua_init"); @@ -556,21 +563,21 @@ out: LOGD("sending stopped event"); jstring javaError = (*env)->NewStringUTF(env, start_error); - jmethodID stoppedId = (*env)->GetMethodID(env, g_ctx.mainActivityClz, "stopped", - "(Ljava/lang/String;)V"); + jmethodID stoppedId = + (*env)->GetMethodID(env, g_ctx.mainActivityClz, "stopped", "(Ljava/lang/String;)V"); (*env)->CallVoidMethod(env, g_ctx.mainActivityObj, stoppedId, javaError); (*env)->DeleteLocalRef(env, javaError); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_BaresipService_baresipStop(JNIEnv *env, jobject thiz, jboolean force) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_BaresipService_baresipStop( + JNIEnv *env, jobject thiz, jboolean force) { LOGD("ua_stop_all upon baresipStop"); mqueue_push(mq, ID_UA_STOP_ALL, (void *)((long)force)); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1display_1name(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1display_1name( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *dn = account_display_name((struct account *)acc); @@ -582,10 +589,10 @@ Java_com_tutpro_baresip_Api_account_1display_1name(JNIEnv *env, jobject thiz, jl return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1display_1name(JNIEnv *env, jobject thiz, jlong acc, jstring jDn) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1display_1name( + JNIEnv *env, jobject thiz, jlong acc, jstring jDn) { - const char *dn = (*env)->GetStringUTFChars(env, jDn, 0);\ + const char *dn = (*env)->GetStringUTFChars(env, jDn, 0); int res; if (strlen(dn) > 0) res = account_set_display_name((struct account *)acc, dn); @@ -595,8 +602,8 @@ Java_com_tutpro_baresip_Api_account_1set_1display_1name(JNIEnv *env, jobject thi return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1aor(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1aor( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) return (*env)->NewStringUTF(env, account_aor((struct account *)acc)); @@ -604,8 +611,8 @@ Java_com_tutpro_baresip_Api_account_1aor(JNIEnv *env, jobject thiz, jlong acc) return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1luri(JNIEnv *env, jclass clazz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1luri( + JNIEnv *env, jclass clazz, jlong acc) { const struct uri *uri = account_luri((struct account *)acc); char uri_buf[512]; @@ -618,8 +625,8 @@ Java_com_tutpro_baresip_Api_account_1luri(JNIEnv *env, jclass clazz, jlong acc) return (*env)->NewStringUTF(env, uri_buf); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1auth_1user(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1auth_1user( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *au = account_auth_user((struct account *)acc); @@ -631,8 +638,8 @@ Java_com_tutpro_baresip_Api_account_1auth_1user(JNIEnv *env, jobject thiz, jlong return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1auth_1user(JNIEnv *env, jobject thiz, jlong acc, jstring jUser) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1auth_1user( + JNIEnv *env, jobject thiz, jlong acc, jstring jUser) { const char *user = (*env)->GetStringUTFChars(env, jUser, 0); int res; @@ -644,8 +651,8 @@ Java_com_tutpro_baresip_Api_account_1set_1auth_1user(JNIEnv *env, jobject thiz, return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1auth_1pass(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1auth_1pass( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *ap = account_auth_pass((struct account *)acc); @@ -657,8 +664,8 @@ Java_com_tutpro_baresip_Api_account_1auth_1pass(JNIEnv *env, jobject thiz, jlong return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1auth_1pass(JNIEnv *env, jobject thiz, jlong acc, jstring jPass) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1auth_1pass( + JNIEnv *env, jobject thiz, jlong acc, jstring jPass) { const char *pass = (*env)->GetStringUTFChars(env, jPass, 0); int res; @@ -670,8 +677,8 @@ Java_com_tutpro_baresip_Api_account_1set_1auth_1pass(JNIEnv *env, jobject thiz, return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1outbound(JNIEnv *env, jobject thiz, jlong acc, jint jIx) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1outbound( + JNIEnv *env, jobject thiz, jlong acc, jint jIx) { const uint16_t native_ix = jIx; const char *outbound; @@ -686,8 +693,8 @@ Java_com_tutpro_baresip_Api_account_1outbound(JNIEnv *env, jobject thiz, jlong a } } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1outbound(JNIEnv *env, jobject thiz, jlong acc, jstring jOb, jint jIx) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1outbound( + JNIEnv *env, jobject thiz, jlong acc, jstring jOb, jint jIx) { const char *ob = (*env)->GetStringUTFChars(env, jOb, 0); const uint16_t ix = jIx; @@ -700,8 +707,8 @@ Java_com_tutpro_baresip_Api_account_1set_1outbound(JNIEnv *env, jobject thiz, jl return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1audio_1codec(JNIEnv *env, jobject thiz, jlong acc, jint ix) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1audio_1codec( + JNIEnv *env, jobject thiz, jlong acc, jint ix) { const struct list *codecl; char codec_buf[32]; @@ -716,7 +723,8 @@ Java_com_tutpro_baresip_Api_account_1audio_1codec(JNIEnv *env, jobject thiz, jlo i++; if (i == ix) { const struct aucodec *ac = le->data; - len = re_snprintf(codec_buf, sizeof codec_buf, "%s/%u/%u", ac->name, ac->srate, ac->ch); + len = re_snprintf( + codec_buf, sizeof codec_buf, "%s/%u/%u", ac->name, ac->srate, ac->ch); if (len == -1) { LOGE("failed to print audio codec to buffer\n"); codec_buf[0] = '\0'; @@ -729,8 +737,8 @@ Java_com_tutpro_baresip_Api_account_1audio_1codec(JNIEnv *env, jobject thiz, jlo return (*env)->NewStringUTF(env, codec_buf); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1audio_1codecs(JNIEnv *env, jobject thiz, jlong acc, jstring jCodecs) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1audio_1codecs( + JNIEnv *env, jobject thiz, jlong acc, jstring jCodecs) { const char *codecs = (*env)->GetStringUTFChars(env, jCodecs, 0); int res = account_set_audio_codecs((struct account *)acc, codecs); @@ -738,8 +746,8 @@ Java_com_tutpro_baresip_Api_account_1set_1audio_1codecs(JNIEnv *env, jobject thi return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1video_1codecs(JNIEnv *env, jobject thiz, jlong acc, jstring jCodecs) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1video_1codecs( + JNIEnv *env, jobject thiz, jlong acc, jstring jCodecs) { const char *codecs = (*env)->GetStringUTFChars(env, jCodecs, 0); int res = account_set_video_codecs((struct account *)acc, codecs); @@ -747,8 +755,8 @@ Java_com_tutpro_baresip_Api_account_1set_1video_1codecs(JNIEnv *env, jobject thi return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1regint(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1regint( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) return (jint)account_regint((struct account *)acc); @@ -756,25 +764,26 @@ Java_com_tutpro_baresip_Api_account_1regint(JNIEnv *env, jobject thiz, jlong acc return 0; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1regint(JNIEnv *env, jobject thiz, jlong acc, jint jRegint) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1regint( + JNIEnv *env, jobject thiz, jlong acc, jint jRegint) { const uint32_t regint = (uint32_t)jRegint; return account_set_regint((struct account *)acc, regint); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1mediaenc(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1mediaenc( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *mediaenc = account_mediaenc((struct account *)acc); - if (mediaenc) return (*env)->NewStringUTF(env, mediaenc); + if (mediaenc) + return (*env)->NewStringUTF(env, mediaenc); } return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1mediaenc(JNIEnv *env, jobject thiz, jlong acc, jstring jMencid) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1mediaenc( + JNIEnv *env, jobject thiz, jlong acc, jstring jMencid) { const char *mencid = (*env)->GetStringUTFChars(env, jMencid, 0); int res; @@ -786,18 +795,19 @@ Java_com_tutpro_baresip_Api_account_1set_1mediaenc(JNIEnv *env, jobject thiz, jl return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1medianat(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1medianat( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *medianat = account_medianat((struct account *)acc); - if (medianat) return (*env)->NewStringUTF(env, medianat); + if (medianat) + return (*env)->NewStringUTF(env, medianat); } return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1medianat(JNIEnv *env, jobject thiz, jlong acc, jstring jMedNat) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1medianat( + JNIEnv *env, jobject thiz, jlong acc, jstring jMedNat) { const char *mednat = (*env)->GetStringUTFChars(env, jMedNat, 0); int res; @@ -809,8 +819,8 @@ Java_com_tutpro_baresip_Api_account_1set_1medianat(JNIEnv *env, jobject thiz, jl return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1sipnat(JNIEnv *env, jobject thiz, jlong acc, jstring jSipNat) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1sipnat( + JNIEnv *env, jobject thiz, jlong acc, jstring jSipNat) { const char *sipnat = (*env)->GetStringUTFChars(env, jSipNat, 0); int res; @@ -822,8 +832,8 @@ Java_com_tutpro_baresip_Api_account_1set_1sipnat(JNIEnv *env, jobject thiz, jlon return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1stun_1uri(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1stun_1uri( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const struct stun_uri *stun_uri = account_stun_uri((struct account *)acc); @@ -834,15 +844,15 @@ Java_com_tutpro_baresip_Api_account_1stun_1uri(JNIEnv *env, jobject thiz, jlong sprintf(uri_str, "%s:%s:%d?transport=tcp", stunuri_scheme_name(stun_uri->scheme), stun_uri->host, stun_uri->port); else - sprintf(uri_str, "%s:%s:%d", - stunuri_scheme_name(stun_uri->scheme), stun_uri->host, stun_uri->port); + sprintf(uri_str, "%s:%s:%d", stunuri_scheme_name(stun_uri->scheme), + stun_uri->host, stun_uri->port); } else { if (stun_uri->proto == IPPROTO_TCP) - sprintf(uri_str, "%s:%s?transport=tcp", - stunuri_scheme_name(stun_uri->scheme), stun_uri->host); + sprintf(uri_str, "%s:%s?transport=tcp", stunuri_scheme_name(stun_uri->scheme), + stun_uri->host); else - sprintf(uri_str, "%s:%s", - stunuri_scheme_name(stun_uri->scheme), stun_uri->host); + sprintf(uri_str, "%s:%s", stunuri_scheme_name(stun_uri->scheme), + stun_uri->host); } return (*env)->NewStringUTF(env, uri_str); } @@ -850,8 +860,8 @@ Java_com_tutpro_baresip_Api_account_1stun_1uri(JNIEnv *env, jobject thiz, jlong return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1stun_1uri(JNIEnv *env, jobject thiz, jlong acc, jstring jUri) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1stun_1uri( + JNIEnv *env, jobject thiz, jlong acc, jstring jUri) { const char *uri = (*env)->GetStringUTFChars(env, jUri, 0); int res; @@ -863,18 +873,19 @@ Java_com_tutpro_baresip_Api_account_1set_1stun_1uri(JNIEnv *env, jobject thiz, j return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1stun_1user(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1stun_1user( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *stun_user = account_stun_user((struct account *)acc); - if (stun_user) return (*env)->NewStringUTF(env, stun_user); + if (stun_user) + return (*env)->NewStringUTF(env, stun_user); } return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1stun_1user(JNIEnv *env, jobject thiz, jlong acc, jstring jUser) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1stun_1user( + JNIEnv *env, jobject thiz, jlong acc, jstring jUser) { const char *user = (*env)->GetStringUTFChars(env, jUser, 0); int res; @@ -886,18 +897,19 @@ Java_com_tutpro_baresip_Api_account_1set_1stun_1user(JNIEnv *env, jobject thiz, return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1stun_1pass(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1stun_1pass( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *stun_pass = account_stun_pass((struct account *)acc); - if (stun_pass) return (*env)->NewStringUTF(env, stun_pass); + if (stun_pass) + return (*env)->NewStringUTF(env, stun_pass); } return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1stun_1pass(JNIEnv *env, jobject thiz, jlong acc, jstring jPass) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1stun_1pass( + JNIEnv *env, jobject thiz, jlong acc, jstring jPass) { const char *pass = (*env)->GetStringUTFChars(env, jPass, 0); int res; @@ -909,14 +921,14 @@ Java_com_tutpro_baresip_Api_account_1set_1stun_1pass(JNIEnv *env, jobject thiz, return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1mwi(JNIEnv *env, jobject thiz, jlong acc, jboolean value) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1mwi( + JNIEnv *env, jobject thiz, jlong acc, jboolean value) { return account_set_mwi((struct account *)acc, value); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1vm_1uri(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1vm_1uri( + JNIEnv *env, jobject thiz, jlong acc) { char uri_buf[256]; if (acc) { @@ -933,46 +945,46 @@ Java_com_tutpro_baresip_Api_account_1vm_1uri(JNIEnv *env, jobject thiz, jlong ac return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1answermode(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1answermode( + JNIEnv *env, jobject thiz, jlong acc) { return account_answermode((struct account *)acc); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1answermode(JNIEnv *env, jobject thiz, jlong acc, jint jMode) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1answermode( + JNIEnv *env, jobject thiz, jlong acc, jint jMode) { const uint32_t mode = (uint32_t)jMode; return account_set_answermode((struct account *)acc, mode); } -JNIEXPORT jboolean JNICALL -Java_com_tutpro_baresip_Api_account_1rtcp_1mux(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_account_1rtcp_1mux( + JNIEnv *env, jobject thiz, jlong acc) { return account_rtcp_mux((struct account *)acc); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1rtcp_1mux(JNIEnv *env, jobject thiz, jlong acc, jboolean value) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1rtcp_1mux( + JNIEnv *env, jobject thiz, jlong acc, jboolean value) { return account_set_rtcp_mux((struct account *)acc, value); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1dtmfmode(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1dtmfmode( + JNIEnv *env, jobject thiz, jlong acc) { return account_dtmfmode((struct account *)acc); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_account_1set_1dtmfmode(JNIEnv *env, jobject thiz, jlong acc, jint jMode) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1dtmfmode( + JNIEnv *env, jobject thiz, jlong acc, jint jMode) { const uint32_t mode = (uint32_t)jMode; return account_set_dtmfmode((struct account *)acc, mode); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_account_1extra(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_account_1extra( + JNIEnv *env, jobject thiz, jlong acc) { if (acc) { const char *extra = account_extra((struct account *)acc); @@ -982,14 +994,14 @@ Java_com_tutpro_baresip_Api_account_1extra(JNIEnv *env, jobject thiz, jlong acc) return (*env)->NewStringUTF(env, ""); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_account_1debug(JNIEnv *env, jobject thiz, jlong acc) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_account_1debug( + JNIEnv *env, jobject thiz, jlong acc) { account_debug_log((struct account *)acc); } -JNIEXPORT jlong JNICALL -Java_com_tutpro_baresip_Api_ua_1alloc(JNIEnv *env, jobject thiz, jstring jUri) +JNIEXPORT jlong JNICALL Java_com_tutpro_baresip_Api_ua_1alloc( + JNIEnv *env, jobject thiz, jstring jUri) { const char *uri = (*env)->GetStringUTFChars(env, jUri, 0); struct ua *ua; @@ -1006,8 +1018,7 @@ Java_com_tutpro_baresip_Api_ua_1alloc(JNIEnv *env, jobject thiz, jstring jUri) return (jlong)ua; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_ua_1register(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_ua_1register(JNIEnv *env, jobject thiz, jlong ua) { LOGD("registering UA '%ld'\n", (long)ua); re_thread_enter(); @@ -1016,22 +1027,21 @@ Java_com_tutpro_baresip_Api_ua_1register(JNIEnv *env, jobject thiz, jlong ua) return res; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1unregister(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1unregister( + JNIEnv *env, jobject thiz, jlong ua) { re_thread_enter(); ua_unregister((struct ua *)ua); re_thread_leave(); } -JNIEXPORT jboolean JNICALL -Java_com_tutpro_baresip_Api_ua_1isregistered(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_ua_1isregistered( + JNIEnv *env, jobject thiz, jlong ua) { return ua_isregistered((struct ua *)ua) ? true : false; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1destroy(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1destroy(JNIEnv *env, jobject thiz, jlong ua) { LOGD("destroying ua %ld\n", (long)ua); re_thread_enter(); @@ -1039,8 +1049,7 @@ Java_com_tutpro_baresip_Api_ua_1destroy(JNIEnv *env, jobject thiz, jlong ua) re_thread_leave(); } -JNIEXPORT jlong JNICALL -Java_com_tutpro_baresip_Api_ua_1account(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT jlong JNICALL Java_com_tutpro_baresip_Api_ua_1account(JNIEnv *env, jobject thiz, jlong ua) { struct account *acc = 0; if (ua) @@ -1048,15 +1057,15 @@ Java_com_tutpro_baresip_Api_ua_1account(JNIEnv *env, jobject thiz, jlong ua) return (jlong)acc; } -JNIEXPORT jlong JNICALL -Java_com_tutpro_baresip_Api_ua_1update_1account(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT jlong JNICALL Java_com_tutpro_baresip_Api_ua_1update_1account( + JNIEnv *env, jobject thiz, jlong ua) { LOGD("updating account of ua %ld\n", (long)ua); return ua_update_account((struct ua *)ua); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1hangup(JNIEnv *env, jobject thiz, jlong ua, jlong call, jint code, jstring reason) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1hangup( + JNIEnv *env, jobject thiz, jlong ua, jlong call, jint code, jstring reason) { const uint16_t native_code = code; const char *native_reason = (*env)->GetStringUTFChars(env, reason, 0); @@ -1071,8 +1080,8 @@ Java_com_tutpro_baresip_Api_ua_1hangup(JNIEnv *env, jobject thiz, jlong ua, jlon (*env)->ReleaseStringUTFChars(env, reason, native_reason); } -JNIEXPORT jlong JNICALL -Java_com_tutpro_baresip_Api_ua_1call_1alloc(JNIEnv *env, jobject thiz, jlong ua, jlong xCall, jint vidMode) +JNIEXPORT jlong JNICALL Java_com_tutpro_baresip_Api_ua_1call_1alloc( + JNIEnv *env, jobject thiz, jlong ua, jlong xCall, jint vidMode) { struct call *call = NULL; int err; @@ -1086,8 +1095,8 @@ Java_com_tutpro_baresip_Api_ua_1call_1alloc(JNIEnv *env, jobject thiz, jlong ua, return (jlong)call; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1answer(JNIEnv *env, jobject thiz, jlong ua, jlong call, jint vidMode) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1answer( + JNIEnv *env, jobject thiz, jlong ua, jlong call, jint vidMode) { LOGD("answering ua/call %ld/%ld with video mode %d\n", (long)ua, (long)call, vidMode); re_thread_enter(); @@ -1095,9 +1104,9 @@ Java_com_tutpro_baresip_Api_ua_1answer(JNIEnv *env, jobject thiz, jlong ua, jlon re_thread_leave(); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1add_1custom_1header(JNIEnv *env, jobject thiz, jlong ua, - jstring jname, jstring jbody) { +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1add_1custom_1header( + JNIEnv *env, jobject thiz, jlong ua, jstring jname, jstring jbody) +{ const char *name = (*env)->GetStringUTFChars(env, jname, 0); const char *body = (*env)->GetStringUTFChars(env, jbody, 0); LOGD("adding header to %ld with name/body %s/%s\n", (long)ua, name, body); @@ -1108,19 +1117,18 @@ Java_com_tutpro_baresip_Api_ua_1add_1custom_1header(JNIEnv *env, jobject thiz, j int err = ua_add_custom_hdr((struct ua *)ua, &pl_name, &pl_body); re_thread_leave(); if (err) - LOGW("adding custom header to ua %ld failed with error %d\n", (long)ua, err); + LOGW("adding custom header to ua %ld failed with error %d\n", (long)ua, err); (*env)->ReleaseStringUTFChars(env, jname, name); (*env)->ReleaseStringUTFChars(env, jbody, body); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_ua_1debug(JNIEnv *env, jobject thiz, jlong ua) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1debug(JNIEnv *env, jobject thiz, jlong ua) { ua_debug_log((struct ua *)ua); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_calls_1mute(JNIEnv *env, jobject thiz, jboolean mute) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_calls_1mute( + JNIEnv *env, jobject thiz, jboolean mute) { struct le *ua_le; struct le *call_le; @@ -1136,8 +1144,8 @@ Java_com_tutpro_baresip_Api_calls_1mute(JNIEnv *env, jobject thiz, jboolean mute re_thread_leave(); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1connect(JNIEnv *env, jobject thiz, jlong call, jstring jPeer) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1connect( + JNIEnv *env, jobject thiz, jlong call, jstring jPeer) { const char *native_peer = (*env)->GetStringUTFChars(env, jPeer, 0); LOGD("connecting call %ld to %s\n", (long)call, native_peer); @@ -1146,13 +1154,14 @@ Java_com_tutpro_baresip_Api_call_1connect(JNIEnv *env, jobject thiz, jlong call, pl_set_str(&pl, native_peer); int err = call_connect((struct call *)call, &pl); re_thread_leave(); - if (err) LOGW("call_connect error: %d\n", err); + if (err) + LOGW("call_connect error: %d\n", err); (*env)->ReleaseStringUTFChars(env, jPeer, native_peer); return err; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_call_1notify_1sipfrag(JNIEnv *env, jobject thiz, jlong call, jint code, jstring reason) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_call_1notify_1sipfrag( + JNIEnv *env, jobject thiz, jlong call, jint code, jstring reason) { const uint16_t native_code = code; const char *native_reason = (*env)->GetStringUTFChars(env, reason, 0); @@ -1163,18 +1172,19 @@ Java_com_tutpro_baresip_Api_call_1notify_1sipfrag(JNIEnv *env, jobject thiz, jlo (*env)->ReleaseStringUTFChars(env, reason, native_reason); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_call_1start_1audio(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_call_1start_1audio( + JNIEnv *env, jobject thiz, jlong call) { LOGD("starting audio of call %ld\n", (long)call); re_thread_enter(); struct audio *a = call_audio((struct call *)call); - if (!audio_started(a)) audio_start(a); + if (!audio_started(a)) + audio_start(a); re_thread_leave(); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1hold(JNIEnv *env, jobject thiz, jlong call, jboolean hold) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1hold( + JNIEnv *env, jobject thiz, jlong call, jboolean hold) { int err; if (hold) { @@ -1188,43 +1198,46 @@ Java_com_tutpro_baresip_Api_call_1hold(JNIEnv *env, jobject thiz, jlong call, jb err = call_hold((struct call *)call, false); re_thread_leave(); } - if (err) LOGW("call_hold error: %d\n", err); + if (err) + LOGW("call_hold error: %d\n", err); return err; } -JNIEXPORT jboolean JNICALL -Java_com_tutpro_baresip_Api_call_1ismuted(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_call_1ismuted( + JNIEnv *env, jobject thiz, jlong call) { return audio_ismuted(call_audio((struct call *)call)); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1transfer(JNIEnv *env, jobject thiz, jlong call, jstring jPeer) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1transfer( + JNIEnv *env, jobject thiz, jlong call, jstring jPeer) { const char *native_peer = (*env)->GetStringUTFChars(env, jPeer, 0); LOGD("transfering call %ld to %s\n", (long)call, native_peer); re_thread_enter(); int err = call_transfer((struct call *)call, native_peer); re_thread_leave(); - if (err) LOGW("call_transfer error: %d\n", err); + if (err) + LOGW("call_transfer error: %d\n", err); (*env)->ReleaseStringUTFChars(env, jPeer, native_peer); return err; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1send_1digit(JNIEnv *env, jobject thiz, jlong call, jchar digit) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1send_1digit( + JNIEnv *env, jobject thiz, jlong call, jchar digit) { const uint16_t native_digit = digit; LOGD("sending DTMF digit '%c' to call %ld\n", (char)native_digit, (long)call); re_thread_enter(); int res = call_send_digit((struct call *)call, (char)native_digit); - if (!res) res = call_send_digit((struct call *)call, KEYCODE_REL); + if (!res) + res = call_send_digit((struct call *)call, KEYCODE_REL); re_thread_leave(); return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_call_1audio_1codecs(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_call_1audio_1codecs( + JNIEnv *env, jobject thiz, jlong call) { const struct aucodec *tx = audio_codec(call_audio((struct call *)call), true); const struct aucodec *rx = audio_codec(call_audio((struct call *)call), false); @@ -1233,8 +1246,8 @@ Java_com_tutpro_baresip_Api_call_1audio_1codecs(JNIEnv *env, jobject thiz, jlong unsigned int left = sizeof codec_buf; int len = -1; if (tx && rx) - len = re_snprintf(start, left, "%s/%u/%u,%s/%u/%u", tx->name, tx->srate, tx->ch, - rx->name, rx->srate, rx->ch); + len = re_snprintf(start, left, "%s/%u/%u,%s/%u/%u", tx->name, tx->srate, tx->ch, rx->name, + rx->srate, rx->ch); if (len == -1) { LOGE("failed to get audio codecs of call %ld\n", (long)call); codec_buf[0] = '\0'; @@ -1242,14 +1255,14 @@ Java_com_tutpro_baresip_Api_call_1audio_1codecs(JNIEnv *env, jobject thiz, jlong return (*env)->NewStringUTF(env, codec_buf); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1duration(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1duration( + JNIEnv *env, jobject thiz, jlong call) { return (jint)call_duration((struct call *)call); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_call_1stats(JNIEnv *env, jobject thiz, jlong call, jstring jStream) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_call_1stats( + JNIEnv *env, jobject thiz, jlong call, jstring jStream) { const char *native_stream = (*env)->GetStringUTFChars(env, jStream, 0); const struct stream *s; @@ -1266,11 +1279,9 @@ Java_com_tutpro_baresip_Api_call_1stats(JNIEnv *env, jobject thiz, jlong call, j const double tx_avg_rate = 1.0 * stream_metric_get_tx_avg_bitrate(s) / 1000.0; const double rx_avg_rate = 1.0 * stream_metric_get_rx_avg_bitrate(s) / 1000.0; len = re_snprintf(&(stats_buf[0]), 256, "%.1f/%.1f,%.1f/%.1f,%u/%u,%d/%d,%.1f/%.1f", - tx_rate, rx_rate, - tx_avg_rate, rx_avg_rate, - stats->tx.sent, stats->rx.sent, - stats->tx.lost, stats->rx.lost, - 1.0 * stats->tx.jit / 1000, 1.0 * stats->rx.jit / 1000); + tx_rate, rx_rate, tx_avg_rate, rx_avg_rate, stats->tx.sent, stats->rx.sent, + stats->tx.lost, stats->rx.lost, 1.0 * stats->tx.jit / 1000, + 1.0 * stats->rx.jit / 1000); if (len == -1) { LOGE("failed to get stats of call %ld %s stream\n", (long)call, native_stream); stats_buf[0] = '\0'; @@ -1280,20 +1291,20 @@ Java_com_tutpro_baresip_Api_call_1stats(JNIEnv *env, jobject thiz, jlong call, j return (*env)->NewStringUTF(env, stats_buf); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_call_1state(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_call_1state( + JNIEnv *env, jobject thiz, jlong call) { return call_state((struct call *)call); } -JNIEXPORT jboolean JNICALL -Java_com_tutpro_baresip_Api_call_1replaces(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_call_1replaces( + JNIEnv *env, jobject thiz, jlong call) { return call_supported((struct call *)call, REPLACES) ? true : false; } -JNIEXPORT jboolean JNICALL -Java_com_tutpro_baresip_Api_call_1replace_1transfer(JNIEnv *env, jobject thiz, jlong xferCall, jlong call) +JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_call_1replace_1transfer( + JNIEnv *env, jobject thiz, jlong xferCall, jlong call) { re_thread_enter(); int res = call_replace_transfer((struct call *)xferCall, (struct call *)call); @@ -1301,8 +1312,8 @@ Java_com_tutpro_baresip_Api_call_1replace_1transfer(JNIEnv *env, jobject thiz, j return res == 0 ? true : false; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_call_1peer_1uri(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_call_1peer_1uri( + JNIEnv *env, jobject thiz, jlong call) { const char *uri = call_peeruri((struct call *)call); if (uri) @@ -1310,8 +1321,8 @@ Java_com_tutpro_baresip_Api_call_1peer_1uri(JNIEnv *env, jobject thiz, jlong cal return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_call_1diverter_1uri(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_call_1diverter_1uri( + JNIEnv *env, jobject thiz, jlong call) { const char *uri = call_diverteruri((struct call *)call); if (uri) @@ -1319,15 +1330,16 @@ Java_com_tutpro_baresip_Api_call_1diverter_1uri(JNIEnv *env, jobject thiz, jlong return (*env)->NewStringUTF(env, ""); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_message_1send(JNIEnv *env, jobject thiz, jlong ua, jstring jPeer, jstring jMsg, jstring jTime) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_message_1send( + JNIEnv *env, jobject thiz, jlong ua, jstring jPeer, jstring jMsg, jstring jTime) { const char *native_peer = (*env)->GetStringUTFChars(env, jPeer, 0); const char *native_msg = (*env)->GetStringUTFChars(env, jMsg, 0); const char *native_time = (*env)->GetStringUTFChars(env, jTime, 0); LOGD("sending message from ua %ld to %s at %s\n", (long)ua, native_peer, native_time); re_thread_enter(); - int err = message_send((struct ua *)ua, native_peer, native_msg, send_resp_handler, (void *)native_time); + int err = message_send( + (struct ua *)ua, native_peer, native_msg, send_resp_handler, (void *)native_time); re_thread_leave(); if (err) { LOGW("message_send failed with error %d\n", err); @@ -1337,16 +1349,15 @@ Java_com_tutpro_baresip_Api_message_1send(JNIEnv *env, jobject thiz, jlong ua, j return err; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_call_1destroy(JNIEnv *env, jobject thiz, jlong call) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_call_1destroy( + JNIEnv *env, jobject thiz, jlong call) { re_thread_enter(); mem_deref((struct call *)call); re_thread_leave(); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_reload_1config(JNIEnv *env, jobject thiz) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_reload_1config(JNIEnv *env, jobject thiz) { int err; re_thread_enter(); @@ -1360,8 +1371,8 @@ Java_com_tutpro_baresip_Api_reload_1config(JNIEnv *env, jobject thiz) return err; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_cmd_1exec(JNIEnv *env, jobject thiz, jstring javaCmd) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_cmd_1exec( + JNIEnv *env, jobject thiz, jstring javaCmd) { const char *native_cmd = (*env)->GetStringUTFChars(env, javaCmd, 0); LOGD("processing command '%s'\n", native_cmd); @@ -1372,8 +1383,7 @@ Java_com_tutpro_baresip_Api_cmd_1exec(JNIEnv *env, jobject thiz, jstring javaCmd return res; } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_audio_1codecs(JNIEnv *env, jobject thiz) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_audio_1codecs(JNIEnv *env, jobject thiz) { struct list *aucodecl = baresip_aucodecl(); struct le *le; @@ -1399,8 +1409,7 @@ Java_com_tutpro_baresip_Api_audio_1codecs(JNIEnv *env, jobject thiz) return (*env)->NewStringUTF(env, codec_buf); } -JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_Api_video_1codecs(JNIEnv *env, jobject thiz) +JNIEXPORT jstring JNICALL Java_com_tutpro_baresip_Api_video_1codecs(JNIEnv *env, jobject thiz) { struct list *vidcodecl = baresip_vidcodecl(); struct le *le; @@ -1426,16 +1435,16 @@ Java_com_tutpro_baresip_Api_video_1codecs(JNIEnv *env, jobject thiz) return (*env)->NewStringUTF(env, codec_buf); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_log_1level_1set(JNIEnv *env, jobject thiz, jint level) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_log_1level_1set( + JNIEnv *env, jobject thiz, jint level) { const enum log_level native_level = (enum log_level)level; LOGD("setting log level to '%u'\n", native_level); log_level_set(native_level); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_net_1use_1nameserver(JNIEnv *env, jobject thiz, jstring javaServers) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_net_1use_1nameserver( + JNIEnv *env, jobject thiz, jstring javaServers) { const char *native_servers = (*env)->GetStringUTFChars(env, javaServers, 0); char servers[256]; @@ -1475,8 +1484,8 @@ Java_com_tutpro_baresip_Api_net_1use_1nameserver(JNIEnv *env, jobject thiz, jstr return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_net_1add_1address_1ifname(JNIEnv *env, jobject thiz, jstring jAddr, jstring jIfName) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_net_1add_1address_1ifname( + JNIEnv *env, jobject thiz, jstring jAddr, jstring jIfName) { const char *addr = (*env)->GetStringUTFChars(env, jAddr, 0); const char *name = (*env)->GetStringUTFChars(env, jIfName, 0); @@ -1498,8 +1507,8 @@ Java_com_tutpro_baresip_Api_net_1add_1address_1ifname(JNIEnv *env, jobject thiz, return res; } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_net_1rm_1address(JNIEnv *env, jobject thiz, jstring jIp) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_net_1rm_1address( + JNIEnv *env, jobject thiz, jstring jIp) { const char *native_ip = (*env)->GetStringUTFChars(env, jIp, 0); int res = 0; @@ -1523,8 +1532,8 @@ Java_com_tutpro_baresip_Api_net_1rm_1address(JNIEnv *env, jobject thiz, jstring return res; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_uag_1reset_1transp(JNIEnv *env, jobject thiz, jboolean reg, jboolean reinvite) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_uag_1reset_1transp( + JNIEnv *env, jobject thiz, jboolean reg, jboolean reinvite) { LOGD("reseting transports (%d, %d)\n", reg, reinvite); re_thread_enter(); @@ -1532,31 +1541,29 @@ Java_com_tutpro_baresip_Api_uag_1reset_1transp(JNIEnv *env, jobject thiz, jboole re_thread_leave(); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_uag_1enable_1sip_1trace(JNIEnv *env, jobject thiz, jboolean enable) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_uag_1enable_1sip_1trace( + JNIEnv *env, jobject thiz, jboolean enable) { LOGD("enabling sip trace (%d)\n", enable); uag_enable_sip_trace(enable); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_net_1debug(JNIEnv *env, jobject thiz) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_net_1debug(JNIEnv *env, jobject thiz) { re_thread_enter(); net_debug_log(); re_thread_leave(); } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_net_1dns_1debug(JNIEnv *env, jobject thiz) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_net_1dns_1debug(JNIEnv *env, jobject thiz) { re_thread_enter(); net_dns_debug_log(); re_thread_leave(); } -JNIEXPORT jint JNICALL -Java_com_tutpro_baresip_Api_module_1load(JNIEnv *env, jobject thiz, jstring javaModule) +JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_module_1load( + JNIEnv *env, jobject thiz, jstring javaModule) { const char *native_module = (*env)->GetStringUTFChars(env, javaModule, 0); int result = module_load(".", native_module); @@ -1564,8 +1571,8 @@ Java_com_tutpro_baresip_Api_module_1load(JNIEnv *env, jobject thiz, jstring java return result; } -JNIEXPORT void JNICALL -Java_com_tutpro_baresip_Api_module_1unload(JNIEnv *env, jobject thiz, jstring javaModule) +JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_module_1unload( + JNIEnv *env, jobject thiz, jstring javaModule) { const char *native_module = (*env)->GetStringUTFChars(env, javaModule, 0); module_unload(native_module);