Changeset bd69a21 for protocols/proxy.c
- Timestamp:
- 2005-12-15T12:24:25Z (18 years ago)
- Branches:
- master
- Children:
- 4146a07
- Parents:
- 2983f5e (diff), bf02a67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/proxy.c
r2983f5e rbd69a21 73 73 74 74 75 static struct sockaddr_in *gaim_gethostbyname(c har *host, int port)75 static struct sockaddr_in *gaim_gethostbyname(const char *host, int port) 76 76 { 77 77 static struct sockaddr_in sin; … … 114 114 } 115 115 116 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)116 static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond) 117 117 { 118 118 struct PHB *phb = data; … … 144 144 } 145 145 146 static int proxy_connect_none(c har *host, unsigned short port, struct PHB *phb)146 static int proxy_connect_none(const char *host, unsigned short port, struct PHB *phb) 147 147 { 148 148 struct sockaddr_in *sin; … … 163 163 if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) { 164 164 if (sockerr_again()) { 165 phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);165 phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb); 166 166 phb->fd = fd; 167 167 } else { … … 271 271 } 272 272 273 static int proxy_connect_http(c har *host, unsigned short port, struct PHB *phb)273 static int proxy_connect_http(const char *host, unsigned short port, struct PHB *phb) 274 274 { 275 275 phb->host = g_strdup(host); … … 355 355 } 356 356 357 static int proxy_connect_socks4(c har *host, unsigned short port, struct PHB *phb)357 static int proxy_connect_socks4(const char *host, unsigned short port, struct PHB *phb) 358 358 { 359 359 phb->host = g_strdup(host); … … 537 537 } 538 538 539 static int proxy_connect_socks5(c har *host, unsigned short port, struct PHB *phb)539 static int proxy_connect_socks5(const char *host, unsigned short port, struct PHB *phb) 540 540 { 541 541 phb->host = g_strdup(host); … … 578 578 } 579 579 580 int proxy_connect(c har *host, int port, GaimInputFunction func, gpointer data)580 int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data) 581 581 { 582 582 struct PHB *phb;
Note: See TracChangeset
for help on using the changeset viewer.