Feat/meeting duration

.gitignore

@@ -57,4 +57,8 @@ devtools/
 
 # Ignore Gradle project-specific cache directory
 .gradle
+.kotlin/
+.idea/
+*.iml
 
+/kmp/build

Jenkinsfile

@@ -94,7 +94,10 @@ pipeline {
                 }
                 stage('macOS') {
                     agent {
-                        label 'built-in'
+                        label 'macos'
+                    }
+                    environment {
+                        PATH = "/opt/homebrew/bin:/Users/jenkins/.cargo/bin:/usr/local/bin:${env.PATH}"
                     }
                     steps {
                         script {
@@ -227,7 +230,7 @@ pipeline {
                 axes {
                     axis {
                         name 'AGENT'
-                        values 'built-in', 'linuxbuild'
+                        values 'macos', 'linuxbuild'
                     }
                 }
                 agent {
@@ -289,6 +292,11 @@ pipeline {
                 }
             }
         }
+
+        // WPB-22450 Push ios avs to Maven central
+        // ios build will require macos agent
+        // ORG_GRADLE_PROJECT_VERSION_NAME=$version ./gradlew publisIos64ToMavenCentral
+
 //        stage('Publish to ios github repo') {
 //            when {
 //                anyOf {
@@ -322,15 +330,15 @@ pipeline {
         }
 
         success {
-            node( 'built-in' ) {
+            node( 'macos' ) {
                 withCredentials([ string( credentialsId: 'wire-jenkinsbot', variable: 'jenkinsbot_secret' ) ]) {
                     wireSend secret: "$jenkinsbot_secret", message: "✅ ${JOB_NAME} #${BUILD_ID} succeeded\n**Changelog:**\n${changelog}\n${BUILD_URL}console\nhttps://github.com/wireapp/wire-avs/commit/${commitId}"
                 }
             }
         }
 
         failure {
-            node( 'built-in' ) {
+            node( 'macos' ) {
                 withCredentials([ string( credentialsId: 'wire-jenkinsbot', variable: 'jenkinsbot_secret' ) ]) {
                     wireSend secret: "$jenkinsbot_secret", message: "❌ ${JOB_NAME} #${BUILD_ID} failed\n${BUILD_URL}console\nhttps://github.com/wireapp/wire-avs/commit/${commitId}"
                 }

build.gradle

@@ -1,12 +1,20 @@
-import com.vanniktech.maven.publish.SonatypeHost
+import com.vanniktech.maven.publish.JavaLibrary
 
 plugins {
     id "java-library"
-    id("com.vanniktech.maven.publish.base") version "0.29.0"
+    id("com.vanniktech.maven.publish.base") version "0.34.0"
+    id("org.jetbrains.kotlin.multiplatform") version "2.2.21" apply false
+}
+
+group = findProperty("GROUP") ?: "com.wire"
+version = findProperty("VERSION_NAME") ?: "0.0.1-local"
+
+repositories {
+    mavenCentral()
 }
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    publishToMavenCentral()
     pomFromGradleProperties()
     signAllPublications()
 }
@@ -36,4 +44,4 @@ afterEvaluate {
             enabled = false
         }
     }
-}
+}

docs/api/api_changes_10.3.txt

@@ -0,0 +1,21 @@
+Changes introduced in AVS 10.3
+==============================
+
+Added API calls:
+  - wcall_set_duration
+  - wcall_set_config_version
+
+The wcall_set_duration API is used to set the max duration of a conference call.
+If the call is not terminated withing the time period (from the very start of the call)
+the call will be force terminated after the duration has elapsed.
+The duration parameter is expressend in seconds(s).
+
+void wcall_set_duration(WUSER_HANDLE wuser, const char *convid, int duration);
+
+The wcall_set_config_version API is used to set the version of the SFT and/or the TURN
+server to use for processing. This is usefull in order to get test clients to connect
+to different versions of the said servers depending on feature flags or other business logic.
+
+void wcall_set_config_version(int sft_version, int turn_version);
+
+

gradle.properties

@@ -1,7 +1,7 @@
 # gradle-maven-publish configuration
 GROUP=com.wire
-SONATYPE_HOST=CENTRAL_PORTAL
-SONATYPE_AUTOMATIC_RELEASE=true
+mavenCentralPublishing=true
+mavenCentralAutomaticPublishing=true
 RELEASE_SIGNING_ENABLED=true
 POM_NAME=wire-avs
 POM_DESCRIPTION=Wire - Audio, Video, and Signaling (AVS)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

include/avs.h

@@ -42,6 +42,7 @@ extern "C" {
 #include "avs_conf_pos.h"
 #include "avs_conf_member.h"
 #include "avs_dict.h"
+#include "avs_stats.h"
 #include "avs_jzon.h"
 #include "avs_kase.h"
 #include "avs_log.h"

include/avs_base.h

@@ -44,6 +44,7 @@ void avs_print_network(void);
 #define EDATACHANNEL       (-1003)
 #define ENOONEJOINED       (-1004)
 #define EEVERYONELEFT      (-1005)
+#define EDURATION          (-1006)
 
 #define E2EE_SESSIONKEY_SIZE 32
 

include/avs_ccall.h

@@ -29,7 +29,8 @@ enum ccall_state {
 	CCALL_STATE_ACTIVE,
 	CCALL_STATE_TERMINATING,
 	CCALL_STATE_WAITCONFIG,
-	CCALL_STATE_WAITCONFIG_OUTGOING
+	CCALL_STATE_WAITCONFIG_OUTGOING,
+	CCALL_STATE_WAITNETWORK,
 };
 
 int ccall_alloc(struct ccall **ccallp,
@@ -50,7 +51,7 @@ int  ccall_add_sft(struct icall *icall, const char *sft_url);
 
 int  ccall_start(struct icall *icall,
 		 enum icall_call_type call_type,
-		 bool audio_cbr);
+		 bool audio_cbr, bool meeting);
 
 int  ccall_answer(struct icall *icall,
 		  enum icall_call_type call_type,
@@ -95,11 +96,12 @@ int  ccall_set_background(struct icall *icall, bool background);
 
 int  ccall_stats(struct re_printf *pf, const struct icall *icall);
 int  ccall_stats_struct(const struct ccall *ccall,
-		        struct iflow_stats *stats);
+		        struct stats_report *stats);
 
 int  ccall_debug(struct re_printf *pf, const struct icall* icall);
 
 int  ccall_activate(struct icall *icall, bool active);
+void ccall_set_duration(struct icall *icall, int duration);
 int  ccall_restart(struct icall *icall);
 
 const char *ccall_state_name(enum ccall_state state);

include/avs_config.h

@@ -52,6 +52,7 @@ int  config_alloc(struct config **cfgp,
 		  config_req_h *reqh, config_update_h *updh, void *arg);
 int  config_update(struct config *cfg, int err,
 		   const char *conf_json, size_t len);
+bool config_needs_update(struct config *cfg);
 int  config_start(struct config *cfg);
 void config_stop(struct config *cfg);
 int  config_request(struct config *cfg);

include/avs_ecall.h

@@ -18,7 +18,6 @@
 
 
 struct ecall;
-struct iflow_stats;
 
 struct ecall_conf {
 	struct econn_conf econf;
@@ -38,7 +37,7 @@ int ecall_add_turnserver(struct ecall *ecall,
 			 struct zapi_ice_server *srv);
 int  ecall_start(struct ecall *ecall,
 		 enum icall_call_type call_type,
-		 bool audio_cbr);
+		 bool audio_cbr, bool meeting);
 int  ecall_answer(struct ecall *ecall,
 		  enum icall_call_type call_type,
 		  bool audio_cbr);
@@ -71,7 +70,7 @@ int ecall_debug(struct re_printf *pf, const struct ecall *ecall);
 int ecall_stats(struct re_printf *pf, const struct ecall *ecall);
 int ecall_mfdebug(struct re_printf *pf, const struct ecall *ecall);
 int ecall_stats_struct(const struct ecall *ecall,
-		       struct iflow_stats *stats);
+		       struct stats_report *stats);
 int ecall_activate(struct ecall *ecall, bool active);
 
 int ecall_set_background(struct ecall *ecall, bool background);

include/avs_egcall.h

@@ -60,7 +60,7 @@ int egcall_add_turnserver(struct icall *icall,
 
 int egcall_start(struct icall *icall,
 		 enum icall_call_type call_type,
-		 bool audio_cbr);
+		 bool audio_cbr, bool meeting);
 
 int egcall_answer(struct icall *icall,
 		  enum icall_call_type call_type,

include/avs_icall.h

@@ -32,11 +32,13 @@
 #define ICALL_REASON_EVERYONE_LEFT     13
 #define ICALL_REASON_AUTH_FAILED       14
 #define ICALL_REASON_AUTH_FAILED_START 15
+#define ICALL_REASON_DURATION          16
 
 struct icall;
 struct econn_message;
 struct wcall_members;
 struct econn_message;
+struct stats_report;
 
 
 enum icall_call_type {
@@ -112,7 +114,8 @@
 typedef int  (icall_add_sft)(struct icall *icall,
 			     const char *sft_url);
 typedef int  (icall_start)(struct icall *icall,
-			   enum icall_call_type call_type, bool audio_cbr);
+			   enum icall_call_type call_type, bool audio_cbr,
+			   bool meeting);
 typedef int  (icall_answer)(struct icall *icall,
 			    enum icall_call_type call_type, bool audio_cbr);
 typedef void (icall_end)(struct icall *icall);
@@ -151,6 +154,7 @@
 typedef int  (icall_set_background)(struct icall *icall, bool background);
 
 typedef int  (icall_activate)(struct icall *icall, bool active);
+typedef void (icall_set_duration)(struct icall *icall, int duration);
 typedef int  (icall_restart)(struct icall *icall);
 
 /* Callbacks from icall */
@@ -220,7 +224,8 @@
 typedef void (icall_quality_h)(struct icall *icall,
 			       const char *userid,
 			       const char *clientid,
-			       int rtt, int uploss, int downloss,
+			       struct stats_report stats,
+			       enum icall_conv_type peer,
 			       void *arg);
 typedef void (icall_norelay_h)(struct icall *icall, bool local, void *arg);
 
@@ -231,7 +236,6 @@
 typedef void (icall_req_new_epoch_h)(struct icall *icall, void *arg);
 
 
-
 struct icall {
 	icall_add_turnserver		*add_turnserver;
 	icall_add_sft			*add_sft;
@@ -256,6 +260,7 @@
 	icall_stats			*stats;
 	icall_set_background            *set_background;
 	icall_activate                  *activate;
+        icall_set_duration              *set_duration;
 	icall_restart                   *restart;
 	icall_send_h			*sendh;
 	icall_sft_h			*sfth;
@@ -311,6 +316,7 @@
 			 icall_stats			*stats,
 			 icall_set_background           *set_background,
 			 icall_activate                 *activate,
+			 icall_set_duration             *set_duration,
 			 icall_restart                  *restart);
 
 void icall_set_callbacks(struct icall *icall,

include/avs_iflow.h

@@ -23,16 +23,6 @@
 struct iflow;
 struct avs_vidframe;
 
-struct iflow_stats {
-	uint8_t audio_level;
-	uint8_t audio_level_smooth;
-	uint32_t apkts_recv;
-	uint32_t apkts_sent;
-	uint32_t vpkts_recv;
-	uint32_t vpkts_sent;
-	float dloss;
-	float rtt;
-};
 
 /* Calls into iflow */
 typedef int  (iflow_set_video_state)(struct iflow *flow, enum icall_vstate vstate);
@@ -85,7 +75,7 @@ typedef int (iflow_dce_send)(struct iflow *flow,
 			     size_t len);
 
 typedef int  (iflow_get_stats)(struct iflow *flow,
-			       struct iflow_stats *stats);
+			       struct stats_report *stats);
 
 typedef int  (iflow_get_audio_level)(struct iflow *flow,
 				     struct list *levell);

include/avs_jzon.h

@@ -96,6 +96,6 @@ struct json_object *json_object_array_get_idx(struct json_object *obj,
 bool json_object_object_get_ex(struct json_object *obj, const char *key,
 			       struct json_object **value);
 const char * json_object_get_string(struct json_object *obj);
-int32_t      json_object_get_int(struct json_object *obj);
+int64_t      json_object_get_int(struct json_object *obj);
 double       json_object_get_double(struct json_object *obj);
 bool         json_object_get_boolean(struct json_object *obj);

include/avs_msystem.h

@@ -102,6 +102,10 @@ void msystem_set_packet_size(int packet_size_ms);
 bool msystem_get_muted(void);
 void msystem_set_muted(bool muted);
 void msystem_activate(bool active);
+void msystem_set_config_version(int sft_version, int turn_version);
+int  msystem_get_sft_config_version(void);
+int  msystem_get_turn_config_version(void);
+
 
 
 #endif

include/avs_rest.h

@@ -69,7 +69,7 @@ const struct list *cookie_jar_list(const struct cookie_jar *jar);
 
 
 struct login_token {
-	uint32_t expires_in; /* seconds */
+	uint64_t expires_in; /* seconds */
 	char access_token[256];
 	char token_type[32];
 };