comparison src/curl/curl.c @ 707:88d78a61a9fb trunk

[svn] - proxy support. somebody test this.

706:6bc134eec1f3

# include "config.h"
#endif

#include <audacious/vfs.h>
#include <audacious/plugin.h>

#include <curl/curl.h>

#include <string.h>

  curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYPEER, 0);
  curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYHOST, 0);

  curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1);

  {
    struct curl_slist *hdr = NULL;
    hdr = curl_slist_append(hdr, "icy-metadata:1");
    hdr = curl_slist_append(hdr, "User-Agent: Audacious/" VERSION " (curl transport)");
    curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, hdr);

707:88d78a61a9fb

# include "config.h"
#endif

#include <audacious/vfs.h>
#include <audacious/plugin.h>
#include <audacious/configdb.h>

#include <curl/curl.h>

#include <string.h>

  curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYPEER, 0);
  curl_easy_setopt(handle->curl, CURLOPT_SSL_VERIFYHOST, 0);

  curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1);


  {
    gboolean tmp = FALSE;
    ConfigDb *db;

    db = bmp_cfg_db_open();

    bmp_cfg_db_get_bool(db, NULL, "proxy_use", &tmp);
    if (tmp == TRUE)
    {
      gchar *proxy_host = NULL;
      gint proxy_port = 0;

      bmp_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host);
      bmp_cfg_db_get_int(db, NULL, "proxy_port", &proxy_port);

      curl_easy_setopt(handle->curl, CURLOPT_PROXY, proxy_host);
      curl_easy_setopt(handle->curl, CURLOPT_PROXYPORT, proxy_port);

      tmp = FALSE;

      bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &tmp);
      if (tmp == TRUE)
      {
        gchar *userbuf, *proxy_user = NULL, *proxy_pass = NULL;

        bmp_cfg_db_get_string(db, NULL, "proxy_user", &proxy_user);
        bmp_cfg_db_get_string(db, NULL, "proxy_pass", &proxy_pass);

        userbuf = g_strdup_printf("%s:%s",
          proxy_user != NULL ? proxy_user : "", 
          proxy_pass != NULL ? proxy_pass : "");

        if (proxy_user != NULL)
          g_free(proxy_user);

        if (proxy_pass != NULL)
          g_free(proxy_pass);

        curl_easy_setopt(handle->curl, CURLOPT_PROXYUSERPWD, userbuf);

        g_free(userbuf);
      }

      if (proxy_host != NULL)
        g_free(proxy_host);
    }
  }

  {
    struct curl_slist *hdr = NULL;
    hdr = curl_slist_append(hdr, "icy-metadata:1");
    hdr = curl_slist_append(hdr, "User-Agent: Audacious/" VERSION " (curl transport)");
    curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, hdr);