sam_oneal/dial-reference
1
0
Fork 0
mirror of https://github.com/Netflix/dial-reference.git synced 2026-06-08 02:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

added hide handling

Browse Source
This commit is contained in:
jcli
2016-07-12 11:08:44 -07:00
parent ddef7562f5
commit c4c877da81
4 changed files with 117 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/DialServer.cpp
View File

@@ -31,8 +31,10 @@ using namespace std;
enum DIAL_COMMAND{
COMMAND_LAUNCH,
COMMAND_STATUS,
COMMAND_KILL
COMMAND_KILL,
COMMAND_HIDE
};
const char* DIAL_COMMAND_STR[] = {"LAUNCH", "STATUS", "KILL", "HIDE"};
static size_t header_cb(void* ptr, size_t size, size_t nmemb, void* userdata)
{
@@ -78,7 +80,7 @@ int DialServer::sendCommand(
return 0;
}
if (command == COMMAND_LAUNCH)
if (command == COMMAND_LAUNCH || command == COMMAND_HIDE)
{
curl_easy_setopt(curl, CURLOPT_POST, true);
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, payload.size());
@@ -94,10 +96,7 @@ int DialServer::sendCommand(
{
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
}
ATRACE("Sending %s:%s\n",
command == COMMAND_LAUNCH ? "LAUNCH" :
(command == COMMAND_KILL ? "KILL" : "STATUS"),
url.c_str());
ATRACE("Sending %s:%s\n", DIAL_COMMAND_STR[command], url.c_str());
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_cb);
@@ -251,6 +250,24 @@ int DialServer::stopApplication(
return status;
}
int DialServer::hideApplication(
string &application,
string &responseHeaders,
string &responseBody )
{
ATRACE("%s: Hide %s\n", __FUNCTION__, application.c_str());
string emptyPayload;
string appUrl = m_appsUrl;
// just call status to update the run endpoint
getStatus( application, responseHeaders, responseBody );
int status = sendCommand(
(appUrl.append(application)).append("/"+m_stopEndPoint).append("/suspend"),
COMMAND_HIDE, emptyPayload, responseHeaders, responseBody );
return status;
}
int DialServer::getHttpResponseHeader(
string &responseHeaders,
string &header,

18
client/DialServer.h
View File

@@ -26,6 +26,9 @@
#ifndef DIALSERVER_H
#define DIALSERVER_H
#include <stdio.h>
#include <stdlib.h>
//#define DEBUG
#ifdef DEBUG
#define ATRACE(...) printf(__VA_ARGS__)
@@ -126,6 +129,21 @@ public:
string &responseHeaders,
string &responseBody );
/**
* Hide a DIAL application
*
* @param[in] application Name of the application to launch
* @param[out] responseHeaders Returns the HTTP response headers
* @param[out] responseBody Returns the HTTP response body
*
* @return 0 if successful, !0 otherwise
*/
int hideApplication(
string &application,
string &responseHeaders,
string &responseBody );
/**
* Get the status of a DIAL application
*

42
client/main.cpp
View File

@@ -222,15 +222,17 @@ int handleUser(DialDiscovery *pDial) {
memset(buf, 0, 80);
printf("0. Rescan and list DIAL servers\n");
printf("1. Launch Netflix\n");
printf("2. Kill Netflix\n");
printf("3. Netflix status\n");
printf("4. Launch YouTube\n");
printf("5. Kill YouTube\n");
printf("6. YouTube status\n");
printf("7. Run conformance tests\n");
printf("8. Wake up on lan/wlan\n");
printf("9. QUIT\n");
printf("Command (0:1:2:3:4:5:6:7:8:9): ");
printf("2. Hide Netflix\n");
printf("3. Kill Netflix\n");
printf("4. Netflix status\n");
printf("5. Launch YouTube\n");
printf("6. Hide YouTube\n");
printf("7. Kill YouTube\n");
printf("8. YouTube status\n");
printf("9. Run conformance tests\n");
printf("10. Wake up on lan/wlan\n");
printf("11. QUIT\n");
printf("Command (0:1:2:3:4:5:6:7:8:9:10:11): ");
scanf("%s", buf);
switch( atoi(buf) )
{
@@ -244,34 +246,42 @@ int handleUser(DialDiscovery *pDial) {
pServer->launchApplication( netflix, payload, responseHeaders, responseBody );
break;
case 2:
printf("Hide Netflix\n");
pServer->hideApplication( netflix, responseHeaders, responseBody );
break;
case 3:
printf("Kill Netflix\n");
pServer->stopApplication( netflix, responseHeaders );
break;
case 3:
case 4:
printf("Netflix Status: \n");
pServer->getStatus( netflix, responseHeaders, responseBody );
printf("RESPONSE: \n%s\n", responseBody.c_str());
break;
case 4:
case 5:
printf("Launch YouTube\n");
pServer->launchApplication( youtube, payload, responseHeaders, responseBody );
break;
case 5:
case 6:
printf("Hide YouTube\n");
pServer->hideApplication( youtube, responseHeaders, responseBody );
break;
case 7:
printf("Kill YouTube\n");
pServer->stopApplication( youtube, responseHeaders );
break;
case 6:
case 8:
printf("YouTube Status: \n");
pServer->getStatus( youtube, responseHeaders, responseBody );
break;
case 7:
case 9:
runConformance();
break;
case 8:
case 10:
printf("Sending the magic packet\n");
sendMagic(pServer->getMacAddress());
break;
case 9:
case 11:
processInput = 0;
processInputOuter = 0;
break;