#include "statusbar.h"
#include "codeconv.h"
#include "utils.h"
+#include "passwordstore.h"
#include "prefs_common.h"
#include "prefs_account.h"
#include "inputdialog.h"
#include "remotefolder.h"
#include "alertpanel.h"
#include "inc.h"
+#include "account.h"
#ifdef USE_GNUTLS
# include "ssl.h"
#endif
+#include "main.h"
#define NNTP_PORT 119
#ifdef USE_GNUTLS
struct _NewsSession
{
Session session;
-
+ Folder *folder;
gchar *group;
};
news_class.type = F_NEWS;
news_class.idstr = "news";
news_class.uistr = "News";
+ news_class.supports_server_search = FALSE;
/* Folder functions */
news_class.new_folder = news_folder_new;
news_class.get_msginfos = news_get_msginfos;
news_class.fetch_msg = news_fetch_msg;
news_class.synchronise = news_synchronise;
+ news_class.search_msgs = folder_item_search_msgs_local;
news_class.remove_msg = news_remove_msg;
news_class.remove_cached_msg = news_remove_cached_msg;
};
g_free(news_session->group);
}
+static gboolean nntp_ping(gpointer data)
+{
+ Session *session = (Session *)data;
+ NewsSession *news_session = NEWS_SESSION(session);
+ int r;
+ struct tm lt;
+
+ if (session->state != SESSION_READY || news_folder_locked(news_session->folder))
+ return FALSE;
+
+ news_folder_lock(NEWS_FOLDER(news_session->folder));
+
+ if ((r = nntp_threaded_date(news_session->folder, <)) != NEWSNNTP_NO_ERROR) {
+ if (r != NEWSNNTP_ERROR_COMMAND_NOT_SUPPORTED &&
+ r != NEWSNNTP_ERROR_COMMAND_NOT_UNDERSTOOD) {
+ log_warning(LOG_PROTOCOL, _("NNTP connection to %s:%d has been"
+ " disconnected.\n"),
+ news_session->folder->account->nntp_server,
+ news_session->folder->account->set_nntpport ?
+ news_session->folder->account->nntpport : NNTP_PORT);
+ REMOTE_FOLDER(news_session->folder)->session = NULL;
+ news_folder_unlock(NEWS_FOLDER(news_session->folder));
+ session->state = SESSION_DISCONNECTED;
+ session->sock = NULL;
+ session_destroy(session);
+ return FALSE;
+ }
+ }
+
+ news_folder_unlock(NEWS_FOLDER(news_session->folder));
+ session_set_access_time(session);
+ return TRUE;
+}
+
+
#ifdef USE_GNUTLS
static Session *news_session_new(Folder *folder, const gchar *server, gushort port,
const gchar *userid, const gchar *passwd,
int r = 0;
cm_return_val_if_fail(server != NULL, NULL);
- log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s...\n"),
- folder->account->account_name, server);
+ log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s:%d...\n"),
+ folder->account->account_name, server, port);
session = g_new0(NewsSession, 1);
session_init(SESSION(session), folder->account, FALSE);
r = nntp_threaded_connect(folder, server, port);
if (r != NEWSNNTP_NO_ERROR) {
- log_error(LOG_PROTOCOL, _("Error logging in to %s:%d ...\n"), server, port);
+ log_error(LOG_PROTOCOL, _("Error logging in to %s:%d...\n"), server, port);
session_destroy(SESSION(session));
return NULL;
}
-
+
+ session->folder = folder;
+
return SESSION(session);
}
cm_return_val_if_fail(folder->account != NULL, NULL);
ac = folder->account;
- if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
- userid = ac->userid;
- if (ac->passwd && ac->passwd[0])
- passwd = g_strdup(ac->passwd);
- else
- passwd = input_dialog_query_password_keep(ac->nntp_server,
- userid,
- &(ac->session_passwd));
- }
#ifdef USE_GNUTLS
port = ac->set_nntpport ? ac->nntpport
session = news_session_new(folder, ac->nntp_server, port, userid, passwd);
#endif
+ if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
+ userid = ac->userid;
+ if (password_get(userid, ac->nntp_server, "nntp", port, &passwd)) {
+ /* NOP */;
+ } else if ((passwd = passwd_store_get_account(ac->account_id,
+ PWS_ACCOUNT_RECV)) == NULL) {
+ passwd = input_dialog_query_password_keep(ac->nntp_server,
+ userid,
+ &(ac->session_passwd));
+ }
+ }
+
if (session != NULL)
r = nntp_threaded_mode_reader(folder);
else
else {
/* An error state bail out */
log_error(LOG_PROTOCOL, _("Error creating session with %s:%d\n"), ac->nntp_server, port);
- session_destroy(SESSION(session));
+ if (session != NULL)
+ session_destroy(SESSION(session));
g_free(passwd);
if (ac->session_passwd) {
g_free(ac->session_passwd);
if ((session != NULL) && ac->use_nntp_auth) { /* FIXME: && ac->use_nntp_auth_onconnect */
if (nntp_threaded_login(folder, userid, passwd) !=
NEWSNNTP_NO_ERROR) {
- log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d ...\n"), ac->nntp_server, port);
+ log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d...\n"), ac->nntp_server, port);
session_destroy(SESSION(session));
g_free(passwd);
if (ac->session_passwd) {
static NewsSession *news_session_get(Folder *folder)
{
RemoteFolder *rfolder = REMOTE_FOLDER(folder);
- struct tm lt;
- int r;
cm_return_val_if_fail(folder != NULL, NULL);
cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
if (!rfolder->session) {
rfolder->session = news_session_new_for_folder(folder);
+ session_register_ping(SESSION(rfolder->session), nntp_ping);
return NEWS_SESSION(rfolder->session);
}
if (rfolder->session->port != folder->account->nntpport) {
session_destroy(rfolder->session);
rfolder->session = news_session_new_for_folder(folder);
+ session_register_ping(SESSION(rfolder->session), nntp_ping);
goto newsession;
}
return NEWS_SESSION(rfolder->session);
}
- if ((r = nntp_threaded_date(folder, <)) != NEWSNNTP_NO_ERROR) {
- if (r != NEWSNNTP_ERROR_COMMAND_NOT_SUPPORTED &&
- r != NEWSNNTP_ERROR_COMMAND_NOT_UNDERSTOOD) {
- log_warning(LOG_PROTOCOL, _("NNTP connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
- folder->account->nntp_server,
- folder->account->set_nntpport ?
- folder->account->nntpport : NNTP_PORT);
- session_destroy(rfolder->session);
- rfolder->session = news_session_new_for_folder(folder);
- }
+ if (!nntp_ping(rfolder->session)) {
+ rfolder->session = news_session_new_for_folder(folder);
+ session_register_ping(SESSION(rfolder->session), nntp_ping);
}
newsession:
ok = news_get_article(folder,
num, filename);
if (ok != NEWSNNTP_NO_ERROR) {
- g_warning("can't read article %d\n", num);
+ g_warning("can't read article %d", num);
if (ok == NEWSNNTP_ERROR_STREAM) {
session_destroy(SESSION(session));
REMOTE_FOLDER(folder)->session = NULL;
g_free(path);
if (is_file_exist(filename)) {
- if (remove(filename) < 0)
+ if (claws_unlink(filename) < 0)
FILE_OP_ERROR(filename, "remove");
}
g_free(filename);
r = nntp_threaded_article(folder, num, &result, &len);
if (r == NEWSNNTP_NO_ERROR) {
- if (str_write_to_file(result, filename) < 0)
+ if (str_write_to_file(result, filename) < 0) {
+ mmap_string_unref(result);
return -1;
- g_free(result);
+ }
+ mmap_string_unref(result);
}
return r;
}
if (change_file_mode_rw(tmpfp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
- g_warning("can't change file mode\n");
+ g_warning("can't change file mode");
}
- get_rfc822_date(buf, sizeof(buf));
+ if (prefs_common.hide_timezone)
+ get_rfc822_date_hide_tz(buf, sizeof(buf));
+ else
+ get_rfc822_date(buf, sizeof(buf));
if (fprintf(tmpfp, "From: %s\r\n"
"Newsgroups: %s\r\n"
"Subject: cmsg cancel <%s>\r\n"
}
news_post(folder, tmp);
- remove(tmp);
+ claws_unlink(tmp);
g_free(tmp);
NewsSession *session;
GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
guint first, last, next;
-/* guint tofetch, fetched;
-*/
cm_return_val_if_fail(folder != NULL, NULL);
cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
progressindicator_start(PROGRESS_TYPE_NETWORK);
-/* tofetch = g_slist_length(tmp_msgnum_list);
- fetched = 0;
-*/
first = GPOINTER_TO_INT(tmp_msgnum_list->data);
last = first;
for(elem = g_slist_next(tmp_msgnum_list); elem != NULL; elem = g_slist_next(elem)) {
next = GPOINTER_TO_INT(elem->data);
if(next != (last + 1)) {
-/* session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
- session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((gfloat) tofetch);
-*/
tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
-/* fetched = last - first + 1;
-*/
first = next;
}
last = next;
news_folder_unlock(NEWS_FOLDER(item->folder));
-/* session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
- session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((gfloat) tofetch);
-*/
tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
path = folder_item_get_path(item);
if (remove_dir_recursive(path) < 0) {
- g_warning("can't remove directory `%s'\n", path);
+ g_warning("can't remove directory '%s'", path);
g_free(path);
return -1;
}
return 0;
}
+void nntp_disconnect_all(gboolean have_connectivity)
+{
+ GList *list;
+ gboolean short_timeout;
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ GError *error;
+#endif
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ error = NULL;
+ short_timeout = !networkmanager_is_online(&error);
+ if(error) {
+ short_timeout = TRUE;
+ g_error_free(error);
+ }
+#else
+ short_timeout = TRUE;
+#endif
+
+ if(short_timeout)
+ nntp_main_set_timeout(1);
+
+ for (list = account_get_list(); list != NULL; list = list->next) {
+ PrefsAccount *account = list->data;
+ if (account->protocol == A_NNTP) {
+ RemoteFolder *folder = (RemoteFolder *)account->folder;
+ if (folder && folder->session) {
+ NewsSession *session = (NewsSession *)folder->session;
+ if (have_connectivity)
+ nntp_threaded_disconnect(FOLDER(folder));
+ SESSION(session)->state = SESSION_DISCONNECTED;
+ SESSION(session)->sock = NULL;
+ session_destroy(SESSION(session));
+ folder->session = NULL;
+ }
+ }
+ }
+
+ if(short_timeout)
+ nntp_main_set_timeout(prefs_common.io_timeout_secs);
+}
+
#else
#include <glib.h>
#include <glib/gi18n.h>
_("You have one or more News accounts "
"defined. However this version of "
"Claws Mail has been built without "
- "News support; your News account(s) are "
+ "News support; your News accounts are "
"disabled.\n\n"
"You probably need to "
"install libetpan and recompile "
return &news_class;
}
+void nntp_disconnect_all(gboolean have_connectivity)
+{
+}
#endif