denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xpc: use the same XPC message "type" mechanism on Mach service as on channels

Browse Source
This commit is contained in:
Martin Willi
2013-07-18 12:17:55 +02:00
parent 39d15dde67
commit d5966e71e9
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/osx/charon-xpc/xpc_dispatch.c
+32 -11
View File
@@ -195,7 +195,7 @@ xpc_object_t start_connection(private_xpc_dispatch_t *this,
} }
/** /**
* XPC command dispatch table * XPC RPC command dispatch table
*/ */
static struct { static struct {
char *name; char *name;
@@ -213,26 +213,47 @@ static void handle(private_xpc_dispatch_t *this, xpc_object_t request)
{ {
xpc_connection_t client; xpc_connection_t client;
xpc_object_t reply; xpc_object_t reply;
const char *command; const char *type, *rpc;
bool found = FALSE;
int i; int i;
client = xpc_dictionary_get_remote_connection(request); client = xpc_dictionary_get_remote_connection(request);
command = xpc_dictionary_get_string(request, "command"); type = xpc_dictionary_get_string(request, "type");
if (command) if (type)
{ {
for (i = 0; i < countof(commands); i++) if (streq(type, "rpc"))
{ {
if (streq(commands[i].name, command)) rpc = xpc_dictionary_get_string(request, "rpc");
if (rpc)
{ {
reply = commands[i].handler(this, request, client); for (i = 0; i < countof(commands); i++)
if (reply)
{ {
xpc_connection_send_message(client, reply); if (streq(commands[i].name, rpc))
xpc_release(reply); {
found = TRUE;
reply = commands[i].handler(this, request, client);
if (reply)
{
xpc_connection_send_message(client, reply);
xpc_release(reply);
}
break;
}
} }
break; }
if (!found)
{
DBG1(DBG_CFG, "received unknown XPC rpc command: %s", rpc);
} }
} }
else
{
DBG1(DBG_CFG, "received unknown XPC message type: %s", type);
}
}
else
{
DBG1(DBG_CFG, "received XPC message without a type");
} }
} }