[pan2] * avoid npe on early init of server edit dialog * fixes to xfeature /giganews
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] * avoid npe on early init of server edit dialog * fixes to xfeature /giganews
- Date: Tue, 8 Jan 2013 20:41:43 +0000 (UTC)
commit acb4362479305e991b9b7ad28510356bbd25f411
Author: Heinrich MÃller <henmull src gnome org>
Date: Sun Jan 6 21:54:33 2013 +0100
* avoid npe on early init of server edit dialog
* fixes to xfeature /giganews
pan/general/Makefile.am | 3 +-
pan/general/compression.h | 19 ++++
pan/general/string-view.cc | 1 -
pan/gui/server-ui.cc | 16 +++-
pan/tasks/nntp.cc | 24 +++++-
pan/tasks/nntp.h | 10 ++-
pan/tasks/task-groups.cc | 18 ++++-
pan/tasks/task-groups.h | 1 +
pan/tasks/task-xover.cc | 201 +-------------------------------------------
9 files changed, 83 insertions(+), 210 deletions(-)
---
diff --git a/pan/general/Makefile.am b/pan/general/Makefile.am
index b23d480..3cf292c 100644
--- a/pan/general/Makefile.am
+++ b/pan/general/Makefile.am
@@ -14,7 +14,8 @@ libgeneralutils_a_SOURCES = \
string-view.cc \
text-match.cc \
utf8-utils.cc \
- worker-pool.cc
+ worker-pool.cc \
+ compression.cc
noinst_HEADERS = \
compression.h \
diff --git a/pan/general/compression.h b/pan/general/compression.h
index d2faa13..b4bc715 100644
--- a/pan/general/compression.h
+++ b/pan/general/compression.h
@@ -22,9 +22,12 @@
#include <iostream>
#include <fstream>
+#include <config.h>
+#include <pan/general/string-view.h>
namespace pan
{
+
enum CompressionType
{
HEADER_COMPRESS_NONE = 0,
@@ -32,5 +35,21 @@ namespace pan
HEADER_COMPRESS_XFEATURE = 2,
HEADER_COMPRESS_DIABLO = 3
};
+
+
+
+ const static char* COMPRESS_GZIP = "[COMPRESS=GZIP]";
+ const static char* ENABLE_COMPRESS_GZIP = "XFEATURE COMPRESS GZIP\r\n";
+
+ namespace compression
+ {
+ int inflate_zlib(std::stringstream *source, std::stringstream *dest,
+ const CompressionType& compression);
+
+ void ydecode(std::stringstream* in, std::stringstream* out);
+
+ void deflate_gzip (const StringView& line, std::vector<std::string>& fillme);
+ }
}
+
#endif
diff --git a/pan/general/string-view.cc b/pan/general/string-view.cc
index c62268d..cea6a22 100644
--- a/pan/general/string-view.cc
+++ b/pan/general/string-view.cc
@@ -112,7 +112,6 @@ StringView :: strstr (const char * haystack,
return 0;
}
-
char*
StringView :: strpbrk (const char * haystack,
size_t haystack_len,
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 429e709..110c101 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -322,6 +322,17 @@ pan :: import_sec_from_disk_dialog_new (Data& data, Queue& queue, GtkWindow * wi
return res;
}
+namespace
+{
+
+ static void server_edit_dialog_realized_cb (GtkWidget*, gpointer gp)
+ {
+ ServerEditDialog * d (static_cast<ServerEditDialog*>(gp));
+ // avoid NPE on early init
+ g_signal_connect(d->ssl_combo, "changed", G_CALLBACK(ssl_changed_cb), d);
+ }
+}
+
GtkWidget*
pan :: server_edit_dialog_new (Data& data, Queue& queue, Prefs& prefs, GtkWindow * window, const Quark& server)
{
@@ -488,16 +499,13 @@ pan :: server_edit_dialog_new (Data& data, Queue& queue, Prefs& prefs, GtkWindow
d->always_trust_checkbox = w = gtk_check_button_new_with_label (_("Always trust this server's certificate"));
HIG::workarea_add_row (t, &row, NULL, w, NULL);
-
+ g_signal_connect (d->dialog, "realize", G_CALLBACK(server_edit_dialog_realized_cb), d);
#endif
d->server = server;
edit_dialog_populate (data, prefs, server, d);
gtk_widget_show_all (d->dialog);
- // avoid NPE on early init
- g_signal_connect(d->ssl_combo, "changed", G_CALLBACK(ssl_changed_cb), d);
-
return d->dialog;
}
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index 8a3976c..92e2834 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -77,12 +77,26 @@ NNTP :: on_socket_response (Socket * sock UNUSED, const StringView& line_in)
State state;
StringView line (line_in);
+ //check for compression
+ _compression = strcasestr (line.str, COMPRESS_GZIP);
+
// strip off trailing \r\n
if (line.len>=2 && line.str[line.len-2]=='\r' && line.str[line.len-1]=='\n')
line.truncate (line.len-2);
// std::cerr <<"_nntp_response_text: " << _nntp_response_text<<std::endl;
- if (_nntp_response_text)
+ if (_compression)
+ {
+ //check if we're done
+ if (strcasestr (line_in.str, ".\r\n") != 0)
+ {
+ if (_listener)
+ _listener->on_nntp_line (this, line);
+ line = ".";
+ state = CMD_DONE;
+ }
+ }
+ else if (_nntp_response_text)
{
if (line.len==1 && line.str[0]=='.') // end-of-list
{
@@ -143,7 +157,13 @@ NNTP :: on_socket_response (Socket * sock UNUSED, const StringView& line_in)
}
case AUTH_ACCEPTED:
- state = CMD_DONE;
+ // try to enable compression xfeature
+ _socket->write_command (ENABLE_COMPRESS_GZIP, this);
+ state = CMD_NEXT;
+ break;
+
+ case FEATURE_ENABLED:
+ state= CMD_DONE;
break;
case GROUP_RESPONSE: {
diff --git a/pan/tasks/nntp.h b/pan/tasks/nntp.h
index c00f44c..e37e7d7 100644
--- a/pan/tasks/nntp.h
+++ b/pan/tasks/nntp.h
@@ -57,6 +57,9 @@ namespace
NEWGROUPS_FOLLOWS = 231,
ARTICLE_POSTED_OK = 240,
+
+ FEATURE_ENABLED = 290,
+
SEND_ARTICLE_NOW = 340,
NO_POSTING = 440,
POSTING_FAILED = 441,
@@ -157,7 +160,8 @@ namespace pan
_listener(0),
_username(username),
_password(password),
- _nntp_response_text(false)
+ _nntp_response_text(false),
+ _compression(false)
{}
virtual ~NNTP ()
@@ -345,6 +349,10 @@ namespace pan
void fire_done_func (Health, const StringView& response);
+ public:
+ /** session flag for compression (gzip-style) (giganews etc.)*/
+ bool _compression;
+
private: // private socket listener funcs, for socket handshake
virtual bool on_socket_response (Socket*, const StringView& line);
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index ff7676e..d8fae9a 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -74,10 +74,24 @@ TaskGroups :: use_nntp (NNTP * nntp)
assert (0);
}
+
void
-TaskGroups :: on_nntp_line (NNTP * nntp UNUSED,
+TaskGroups :: on_nntp_line (NNTP * nntp,
const StringView & line)
{
+ if (nntp->_compression)
+ {
+ std::vector<std::string> lines;
+ compression::deflate_gzip (line, lines);
+ foreach (std::vector<std::string>, lines, it)
+ on_nntp_line_process (nntp, *it);
+ }
+ else on_nntp_line_process (nntp, line);
+}
+void
+TaskGroups :: on_nntp_line_process (NNTP * nntp UNUSED,
+ const StringView & line)
+{
char permission ('y');
std::string name_str;
std::string desc_str;
@@ -137,7 +151,7 @@ TaskGroups :: on_nntp_done (NNTP * nntp,
{
_state.set_need_nntp (_servername);
}
- else // heath is OK or FAIL
+ else // health is OK or FAIL
{
if (_step == LIST_NEWSGROUPS)
{
diff --git a/pan/tasks/task-groups.h b/pan/tasks/task-groups.h
index d520e1a..4a27c78 100644
--- a/pan/tasks/task-groups.h
+++ b/pan/tasks/task-groups.h
@@ -48,6 +48,7 @@ namespace pan
private: // NNTP::Listener's virtual functions
virtual void on_nntp_line (NNTP*, const StringView&);
+ void on_nntp_line_process (NNTP*, const StringView&);
virtual void on_nntp_done (NNTP*, Health, const StringView&);
private: // implementation
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index ac3804d..0dd37a4 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -28,7 +28,6 @@ extern "C"
#include <uulib/uudeview.h>
#include <glib/gi18n.h>
#include <gmime/gmime-utils.h>
-#include <zlib.h>
}
#include <fstream>
@@ -452,202 +451,6 @@ TaskXOver::on_nntp_line_process(NNTP * nntp, const StringView & line)
g_free(buf);
}
-namespace {
-unsigned int crc_table[] = { /* CRC polynomial 0xedb88320 */
- 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
- 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
- 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
- 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
- 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
- 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
- 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
- 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
- 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
- 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
- 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
- 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
- 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
- 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
- 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
- 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
- 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
- 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
- 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
- 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
- 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
- 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
- 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
- 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
- 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
- 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
- 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
- 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
- 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
- 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
- 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
- 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
- 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
- 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
- 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
- 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
- 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
- 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
- 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
- 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
- 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
- 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
- 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
-
- static unsigned int
- _crc32(const char *buf, size_t len, unsigned int crc)
- {
- crc ^= 0xffffffffU;
-
- while (len--)
- crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
-
- return crc ^ 0xffffffffU;
- }
-
- void
- ydecode(std::stringstream* in, std::stringstream* out)
- {
- int gotbeg = 0, len, outlen = 0;
- char buf1[512], buf2[512], c, *p, *p2 = buf2;
- //unsigned int crc1 = 0, crc = _crc32(NULL, 0, 0);
-
- while (!in->getline(buf1, sizeof(buf1)).eof())
- {
- if (gotbeg == 0 && strncmp(buf1, "=ybegin ", 8) == 0)
- {
- gotbeg = 1;
- }
- else if (gotbeg == 1 && strncmp(buf1, "=yend ", 6) == 0)
- {
- //p = strstr(buf1, "crc32=");
- //if (p)
- // sscanf(p + 6, "%x", &crc1);
- break;
- }
- else if (gotbeg == 1)
- {
- len = strlen(buf1);
- /* strip the CR LF */
- if (len > 2 && buf1[len - 1])
- {
- buf1[len - 1] = '\0';
- len--;
- }
- p = buf1;
- while (*p)
- {
- c = *p++;
- if (c == '=')
- {
- c = *p++;
- if (c == 0)
- break; /* can't have escape char as last char in line */
- c = (unsigned char) (c - 64);
- }
-
- c = (unsigned char) (c - 42);
- *p2++ = c;
- /* flush when buffer full */
- if (++outlen >= sizeof(buf2))
- {
- //crc = _crc32(buf2, outlen, crc);
- out->write(buf2, outlen);
- p2 = buf2;
- outlen = 0;
- }
- }
- }
- }
- /* flush remaining data */
- if (outlen)
- {
- //crc = _crc32(buf2, outlen, crc);
- out->write(buf2, outlen);
- }
-
- // todo log, callback
- //assert(crc == crc1);
- }
-
-#define MEMCHUNK 4096
-
- int
- inflate_zlib(std::stringstream *source, std::stringstream *dest,
- const CompressionType& compression)
- {
- int ret;
- size_t have;
- z_stream strm;
- char in[MEMCHUNK];
- char out[MEMCHUNK];
-
- /* allocate inflate state */
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
- strm.avail_in = 0;
- strm.next_in = Z_NULL;
-
- if (compression == HEADER_COMPRESS_XZVER)
- ret = inflateInit2(&strm, -MAX_WBITS); /* use -MAX_WBITS to indicate gzip style */
-
- if (compression == HEADER_COMPRESS_XFEATURE
- || compression == HEADER_COMPRESS_DIABLO)
- ret = inflateInit(&strm);
-
- if (ret != Z_OK)
- return ret;
-
- /* decompress until deflate stream ends or end of file */
- do
- {
- strm.avail_in = source->read(in, MEMCHUNK).gcount();
- if (source->bad())
- {
- (void) inflateEnd(&strm);
- return Z_ERRNO;
- }
- if (strm.avail_in == 0)
- break;
- strm.next_in = (unsigned char*) in;
-
- /* run inflate() on input until output buffer not full */
- do
- {
- strm.avail_out = MEMCHUNK;
- strm.next_out = (unsigned char*) out;
- ret = inflate(&strm, Z_NO_FLUSH);
- assert(ret != Z_STREAM_ERROR);
- /* state not clobbered */
- switch (ret)
- {
- case Z_NEED_DICT:
- ret = Z_DATA_ERROR; /* and fall through */
- case Z_DATA_ERROR:
- case Z_MEM_ERROR:
- (void) inflateEnd(&strm);
- return ret;
- }
- have = MEMCHUNK - strm.avail_out;
- dest->write(out, have);
- }
- while (strm.avail_out == 0);
-
- /* done when inflate() says it's done */
- }
- while (ret != Z_STREAM_END);
-
- /* clean up and return */
- (void) inflateEnd(&strm);
- return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
- }
-}
-
void
TaskXOver::on_nntp_done(NNTP * nntp, Health health, const StringView & response)
{
@@ -661,8 +464,8 @@ TaskXOver::on_nntp_done(NNTP * nntp, Health health, const StringView & response)
{
std::stringstream* buffer = _streams[nntp->_socket->get_id()];
std::stringstream out, out2;
- ydecode(buffer, &out);
- inflate_zlib(&out, &out2, comp);
+ compression::ydecode(buffer, &out);
+ compression::inflate_zlib(&out, &out2, comp);
char buf1[4096];
while (!out2.getline(buf1, sizeof(buf1)).eof())
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
