* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
#include "conky.h"
#include "common.h"
#include "logging.h"
-#include "mail.h"
#include "text_object.h"
+#include "timed_thread.h"
#include <errno.h>
#include <stdio.h>
* #define MAX(a, b) ((a > b) ? a : b)
*/
+#define POP3_TYPE 1
+#define IMAP_TYPE 2
+
+#define MAXSIZE 1024
+
+struct mail_s { // for imap and pop3
+ unsigned long unseen;
+ unsigned long messages;
+ unsigned long used;
+ unsigned long quota;
+ unsigned long port;
+ unsigned int retries;
+ float interval;
+ double last_update;
+ char host[MAXSIZE];
+ char user[MAXSIZE];
+ char pass[MAXSIZE];
+ char command[MAXSIZE];
+ char folder[MAXSIZE];
+ timed_thread *p_timed_thread;
+ char secure;
+};
+
+struct local_mail_s {
+ char *mbox;
+ int mail_count;
+ int new_mail_count;
+ int seen_mail_count;
+ int unseen_mail_count;
+ int flagged_mail_count;
+ int unflagged_mail_count;
+ int forwarded_mail_count;
+ int unforwarded_mail_count;
+ int replied_mail_count;
+ int unreplied_mail_count;
+ int draft_mail_count;
+ int trashed_mail_count;
+ float interval;
+ time_t last_mtime;
+ double last_update;
+};
+
char *current_mail_spool;
static struct mail_s *global_mail;
static int global_mail_use = 0;
-void update_mail_count(struct local_mail_s *mail)
+static void update_mail_count(struct local_mail_s *mail)
{
struct stat st;
{
float n1;
char mbox[256], dst[256];
+ struct local_mail_s *locmail;
if (!arg) {
n1 = 9.5;
}
variable_substitute(mbox, dst, sizeof(dst));
- obj->data.local_mail.mbox = strndup(dst, text_buffer_size);
- obj->data.local_mail.interval = n1;
+
+ locmail = malloc(sizeof(struct local_mail_s));
+ memset(locmail, 0, sizeof(struct local_mail_s));
+ locmail->mbox = strndup(dst, text_buffer_size);
+ locmail->interval = n1;
+ obj->data.opaque = locmail;
}
#define PRINT_MAILS_GENERATOR(x) \
void print_##x##mails(struct text_object *obj, char *p, int p_max_size) \
{ \
- update_mail_count(&obj->data.local_mail); \
- snprintf(p, p_max_size, "%d", obj->data.local_mail.x##mail_count); \
+ struct local_mail_s *locmail = obj->data.opaque; \
+ if (!locmail) \
+ return; \
+ update_mail_count(locmail); \
+ snprintf(p, p_max_size, "%d", locmail->x##mail_count); \
}
PRINT_MAILS_GENERATOR()
PRINT_MAILS_GENERATOR(draft_)
PRINT_MAILS_GENERATOR(trashed_)
+void free_local_mails(struct text_object *obj)
+{
+ struct local_mail_s *locmail = obj->data.opaque;
+
+ if (!locmail)
+ return;
+
+ if (locmail->mbox)
+ free(locmail->mbox);
+ free(obj->data.opaque);
+ obj->data.opaque = 0;
+}
+
#define MAXDATASIZE 1000
struct mail_s *parse_mail_args(char type, const char *arg)
mail = malloc(sizeof(struct mail_s));
memset(mail, 0, sizeof(struct mail_s));
- if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass)
+#define lenstr "%1023s"
+ if (sscanf(arg, lenstr " " lenstr " " lenstr, mail->host, mail->user, mail->pass)
!= 3) {
if (type == POP3_TYPE) {
NORM_ERR("Scanning POP3 args failed");
term.c_lflag &= ~ECHO;
tcsetattr(fp, TCSANOW, &term);
printf("Enter mailbox password (%s@%s): ", mail->user, mail->host);
- scanf("%128s", mail->pass);
+ scanf(lenstr, mail->pass);
+#undef lenstr
printf("\n");
term.c_lflag |= ECHO;
tcsetattr(fp, TCSANOW, &term);
if (type == IMAP_TYPE) {
tmp = strstr(arg, "-f ");
if (tmp) {
- int len = 1024;
+ int len = MAXSIZE - 1;
tmp += 3;
if (tmp[0] == '\'') {
- len = strstr(tmp + 1, "'") - tmp - 1;
- if (len > 1024) {
- len = 1024;
+ len = strstr(tmp + 1, "'") - tmp;
+ if (len > MAXSIZE) {
+ len = MAXSIZE;
}
}
- strncpy(mail->folder, tmp + 1, len);
+ strncpy(mail->folder, tmp + 1, len - 1);
} else {
- strncpy(mail->folder, "INBOX", 128); // default imap inbox
+ strncpy(mail->folder, "INBOX", MAXSIZE - 1); // default imap inbox
}
}
tmp = strstr(arg, "-e ");
if (tmp) {
- int len = 1024;
+ int len = MAXSIZE - 1;
tmp += 3;
if (tmp[0] == '\'') {
- len = strstr(tmp + 1, "'") - tmp - 1;
- if (len > 1024) {
- len = 1024;
+ len = strstr(tmp + 1, "'") - tmp;
+ if (len > MAXSIZE) {
+ len = MAXSIZE;
}
}
- strncpy(mail->command, tmp + 1, len);
+ strncpy(mail->command, tmp + 1, len - 1);
} else {
mail->command[0] = '\0';
}
+ DBGP("mail args parsed: folder: '%s' command: '%s' user: '%s' host: '%s'\n",
+ mail->folder, mail->command, mail->user, mail->host);
mail->p_timed_thread = NULL;
return mail;
}
rep = 1;
return;
}
- obj->data.mail = global_mail;
+ obj->data.opaque = global_mail;
global_mail_use++;
return;
}
// proccss
- obj->data.mail = parse_mail_args(IMAP_TYPE, arg);
+ obj->data.opaque = parse_mail_args(IMAP_TYPE, arg);
}
void parse_pop3_mail_args(struct text_object *obj, const char *arg)
rep = 1;
return;
}
- obj->data.mail = global_mail;
+ obj->data.opaque = global_mail;
global_mail_use++;
return;
}
// proccss
- obj->data.mail = parse_mail_args(POP3_TYPE, arg);
+ obj->data.opaque = parse_mail_args(POP3_TYPE, arg);
}
void parse_global_imap_mail_args(const char *value)
void free_mail_obj(struct text_object *obj)
{
- if (!obj->data.mail)
+ if (!obj->data.opaque)
return;
- if (obj->data.mail == global_mail) {
+ if (obj->data.opaque == global_mail) {
if (--global_mail_use == 0) {
free(global_mail);
global_mail = 0;
}
} else {
- free(obj->data.mail);
- obj->data.mail = 0;
+ free(obj->data.opaque);
+ obj->data.opaque = 0;
}
}
}
}
-static void ensure_mail_thread(struct text_object *obj,
+static void ensure_mail_thread(struct mail_s *mail,
void *thread(void *), const char *text)
{
- if (!obj->data.mail)
- return;
-
- if (obj->data.mail->p_timed_thread)
+ if (mail->p_timed_thread)
return;
- obj->data.mail->p_timed_thread =
- timed_thread_create(thread,
- (void *) obj->data.mail,
- obj->data.mail->interval * 1000000);
- if (!obj->data.mail->p_timed_thread) {
+ mail->p_timed_thread = timed_thread_create(thread,
+ mail, mail->interval * 1000000);
+ if (!mail->p_timed_thread) {
NORM_ERR("Error creating %s timed thread", text);
}
- timed_thread_register(obj->data.mail->p_timed_thread,
- &obj->data.mail->p_timed_thread);
- if (timed_thread_run(obj->data.mail->p_timed_thread)) {
+ timed_thread_register(mail->p_timed_thread,
+ &mail->p_timed_thread);
+ if (timed_thread_run(mail->p_timed_thread)) {
NORM_ERR("Error running %s timed thread", text);
}
}
unsigned long old_unseen = ULONG_MAX;
unsigned long old_messages = ULONG_MAX;
struct stat stat_buf;
- struct hostent he, *he_res = 0;
- int he_errno;
- char hostbuff[2048];
- struct sockaddr_in their_addr; // connector's address information
struct mail_s *mail = (struct mail_s *)arg;
int has_idle = 0;
int threadfd = timed_thread_readfd(mail->p_timed_thread);
char resolved_host = 0;
+ struct addrinfo hints;
+ struct addrinfo *ai = 0, *rp;
+ char portbuf[8];
while (fail < mail->retries) {
struct timeval fetchtimeout;
fd_set fdset;
if (!resolved_host) {
-#ifdef HAVE_GETHOSTBYNAME_R
- if (gethostbyname_r(mail->host, &he, hostbuff, sizeof(hostbuff), &he_res, &he_errno)) { // get the host info
- NORM_ERR("IMAP gethostbyname_r: %s", hstrerror(h_errno));
- fail++;
- break;
- }
-#else /* HAVE_GETHOSTBYNAME_R */
- if ((he_res = gethostbyname(mail->host)) == NULL) { // get the host info
- herror("gethostbyname");
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = 0;
+ hints.ai_protocol = 0;
+ snprintf(portbuf, 8, "%lu", mail->port);
+
+ res = getaddrinfo(mail->host, portbuf, &hints, &ai);
+ if (res != 0) {
+ NORM_ERR("IMAP getaddrinfo: %s", gai_strerror(res));
fail++;
break;
}
-#endif /* HAVE_GETHOSTBYNAME_R */
resolved_host = 1;
}
if (fail > 0) {
mail->user, mail->host, fail + 1, mail->retries);
}
do {
- if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
- perror("socket");
- fail++;
- break;
+ for (rp = ai; rp != NULL; rp = rp->ai_next) {
+ sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+ if (sockfd == -1) {
+ continue;
+ }
+ if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1) {
+ break;
+ }
+ close(sockfd);
}
-
- // host byte order
- their_addr.sin_family = AF_INET;
- // short, network byte order
- their_addr.sin_port = htons(mail->port);
- their_addr.sin_addr = *((struct in_addr *) he_res->h_addr);
- // zero the rest of the struct
- memset(&(their_addr.sin_zero), '\0', 8);
-
- if (connect(sockfd, (struct sockaddr *) &their_addr,
- sizeof(struct sockaddr)) == -1) {
+ freeaddrinfo(ai);
+ ai = 0;
+ if (rp == NULL) {
perror("connect");
fail++;
break;
while (1) {
/*
* RFC 2177 says we have to re-idle every 29 minutes.
- * We'll do it every 20 minutes to be safe.
+ * We'll do it every 10 minutes to be safe.
*/
- fetchtimeout.tv_sec = 1200;
+ fetchtimeout.tv_sec = 600;
fetchtimeout.tv_usec = 0;
- DBGP2("idling...");
+ DBGP("idling...");
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
FD_SET(threadfd, &fdset);
- res = select(MAX(sockfd + 1, threadfd + 1), &fdset, NULL, NULL, &fetchtimeout);
+ res = select(MAX(sockfd + 1, threadfd + 1), &fdset, NULL,
+ NULL, &fetchtimeout);
+ DBGP("done idling");
if (timed_thread_test(mail->p_timed_thread, 1) || (res == -1 && errno == EINTR) || FD_ISSET(threadfd, &fdset)) {
if ((fstat(sockfd, &stat_buf) == 0) && S_ISSOCK(stat_buf.st_mode)) {
/* if a valid socket, close it */
fail++;
break;
}
- } else {
- fail++;
- break;
}
recvbuf[numbytes] = '\0';
DBGP2("imap_thread() received: %s", recvbuf);
if (strlen(recvbuf) > 2) {
- unsigned long messages, recent;
+ unsigned long messages, recent = 0;
char *buf = recvbuf;
char force_check = 0;
buf = strstr(buf, "EXISTS");
timed_thread_lock(mail->p_timed_thread);
if (mail->messages != messages) {
force_check = 1;
- mail->messages = messages;
}
timed_thread_unlock(mail->p_timed_thread);
}
void print_imap_unseen(struct text_object *obj, char *p, int p_max_size)
{
- struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap");
+ struct mail_s *mail = obj->data.opaque;
+
+ if (!mail)
+ return;
+
+ ensure_mail_thread(mail, imap_thread, "imap");
if (mail && mail->p_timed_thread) {
timed_thread_lock(mail->p_timed_thread);
void print_imap_messages(struct text_object *obj, char *p, int p_max_size)
{
- struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap");
+ struct mail_s *mail = obj->data.opaque;
+
+ if (!mail)
+ return;
+
+ ensure_mail_thread(mail, imap_thread, "imap");
if (mail && mail->p_timed_thread) {
timed_thread_lock(mail->p_timed_thread);
unsigned int fail = 0;
unsigned long old_unseen = ULONG_MAX;
struct stat stat_buf;
- struct hostent he, *he_res = 0;
- int he_errno;
- char hostbuff[2048];
- struct sockaddr_in their_addr; // connector's address information
struct mail_s *mail = (struct mail_s *)arg;
char resolved_host = 0;
+ struct addrinfo hints;
+ struct addrinfo *ai = 0, *rp;
+ char portbuf[8];
while (fail < mail->retries) {
struct timeval fetchtimeout;
int res;
fd_set fdset;
if (!resolved_host) {
-#ifdef HAVE_GETHOSTBYNAME_R
- if (gethostbyname_r(mail->host, &he, hostbuff, sizeof(hostbuff), &he_res, &he_errno)) { // get the host info
- NORM_ERR("POP3 gethostbyname_r: %s", hstrerror(h_errno));
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = 0;
+ hints.ai_protocol = 0;
+ snprintf(portbuf, 8, "%lu", mail->port);
+
+ res = getaddrinfo(mail->host, portbuf, &hints, &ai);
+ if (res != 0) {
+ NORM_ERR("POP3 getaddrinfo: %s", gai_strerror(res));
fail++;
break;
}
-#else /* HAVE_GETHOSTBYNAME_R */
- if ((he_res = gethostbyname(mail->host)) == NULL) { // get the host info
- herror("gethostbyname");
- fail++;
- break;
- }
-#endif /* HAVE_GETHOSTBYNAME_R */
- resolved_host = 1;
-}
+ resolved_host = 1;
+ }
if (fail > 0) {
NORM_ERR("Trying POP3 connection again for %s@%s (try %u/%u)",
mail->user, mail->host, fail + 1, mail->retries);
}
do {
- if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
- perror("socket");
- fail++;
- break;
+ for (rp = ai; rp != NULL; rp = rp->ai_next) {
+ sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+ if (sockfd == -1) {
+ continue;
+ }
+ if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1) {
+ break;
+ }
+ close(sockfd);
}
-
- // host byte order
- their_addr.sin_family = AF_INET;
- // short, network byte order
- their_addr.sin_port = htons(mail->port);
- their_addr.sin_addr = *((struct in_addr *) he_res->h_addr);
- // zero the rest of the struct
- memset(&(their_addr.sin_zero), '\0', 8);
-
- if (connect(sockfd, (struct sockaddr *) &their_addr,
- sizeof(struct sockaddr)) == -1) {
+ freeaddrinfo(ai);
+ ai = 0;
+ if (rp == NULL) {
perror("connect");
fail++;
break;
sscanf(reply, "%lu %lu", &mail->unseen, &mail->used);
timed_thread_unlock(mail->p_timed_thread);
}
-
+
strncpy(sendbuf, "QUIT\r\n", MAXDATASIZE);
if (pop3_command(sockfd, sendbuf, recvbuf, "+OK")) {
NORM_ERR("POP3 logout failed: %s", recvbuf);
fail++;
break;
}
-
+
if (strlen(mail->command) > 1 && mail->unseen > old_unseen) {
// new mail goodie
if (system(mail->command) == -1) {
void print_pop3_unseen(struct text_object *obj, char *p, int p_max_size)
{
- struct mail_s *mail = ensure_mail_thread(obj, pop3_thread, "pop3");
+ struct mail_s *mail = obj->data.opaque;
+
+ if (!mail)
+ return;
+
+ ensure_mail_thread(mail, pop3_thread, "pop3");
if (mail && mail->p_timed_thread) {
timed_thread_lock(mail->p_timed_thread);
void print_pop3_used(struct text_object *obj, char *p, int p_max_size)
{
- struct mail_s *mail = ensure_mail_thread(obj, pop3_thread, "pop3");
+ struct mail_s *mail = obj->data.opaque;
+
+ if (!mail)
+ return;
+
+ ensure_mail_thread(mail, pop3_thread, "pop3");
if (mail && mail->p_timed_thread) {
timed_thread_lock(mail->p_timed_thread);
projects / monky / blobdiff