update

generate_extension_conf.c

@@ -254,9 +254,9 @@ fputs("[CallingRule_OutCall]\n",conf_dialrule_fp);
             printf("some feild is empty!\n");
             continue;
         }
-
+//PJSIP/${profix}${exten}
         memset(dialrule,0,sizeof(dialrule));
-        sprintf(dialrule, "exten => _%s,1,Gosub(trunkdial-failover,s,1(${EXTEN},${%s}",g_row[1], g_row[0]);
+        sprintf(dialrule, "exten => _%s,1,Gosub(trunkdial-failover,s,1(${EXTEN},PJSIP/",g_row[1]);
         if(g_row[3] != NULL){
             strcat(dialrule,g_row[3]);
         }
@@ -268,7 +268,9 @@ fputs("[CallingRule_OutCall]\n",conf_dialrule_fp);
         if(g_row[4] != NULL){
             strcat(dialrule,g_row[4]);
         }
-        strcat(dialrule,"))\n");
+        strcat(dialrule,"@${");
+        strcat(dialrule,g_row[0]);
+        strcat(dialrule,"}))\n");
         fputs(dialrule,conf_dialrule_fp);
     }
 
@@ -600,6 +602,20 @@ exten => _%s.,1,Gosub(calltrigger,s,1(${EXTEN}))\n\
 cJSON_GetObjectItem(pJson, "start")->valuestring,\
 cJSON_GetObjectItem(pJson, "stop")->valuestring\
 );
+            if(cJSON_HasObjectItem(pJson, "enRetriggered"))
+            {
+                fprintf(conf_global_fp, "\
+STOP_WHEN_RETRIGGERED = %s\n\
+",\
+cJSON_GetObjectItem(pJson, "enRetriggered")->valuestring\
+);
+            }
+            else
+            {
+                fprintf(conf_global_fp, "\
+STOP_WHEN_RETRIGGERED = no\n\
+");
+            }
         }
         else if(strcmp(g_row[1],"pbx.sipsettings.config") == 0){
             pJson = cJSON_Parse(g_row[2]);

generate_trunk_conf.c

@@ -839,13 +839,12 @@ mytime()\
         while(i < trunk_size){
             fprintf(global_fp, "\
 CID_%s = %s\n\
-%s=SIP/%s/%s\
+%s=%s\
 \n", \
 trunkObject[i].trunk,\
 trunkObject[i].outboundcid,\
 trunkObject[i].trunk,\
-trunkObject[i].trunk,\
-trunkObject[i].prefix\
+trunkObject[i].trunk\
 );
                 
             i++;