view src/protocols/icq/proxy.c @ 7667:30593bf56e71

[gaim-migrate @ 8311] (23:56:25) shx: LSchiere: there's something wrong in my patch (23:56:34) Luke: okay (23:56:38) Luke: what's that (23:57:45) shx: I forgot to add a '0' a the end of a string (23:57:56) shx: in the gaim_mime_decode_field funcition (23:59:35) Luke: where in that? (00:00:16) shx: at the end, just before this (00:00:18) shx: if (*unencoded_start) (00:00:19) shx: n = strcpy(n, unencoded_start); (00:00:27) shx: whould be this (00:00:28) shx: *n = '\0'; (00:01:05) Luke: so you are just setting it to NULL (00:01:53) Luke: i don't understand why you need that n set at all inside that if, since you just return new on the next line down (00:03:35) shx: I doing some test right now, but I remember I added that because I had of some errors (00:05:04) Luke: i think what you may be hitting is a functional work around for not properly initializing variables, something that shouldn't work but does. because you shouldn't need to set something just before you return unless you are returning IT (or unless you are using staticly declared memory, in which case you might concievably be using that variable again when you next enter the function (00:05:55) shx: no (00:06:18) shx: n is a pointer to the end of the string, and changes as the while goes on (00:06:37) Luke: ah (00:06:42) shx: n doesn't matter (00:07:01) Luke: so should the *n = '\0' be inside the if or outside it? (00:07:30) shx: before the if (00:07:44) shx: *n = '\0'; (00:07:45) shx: if (*unencoded_start) (00:07:45) shx: n = strcpy(n, unencoded_start); (00:08:07) shx: in the case there is no *unencoded_start committer: Tailor Script <[e-mail]>

/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/*
 * $Id: proxy.c 2096 2001-07-31 01:00:39Z warmenhoven $
 *
 * Copyright (C) 1998-2001, Denis V. Dmitrienko <[e-mail]> and
 *                          Bill Soudan <[e-mail]>
 *
 * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

#ifdef _WIN32
#include <winsock.h>
#endif

#include <stdlib.h>

#include "icqlib.h"

void icq_HandleProxyResponse(icq_Link *icqlink)
{
  int s;
  char buf[256];
#ifdef _WIN32
  s = recv(icqlink->icq_ProxySok, buf, sizeof(buf), 0);
#else
  s = read(icqlink->icq_ProxySok, &buf, sizeof(buf));
#endif
  if(s<=0)
  {
    icq_FmtLog(icqlink, ICQ_LOG_FATAL, "[SOCKS] Connection terminated\n");
    icq_Disconnect(icqlink);
    invoke_callback(icqlink, icq_Disconnected)(icqlink);
  }
}

/*******************
SOCKS5 Proxy support
********************/
void icq_SetProxy(icq_Link *icqlink, const char *phost, unsigned short pport, 
  int pauth, const char *pname, const char *ppass)
{
  if(icqlink->icq_ProxyHost)
    free(icqlink->icq_ProxyHost);
  if(icqlink->icq_ProxyName)
    free(icqlink->icq_ProxyName);
  if(icqlink->icq_ProxyPass)
    free(icqlink->icq_ProxyPass);

  if(!phost)
  {
    icq_FmtLog(icqlink, ICQ_LOG_ERROR, "[SOCKS] Proxy host is empty\n");
    icqlink->icq_UseProxy = 0;
    return;
  }
  if(!pname)
  {
    icq_FmtLog(icqlink, ICQ_LOG_ERROR, "[SOCKS] User name is empty\n");
    icqlink->icq_UseProxy = 0;
    return;
  }
  if(!pname)
  {
    icq_FmtLog(icqlink, ICQ_LOG_ERROR, "[SOCKS] User password is empty\n");
    icqlink->icq_UseProxy = 0;
    return;
  }

  if(strlen(pname)>255)
  {
    icq_FmtLog(icqlink, ICQ_LOG_ERROR, "[SOCKS] User name greater than 255 chars\n");
    icqlink->icq_UseProxy = 0;
    return;
  }
  if(strlen(ppass)>255)
  {
    icq_FmtLog(icqlink, ICQ_LOG_ERROR, "[SOCKS] User password greater than 255 chars\n");
    icqlink->icq_UseProxy = 0;
    return;
  }

  icqlink->icq_UseProxy = 1;
  icqlink->icq_ProxyHost = strdup(phost);
  icqlink->icq_ProxyPort = pport;
  icqlink->icq_ProxyAuth = pauth;
  icqlink->icq_ProxyName = strdup(pname);
  icqlink->icq_ProxyPass = strdup(ppass);
}

void icq_UnsetProxy(icq_Link *icqlink)
{
  icqlink->icq_UseProxy = 0;
}

int icq_GetProxySok(icq_Link *icqlink)
{
  return icqlink->icq_ProxySok;
}