Skip to content

Merging my changes to upstream #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 6, 2015
Merged

Merging my changes to upstream #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3720e4f
Included _rpc_on_applicationUpdated
jchuong Dec 11, 2014
05966bf
Merge branch 'jchuong' into upstream
jchuong Jun 6, 2015
070f760
Revert README to upstream copy
jchuong Jun 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/rpc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ struct rpc_struct {
const char *app_id, const char *dest_id,
const char *data, size_t length);

rpc_status (*on_applicationUpdated)(rpc_t self,
const char *app_id, const char *dest_id);

// For internal use only:
rpc_status (*on_error)(rpc_t self, const char *format, ...);
};
Expand Down
14 changes: 14 additions & 0 deletions src/ios_webkit_debug_proxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,9 @@ rpc_status iwdp_on_applicationDisconnected(rpc_t rpc, const rpc_app_t app) {
rpc_status iwdp_on_reportConnectedApplicationList(rpc_t rpc, const rpc_app_t *apps) {
iwdp_iwi_t iwi = (iwdp_iwi_t)rpc->state;
ht_t app_id_ht = iwi->app_id_to_true;
if (*apps == NULL) {
return RPC_SUCCESS;
}

// remove old apps
char **old_app_ids = (char **)ht_keys(app_id_ht);
Expand Down Expand Up @@ -1381,6 +1384,16 @@ rpc_status iwdp_on_applicationSentData(rpc_t rpc,
data, length);
}

rpc_status iwdp_on_applicationUpdated(rpc_t rpc,
const char *app_id, const char *dest_id) {
rpc_status result = iwdp_remove_app_id(rpc, app_id);
if (result) {
// Error removing app_id
return result;
}
return iwdp_add_app_id(rpc, dest_id);
}

//
// STRUCTS
//
Expand Down Expand Up @@ -1600,6 +1613,7 @@ iwdp_iwi_t iwdp_iwi_new(bool is_sim, bool *is_debug) {
rpc->on_applicationDisconnected = iwdp_on_applicationDisconnected;
rpc->on_applicationSentListing = iwdp_on_applicationSentListing;
rpc->on_applicationSentData = iwdp_on_applicationSentData;
rpc->on_applicationUpdated = iwdp_on_applicationUpdated;
rpc->send_plist = iwdp_send_plist;
rpc->state = iwi;
iwi->rpc = rpc;
Expand Down
56 changes: 56 additions & 0 deletions src/rpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,58 @@ rpc_status rpc_recv_applicationSentData(rpc_t self, const plist_t args) {
return ret;
}

/*
_rpc_applicationUpdated: <dict>
<key>WIRApplicationBundleIdentifierKey</key>
<string>com.apple.WebKit.WebContent</string>
<key>WIRHostApplicationIdentifierKey</key>
<string>PID:409</string>
<key>WIRApplicationNameKey</key>
<string></string>
<key>WIRIsApplicationProxyKey</key>
<true/>
<key>WIRIsApplicationActiveKey</key>
<integer>0</integer>
<key>WIRApplicationIdentifierKey</key>
<string>PID:536</string>
</dict>

OR

<key>WIRApplicationBundleIdentifierKey</key>
<string>com.apple.mobilesafari</string>
<key>WIRApplicationNameKey</key>
<string>Safari</string>
<key>WIRIsApplicationProxyKey</key>
<false/>
<key>WIRIsApplicationActiveKey</key>
<integer>0</integer>
<key>WIRApplicationIdentifierKey</key>
<string>PID:730</string>
*/
rpc_status rpc_recv_applicationUpdated(rpc_t self, const plist_t args) {
char *app_id = NULL;
char *dest_id = NULL;
rpc_status ret;
if (!rpc_dict_get_required_string(args, "WIRHostApplicationIdentifierKey", &app_id)) {
if (!rpc_dict_get_required_string(args, "WIRApplicationIdentifierKey", &dest_id) &&
!self->on_applicationUpdated(self, app_id, dest_id)) {
ret = RPC_SUCCESS;
} else {
ret = RPC_ERROR;
}
} else if (!rpc_dict_get_required_string(args, "WIRApplicationNameKey", &app_id) &&
!rpc_dict_get_required_string(args, "WIRApplicationIdentifierKey", &dest_id) &&
!self->on_applicationUpdated(self, app_id, dest_id)) {
ret = RPC_SUCCESS;
} else {
ret = RPC_ERROR;
}
free(app_id);
free(dest_id);
return ret;
}

rpc_status rpc_recv_msg(rpc_t self, const char *selector, const plist_t args) {
if (!selector) {
return RPC_ERROR;
Expand Down Expand Up @@ -449,6 +501,10 @@ rpc_status rpc_recv_msg(rpc_t self, const char *selector, const plist_t args) {
if (!rpc_recv_applicationSentData(self, args)) {
return RPC_SUCCESS;
}
} else if (!strcmp(selector, "_rpc_applicationUpdated:")) {
if (!rpc_recv_applicationUpdated(self, args)) {
return RPC_SUCCESS;
}
}

// invalid msg
Expand Down