Changeset 767a148 for conf.c

Timestamp:

2010-03-21T16:06:31Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1cc0df3, 85693e6

Parents:

545d7c0 (diff), a81d679 (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 file transfer support. Most important points from my review
are fixed now, time to let it settle in and get people to try it.

File:

• conf.c (modified) (2 diffs)

conf.c

@@ -63 +63 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->ft_max_size = SIZE_MAX;
+        conf->ft_max_kbps = G_MAXUINT;
+        conf->ft_listen = NULL;
         conf->protocols = NULL;
         proxytype = 0;
@@ -308 +311 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "ft_max_size" ) == 0 )
+                        {
+                                size_t ft_max_size;
+                                if( sscanf( ini->value, "%zu", &ft_max_size ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_size = ft_max_size;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_max_kbps" ) == 0 )
+                        {
+                                if( sscanf( ini->value, "%d", &i ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_kbps = i;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_listen" ) == 0 )
+                        {
+                                g_free( conf->ft_listen );
+                                conf->ft_listen = g_strdup( ini->value );
+                        }
                         else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
                         {