Thu, 29 Aug 2013 22:59:30 -0700
Fix the FARSIGHT libs and cflags for the jabber prpl.
We never define FARSIGHT_LIBS or FARSIGHT_CFLAGS. We only ever define
FARSTREAM_LIBS and FARSTREAM_CFLAGS, even if they point to farsight.
I'm assuming this hasn't been a problem because:
1. The variables are allowed to be empty (it's not treated as an error)
2. libpurple and/or Pidgin link against farsight/farstream, so it's
apparently not necessary for the plugin to do it itself? Who knew.
/** * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "debug.h" #include "http.h" #include "relay.h" typedef struct { GoogleSession *session; JabberGoogleRelayCallback *cb; } JabberGoogleRelayCallbackData; static void jabber_google_relay_parse_response(const gchar *response, gchar **ip, guint *udp, guint *tcp, guint *ssltcp, gchar **username, gchar **password) { gchar **lines = g_strsplit(response, "\n", -1); int i = 0; for (; lines[i] ; i++) { gchar *line = lines[i]; gchar **parts = g_strsplit(line, "=", 2); if (parts[0] && parts[1]) { if (purple_strequal(parts[0], "relay.ip")) { *ip = g_strdup(parts[1]); } else if (purple_strequal(parts[0], "relay.udp_port")) { *udp = atoi(parts[1]); } else if (purple_strequal(parts[0], "relay.tcp_port")) { *tcp = atoi(parts[1]); } else if (purple_strequal(parts[0], "relay.ssltcp_port")) { *ssltcp = atoi(parts[1]); } else if (purple_strequal(parts[0], "username")) { *username = g_strdup(parts[1]); } else if (purple_strequal(parts[0], "password")) { *password = g_strdup(parts[1]); } } g_strfreev(parts); } g_strfreev(lines); } static void jabber_google_relay_fetch_cb(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, gpointer user_data) { JabberGoogleRelayCallbackData *data = (JabberGoogleRelayCallbackData *) user_data; GoogleSession *session = data->session; JabberGoogleRelayCallback *cb = data->cb; gchar *relay_ip = NULL; guint relay_udp = 0; guint relay_tcp = 0; guint relay_ssltcp = 0; gchar *relay_username = NULL; gchar *relay_password = NULL; g_free(data); purple_debug_info("jabber", "got response on HTTP request to relay server\n"); if (purple_http_response_is_successful(response)) { const gchar *got_data = purple_http_response_get_data(response, NULL); purple_debug_info("jabber", "got Google relay request response:\n%s\n", got_data); jabber_google_relay_parse_response(got_data, &relay_ip, &relay_udp, &relay_tcp, &relay_ssltcp, &relay_username, &relay_password); } if (cb) cb(session, relay_ip, relay_udp, relay_tcp, relay_ssltcp, relay_username, relay_password); g_free(relay_ip); g_free(relay_username); g_free(relay_password); } void jabber_google_do_relay_request(JabberStream *js, GoogleSession *session, JabberGoogleRelayCallback cb) { PurpleHttpRequest *req; JabberGoogleRelayCallbackData *data = g_new0(JabberGoogleRelayCallbackData, 1); data->session = session; data->cb = cb; purple_debug_info("jabber", "sending Google relay request\n"); req = purple_http_request_new(NULL); purple_http_request_set_url_printf(req, "http://%s/create_session", js->google_relay_host); /* yes, the relay token is included twice as different request headers, this is apparently needed to make Google's relay servers work... */ purple_http_request_header_set(req, "X-Talk-Google-Relay-Auth", js->google_relay_token); purple_http_request_header_set(req, "X-Google-Relay-Auth", js->google_relay_token); purple_http_request(js->gc, req, jabber_google_relay_fetch_cb, data); purple_http_request_unref(req); }