Merge fa5fb2e into 6f20723

appveyor.yml

@@ -92,7 +92,6 @@ build_script:
     cd E:\tinyphone
 
     sed -i 's/stampver.inf.*\$/stampver.inf $/g' tinyphone.vcxproj
-    cat tinyphone.vcxproj
 
     msbuild /m tinyphone.sln /p:Configuration=$BuildMode /p:Platform=x86
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }

config.json

@@ -28,5 +28,6 @@
 	"metricsProto" : "UDP",
 	"metricsServerHosts" : ["10.32.194.187", "10.32.110.41", "10.47.192.13"],
 	"metricsServerPort" : 8125,
-	"autoDeviceRefresh" :  true
+	"autoDeviceRefresh" :  true,
+	"autoAnswer" : true
 }

tinyphone/account.cpp

@@ -91,16 +91,19 @@ namespace tp {
 		SIPCall *call = new SIPCall(*this, iprm.callId);
 		CallInfo ci = call->getInfo();
 		try {
-			CallOpParam prm;
 
 			PJ_LOG(3, (__FILENAME__, "Incoming Call: [%s] [%s]", ci.remoteUri.c_str(), ci.stateText.c_str()));
 
 			eventStream->publishEvent(ci, iprm);
 
 			calls.push_back(call);
-			prm.statusCode = pjsip_status_code::PJSIP_SC_OK;
-			call->answer(prm);
-			onCallEstablished(call);
+
+			if(ApplicationConfig.autoAnswer){
+				CallOpParam prm;
+				prm.statusCode = pjsip_status_code::PJSIP_SC_OK;
+				call->answer(prm);
+				onCallEstablished(call);
+			}
 		}
 		catch (...) {
 			PJ_LOG(3, (__FILENAME__, "ERROR Answering IncomingCall [%s]", ci.remoteUri.c_str()));

tinyphone/config.h

@@ -63,6 +63,7 @@ namespace tp {
 		int metricsServerPort;
 
 		bool autoDeviceRefresh;
+		bool autoAnswer;
 
 
 		std::string ua(){
@@ -104,6 +105,7 @@ namespace tp {
 			{"metricsServerHosts", p.metricsServerHosts },
 			{"metricsServerPort", p.metricsServerPort },
 			{"autoDeviceRefresh", p.autoDeviceRefresh },
+			{"autoAnswer", p.autoAnswer },
 		};
     }
 
@@ -138,6 +140,7 @@ namespace tp {
 		j.at("metricsProto").get_to(p.metricsProto);
 		j.at("metricsServerPort").get_to(p.metricsServerPort);
 		j.at("autoDeviceRefresh").get_to(p.autoDeviceRefresh);
+		j.at("autoAnswer").get_to(p.autoAnswer);
     }
 
     extern appConfig ApplicationConfig;

tinyphone/server.cpp

@@ -422,6 +422,31 @@ void TinyPhoneHttpServer::Start() {
 		}
 	});
 
+
+	CROW_ROUTE(app, "/calls/<int>/answer")
+		.methods("POST"_method)
+		([&phone](int call_id) {
+		pj_thread_auto_register();
+
+		SIPCall* call = phone.CallById(call_id);
+		if (call == nullptr) {
+			return tp::response(400, {
+				{ "message", "Call Not Found" },
+				{"call_id" , call_id}
+				});
+		}
+		else {
+			CallOpParam prm;
+			prm.statusCode = pjsip_status_code::PJSIP_SC_OK;
+			call->answer(prm);
+			json response = {
+				{ "message",  "Answer Triggered" },
+				{ "call_id" , call_id }
+			};
+			return tp::response(200, response);
+		}
+	});
+
 	CROW_ROUTE(app, "/calls/<int>/hold")
 		.methods("PUT"_method, "DELETE"_method)
 		([&phone](const crow::request& req, int call_id) {