Thu, 07 Apr 2005 14:55:02 +0000
[gaim-migrate @ 12431]
" The following log snippets should explain it: " --rlaager
(20:24:00) rlaager: Regarding the signal handling
conversation the other day... I've written a patch to stop
calling signal handlers and return as soon as we find one
signal handler that returns TRUE to indicate that it's
handled the signal. Is this the right approach?
(20:24:22) Ethan Blanton (Paco-Paco): the trouble is that it's
documented to behave exactly the way it does
(20:24:31) Ethan Blanton (Paco-Paco): so changing it is
notbackwards compatible
(20:24:31) rlaager: I'm talking for HEAD.
(20:24:41) Ethan Blanton (Paco-Paco): oh, I think that's a
good approach, yes
(20:24:53) rlaager: The way I've described is how I
*expected* it to work, having not read the documentation.
(20:25:09) Ethan Blanton (Paco-Paco): I'm convinced
(20:27:04) Stu Tomlinson (nosnilmot): rlaager: this, I
assume, breaks the generic-ness of signals, by assuming
that any that return values return booleans?
(20:27:26) Ethan Blanton (Paco-Paco): please break it
(20:27:33) Ethan Blanton (Paco-Paco): we already have
out-parameters
(20:27:42) rlaager: nosnilmot: from what I can see, the
return type is handled as a (void *)... so I'm checking that
ret_value != NULL
(20:27:57) rlaager: nosnilmot: that's the correct way to do it,
right?
...
(20:29:01) Ethan Blanton (Paco-Paco): allowing a
meaningful return value is an over-engineering
(20:30:07) rlaager: even after this patch, you should be able
to return meaningful return values
(20:30:15) rlaager: it'll just short-circuit on the first handler
that does
committer: Luke Schierer <lschiere@pidgin.im>
/** * @file sslconn.c SSL API * @ingroup core * * gaim * * Gaim 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" #include "debug.h" #include "sslconn.h" static gboolean _ssl_initialized = FALSE; static GaimSslOps *_ssl_ops = NULL; static gboolean ssl_init(void) { GaimPlugin *plugin; GaimSslOps *ops; if (_ssl_initialized) return FALSE; plugin = gaim_plugins_find_with_id("core-ssl"); if (plugin != NULL && !gaim_plugin_is_loaded(plugin)) gaim_plugin_load(plugin); ops = gaim_ssl_get_ops(); if (ops != NULL && ops->init != NULL) return ops->init(); else return FALSE; } gboolean gaim_ssl_is_supported(void) { #ifdef HAVE_SSL ssl_init(); return (gaim_ssl_get_ops() != NULL); #else return FALSE; #endif } GaimSslConnection * gaim_ssl_connect(GaimAccount *account, const char *host, int port, GaimSslInputFunction func, GaimSslErrorFunction error_func, void *data) { GaimSslConnection *gsc; GaimSslOps *ops; int i; g_return_val_if_fail(host != NULL, NULL); g_return_val_if_fail(port != 0 && port != -1, NULL); g_return_val_if_fail(func != NULL, NULL); g_return_val_if_fail(gaim_ssl_is_supported(), NULL); ops = gaim_ssl_get_ops(); g_return_val_if_fail(ops != NULL, NULL); g_return_val_if_fail(ops->connect_cb != NULL, NULL); if (!_ssl_initialized) { if (!ssl_init()) return NULL; } gsc = g_new0(GaimSslConnection, 1); gsc->host = g_strdup(host); gsc->port = port; gsc->connect_cb_data = data; gsc->connect_cb = func; gsc->error_cb = error_func; i = gaim_proxy_connect(account, host, port, ops->connect_cb, gsc); if (i < 0) { g_free(gsc->host); g_free(gsc); return NULL; } return (GaimSslConnection *)gsc; } static void recv_cb(gpointer data, gint source, GaimInputCondition cond) { GaimSslConnection *gsc = data; gsc->recv_cb(gsc->recv_cb_data, gsc, cond); } void gaim_ssl_input_add(GaimSslConnection *gsc, GaimSslInputFunction func, void *data) { GaimSslOps *ops; g_return_if_fail(func != NULL); g_return_if_fail(gaim_ssl_is_supported()); ops = gaim_ssl_get_ops(); gsc->recv_cb_data = data; gsc->recv_cb = func; gsc->inpa = gaim_input_add(gsc->fd, GAIM_INPUT_READ, recv_cb, gsc); } GaimSslConnection * gaim_ssl_connect_fd(GaimAccount *account, int fd, GaimSslInputFunction func, GaimSslErrorFunction error_func, void *data) { GaimSslConnection *gsc; GaimSslOps *ops; g_return_val_if_fail(fd > 0, NULL); g_return_val_if_fail(func != NULL, NULL); g_return_val_if_fail(gaim_ssl_is_supported(), NULL); ops = gaim_ssl_get_ops(); g_return_val_if_fail(ops != NULL, NULL); g_return_val_if_fail(ops->connect_cb != NULL, NULL); if (!_ssl_initialized) { if (!ssl_init()) return NULL; } gsc = g_new0(GaimSslConnection, 1); gsc->connect_cb_data = data; gsc->connect_cb = func; gsc->error_cb = error_func; ops->connect_cb(gsc, fd, GAIM_INPUT_READ); return (GaimSslConnection *)gsc; } void gaim_ssl_close(GaimSslConnection *gsc) { GaimSslOps *ops; g_return_if_fail(gsc != NULL); ops = gaim_ssl_get_ops(); if (gsc->inpa) gaim_input_remove(gsc->inpa); if (ops != NULL && ops->close != NULL) (ops->close)(gsc); if (gsc->fd) close(gsc->fd); if (gsc->host != NULL) g_free(gsc->host); g_free(gsc); } size_t gaim_ssl_read(GaimSslConnection *gsc, void *data, size_t len) { GaimSslOps *ops; g_return_val_if_fail(gsc != NULL, 0); g_return_val_if_fail(data != NULL, 0); g_return_val_if_fail(len > 0, 0); ops = gaim_ssl_get_ops(); if (ops != NULL && (ops->read) != NULL) return (ops->read)(gsc, data, len); return 0; } size_t gaim_ssl_write(GaimSslConnection *gsc, const void *data, size_t len) { GaimSslOps *ops; g_return_val_if_fail(gsc != NULL, 0); g_return_val_if_fail(data != NULL, 0); g_return_val_if_fail(len > 0, 0); ops = gaim_ssl_get_ops(); if (ops != NULL && (ops->write) != NULL) return (ops->write)(gsc, data, len); return 0; } void gaim_ssl_set_ops(GaimSslOps *ops) { _ssl_ops = ops; } GaimSslOps * gaim_ssl_get_ops(void) { return _ssl_ops; } void gaim_ssl_init(void) { } void gaim_ssl_uninit(void) { GaimSslOps *ops; if (!_ssl_initialized) return; ops = gaim_ssl_get_ops(); if (ops != NULL && ops->uninit != NULL) ops->uninit(); _ssl_initialized = FALSE; }