pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-30 06:46:38 +02:00
Code Activity

Merge pull request #26 from talisein/bug25

Browse Source 
xfer: Don't use sockaddr_storage for address_length
This commit is contained in:
Sébastien Helleu
2014-03-14 09:27:30 +01:00
parent d52e5d8c8a 1baa2e288c
commit b9b55f9c81
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/xfer/xfer-network.c
+1 -1
View File
@@ -548,7 +548,7 @@ xfer_network_connect (struct t_xfer *xfer)
/* create socket */
if (xfer->sock < 0)
{
xfer->sock = socket (xfer->remote_address->sa_family, SOCK_STREAM,
xfer->sock = socket (xfer->local_address->sa_family, SOCK_STREAM,
0);
if (xfer->sock < 0)
return 0;
src/plugins/xfer/xfer.c
+23 -12
View File
@@ -669,21 +669,14 @@ xfer_new (const char *plugin_name, const char *plugin_id,
snprintf (str_address, sizeof (str_address), "?");
}
new_xfer->local_address = calloc (1, sizeof (struct sockaddr_storage));
new_xfer->local_address_length = sizeof (struct sockaddr_storage);
new_xfer->remote_address = calloc (1, sizeof (struct sockaddr_storage));
new_xfer->remote_address_length = sizeof (struct sockaddr_storage);
if (XFER_IS_RECV(type))
{
new_xfer->local_address_str = strdup ("");
new_xfer->remote_address_str = strdup (str_address);
memcpy (new_xfer->remote_address, address, address_length);
xfer_set_remote_address(new_xfer, address, address_length, str_address);
}
else
{
new_xfer->local_address_str = strdup (str_address);
memcpy (new_xfer->local_address, address, address_length);
xfer_set_local_address(new_xfer, address, address_length, str_address);
new_xfer->remote_address_str = strdup ("");
}
@@ -835,12 +828,12 @@ xfer_new (const char *plugin_name, const char *plugin_id,
*/
void
xfer_set_remote_address (struct t_xfer *xfer, struct sockaddr *address,
socklen_t length, char *address_str)
xfer_set_remote_address (struct t_xfer *xfer, const struct sockaddr *address,
socklen_t length, const char *address_str)
{
if (xfer->remote_address)
free (xfer->remote_address);
xfer->remote_address = calloc (1, length);
xfer->remote_address = malloc (length);
xfer->remote_address_length = length;
memcpy (xfer->remote_address, address, length);
@@ -849,6 +842,24 @@ xfer_set_remote_address (struct t_xfer *xfer, struct sockaddr *address,
xfer->remote_address_str = strdup ((address_str) ? address_str : "");
}
/*
* Sets the local address field.
*/
void
xfer_set_local_address (struct t_xfer *xfer, const struct sockaddr *address,
socklen_t length, const char *address_str)
{
if (xfer->local_address)
free (xfer->local_address);
xfer->local_address = malloc (length);
xfer->local_address_length = length;
memcpy (xfer->local_address, address, length);
if (xfer->local_address_str)
free (xfer->local_address_str);
xfer->local_address_str = strdup ((address_str) ? address_str : "");
}
/*
* Frees xfer struct and removes it from list.
*/
src/plugins/xfer/xfer.h
+5 -2
View File
@@ -196,8 +196,11 @@ extern struct t_xfer *xfer_search_by_buffer (struct t_gui_buffer *buffer);
extern void xfer_close (struct t_xfer *xfer, enum t_xfer_status status);
extern void xfer_send_signal (struct t_xfer *xfer, const char *signal);
extern void xfer_set_remote_address (struct t_xfer *xfer,
struct sockaddr *address, socklen_t length,
char *address_str);
const struct sockaddr *address,
socklen_t length, const char *address_str);
extern void xfer_set_local_address (struct t_xfer *xfer,
const struct sockaddr *address,
socklen_t length, const char *address_str);
extern void xfer_free (struct t_xfer *xfer);
extern int xfer_add_to_infolist (struct t_infolist *infolist,
struct t_xfer *xfer);