Changeset 85693e6 for conf.h

Timestamp:

2010-03-21T16:17:24Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0cb71a6

Parents:

81ee561 (diff), 767a148 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in killerbee stuff (just file transfers and maybe a few things from
mainline). Once I add ft support glue to protocols/purple/ I guess this will
all go into killerbee.

File:

• conf.h (modified) (1 diff)

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        size_t ft_max_size;
+        int ft_max_kbps;
+        char *ft_listen;
         char **protocols;
 } conf_t;