Merge "Build System: Create 'make install-configs' target."
authorJoshua Colp <jcolp@digium.com>
Fri, 27 Jul 2018 10:51:44 +0000 (05:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 27 Jul 2018 10:51:44 +0000 (05:51 -0500)
res/res_rtp_asterisk.c
tests/CI/gates.jenkinsfile
tests/CI/periodics-daily.jenkinsfile
tests/CI/ref_debug.jenkinsfile
tests/CI/unittests.jenkinsfile

index 36b9cb9..074bcea 100644 (file)
@@ -7414,9 +7414,29 @@ static int rtp_red_init(struct ast_rtp_instance *instance, int buffer_time, int
 static int rtp_red_buffer(struct ast_rtp_instance *instance, struct ast_frame *frame)
 {
        struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
+       struct rtp_red *red = rtp->red;
+
+       if (!red) {
+               return 0;
+       }
+
+       if (frame->datalen > 0) {
+               if (red->t140.datalen > 0) {
+                       const unsigned char *primary = red->buf_data;
+
+                       /* There is something already in the T.140 buffer */
+                       if (primary[0] == 0x08 || primary[0] == 0x0a || primary[0] == 0x0d) {
+                               /* Flush the previous T.140 packet if it is a command */
+                               ast_rtp_write(instance, &rtp->red->t140);
+                       } else {
+                               primary = frame->data.ptr;
+                               if (primary[0] == 0x08 || primary[0] == 0x0a || primary[0] == 0x0d) {
+                                       /* Flush the previous T.140 packet if we are buffering a command now */
+                                       ast_rtp_write(instance, &rtp->red->t140);
+                               }
+                       }
+               }
 
-       if (frame->datalen > -1) {
-               struct rtp_red *red = rtp->red;
                memcpy(&red->buf_data[red->t140.datalen], frame->data.ptr, frame->datalen);
                red->t140.datalen += frame->datalen;
                red->t140.ts = frame->ts;
index 82a39a3..78a9d24 100644 (file)
@@ -62,6 +62,9 @@ pipeline {
                        steps {
                                /* Here's where we switch to scripted pipeline */
                                script {
+                                       manager.build.displayName = "${env.GERRIT_CHANGE_NUMBER}"
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
+
                                        stage ("Checkout") {
                                                sh "sudo chown -R jenkins:users ."  
                                                env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")
@@ -115,6 +118,8 @@ pipeline {
                                                " --entrypoint=''"
                                        def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
                                        def outputdir = "tests/CI/output/Testsuite"
+
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Image: ${randomImage}", false)
                                        def img = docker.image(randomImage)
                                        img.pull()
 
index 60b0ede..2d72766 100644 (file)
@@ -25,6 +25,8 @@ pipeline {
                        steps {
                                /* Here's where we switch to scripted pipeline */
                                script {
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
+
                                        stage ("Checkout") {
                                                sh "sudo chown -R jenkins:users ."
                                                sh "printenv | sort"
@@ -40,6 +42,8 @@ pipeline {
                                                " --entrypoint=''"
                                        def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
                                        def outputdir = "tests/CI/output/Testsuite"
+
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Image: ${randomImage}", false)
                                        def img = docker.image(randomImage)
                                        img.pull()
 
index 7ef40e7..d046a49 100644 (file)
@@ -25,6 +25,8 @@ pipeline {
                        steps {
                                /* Here's where we switch to scripted pipeline */
                                script {
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
+
                                        stage ("Checkout") {
                                                sh "sudo chown -R jenkins:users ."  
                                                sh "printenv | sort"
@@ -40,6 +42,8 @@ pipeline {
                                                " --entrypoint=''"
                                        def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
                                        def outputdir = "tests/CI/output/Testsuite"
+
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Image: ${randomImage}", false)
                                        def img = docker.image(randomImage)
                                        img.pull()
 
index 438213b..b019bee 100644 (file)
@@ -63,6 +63,9 @@ pipeline {
                        }
                        steps {
                                script {
+                                       manager.build.displayName = "${env.GERRIT_CHANGE_NUMBER}"
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
+
                                        stage ("Checkout") {
                                                sh "sudo chown -R jenkins:users ."
                                                env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")
@@ -117,6 +120,7 @@ pipeline {
                                                " --entrypoint='' --name ${bt}-build"
                                        def outputdir = "tests/CI/output/UnitTests"
 
+                                       manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Image: ${randomImage}", false)
                                        def img = docker.image(randomImage)
                                        img.pull()
                                        img.inside(dockerOptions) {