Skip to content

Commit

Permalink
Always use http-keepalive to reduce overhead
Browse files Browse the repository at this point in the history
  • Loading branch information
@EionRobb
EionRobb committed Feb 7, 2024
1 parent 7a4332c commit ebb08d4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions teams_contacts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ teams_xfer_send_begin(gpointer user_data)
PurpleHttpConnection *http_conn;

PurpleHttpRequest *request = purple_http_request_new("");
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_url_printf(request, "https://%s/v1/objects/%s/content/original", TEAMS_XFER_HOST, purple_url_encode(swft->id));
purple_http_request_set_method(request, "PUT");
purple_http_request_header_set(request, "Host", TEAMS_XFER_HOST);
Expand Down
9 changes: 9 additions & 0 deletions teams_login.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ teams_login_got_pie(PurpleHttpConnection *http_conn, PurpleHttpResponse *respons
if (postdata->len > INT_MAX) tmplen = INT_MAX;

request = purple_http_request_new(login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Expand Down Expand Up @@ -230,6 +231,7 @@ teams_login_got_t(PurpleHttpConnection *http_conn, PurpleHttpResponse *response,
// post the t to https://login.skype.com/login/oauth?client_id=578134&redirect_uri=https%3A%2F%2Fweb.skype.com

request = purple_http_request_new(login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Expand Down Expand Up @@ -284,6 +286,7 @@ teams_login_got_opid(PurpleHttpConnection *http_conn, PurpleHttpResponse *respon
if (postdata->len > INT_MAX) tmplen = INT_MAX;

request = purple_http_request_new(live_login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Expand Down Expand Up @@ -338,6 +341,7 @@ teams_login_got_ppft(PurpleHttpConnection *http_conn, PurpleHttpResponse *respon
// POST to https://login.live.com/ppsecure/post.srf?wa=wsignin1.0&wreply=https%3A%2F%2Fsecure.skype.com%2Flogin%2Foauth%2Fproxy%3Fclient_id%3D578134%26redirect_uri%3Dhttps%253A%252F%252Fweb.skype.com

request = purple_http_request_new(live_login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Expand All @@ -361,6 +365,7 @@ teams_begin_oauth_login(TeamsAccount *sa)
PurpleHttpRequest *request;

request = purple_http_request_new(login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request(sa->pc, request, teams_login_got_ppft, sa);
purple_http_request_unref(request);
Expand Down Expand Up @@ -546,6 +551,7 @@ teams_login_get_api_skypetoken(TeamsAccount *sa, const gchar *url, const gchar *
}

request = purple_http_request_new(url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");

obj = json_object_new();
Expand Down Expand Up @@ -682,6 +688,7 @@ teams_begin_soapy_login(TeamsAccount *sa)
);

request = purple_http_request_new(login_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_method(request, "POST");
purple_http_request_set_contents(request, postdata, -1);
purple_http_request_header_set(request, "Accept", "*/*");
Expand Down Expand Up @@ -859,6 +866,7 @@ teams_oauth_refresh_token_for_resource(TeamsAccount *sa, const gchar *resource,
auth_url = g_strconcat("https://login.microsoftonline.com/", purple_url_encode(tenant_host), "/oauth2/token", NULL);

request = purple_http_request_new(auth_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_set_method(request, "POST");
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded");
Expand Down Expand Up @@ -942,6 +950,7 @@ teams_oauth_with_code(TeamsAccount *sa, const gchar *auth_code)
auth_url = g_strconcat("https://login.microsoftonline.com/", purple_url_encode(tenant_host), "/oauth2/token", NULL);

request = purple_http_request_new(auth_url);
purple_http_request_set_keepalive_pool(request, sa->keepalive_pool);
purple_http_request_set_cookie_jar(request, sa->cookie_jar);
purple_http_request_set_method(request, "POST");
purple_http_request_header_set(request, "Content-Type", "application/x-www-form-urlencoded");
Expand Down
2 changes: 1 addition & 1 deletion teams_messages.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1623,7 +1623,7 @@ teams_roomlist_get_list(PurpleConnection *pc)
purple_roomlist_set_fields(roomlist, fields);
purple_roomlist_set_in_progress(roomlist, TRUE);

teams_post_or_get(sa, TEAMS_METHOD_GET | TEAMS_METHOD_SSL, TEAMS_CONTACTS_HOST, url, NULL, teams_got_roomlist_threads, roomlist, FALSE);
teams_post_or_get(sa, TEAMS_METHOD_GET | TEAMS_METHOD_SSL, TEAMS_CONTACTS_HOST, url, NULL, teams_got_roomlist_threads, roomlist, TRUE);

return roomlist;
}
Expand Down

0 comments on commit ebb08d4

Please sign in to comment.