From 43e8714797d40bcf63efab428dcd25f9caf1d52b Mon Sep 17 00:00:00 2001
From: Jakub Sławiński
Date: Fri, 5 Aug 2005 21:45:31 +0200
Subject: v0.7.2

  - Added: http proxy basic authorization
  - Fixed: logging initialization after some value checking
  - Fixed: auto-reconnect failure when --nossl option is set
  - Added: auto-reconnect when afserver is not reachable on start
  - Added: auto-reconnect after normal afserver quit
  - Added: per user statistics: idle time, amount of downloaded/uploaded bytes
           and current download/upload rate
  - Added: support for https proxies
  - Added: possibility to bind sockets on different interfaces
  - Fixed: receiving incomplete headers from afclient
  - Fixed: close user connections by afclient
---
 src/file.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/file.c')

diff --git a/src/file.c b/src/file.c
index 728b0c1..297503b 100644
--- a/src/file.c
+++ b/src/file.c
@@ -110,7 +110,7 @@ parsefile(char* name, int* status)
 {
   static ConfigurationT cfg;
   FILE* file = NULL;
-  int state, i, n, listencount, managecount;
+  int state, i, j, n, listencount, managecount;
   char buff[256];
   char helpbuf1[256];
   char helpbuf2[256];
@@ -187,8 +187,16 @@ parsefile(char* name, int* status)
     return cfg;
   }
 
-  for (i=0; i<cfg.size; ++i) {
-    cfg.realmtable[i].usrclitable = calloc(cfg.realmtable[i].usrclinum, sizeof(UsrCliT));
+  for (i = 0; i < cfg.size; ++i) {
+    cfg.realmtable[i].usrclitable = calloc(cfg.realmtable[i].usrclinum, sizeof(UsrCli*));
+    for (j = 0; j < cfg.realmtable[i].usrclinum; ++j) {
+      cfg.realmtable[i].usrclitable[j] = UsrCli_new();
+      if (cfg.realmtable[i].usrclitable[j] == NULL) {
+        aflog(LOG_T_INIT, LOG_I_CRIT,
+            "Problem with allocating memory for UsrCli structure... exiting");
+        return cfg;
+      }
+    }
   }
   
   cfg.size = 0;
@@ -293,8 +301,7 @@ parsefile(char* name, int* status)
         strcpy(cfg.realmtable[cfg.size-1].hostname, helpbuf2);
       }
       else if (strcmp(helpbuf1, "listen")==0) {
-        cfg.realmtable[cfg.size-1].usrclitable[listencount].lisportnum=calloc(strlen(helpbuf2)+1, sizeof(char));
-        strcpy(cfg.realmtable[cfg.size-1].usrclitable[listencount].lisportnum, helpbuf2);
+        UsrCli_set_listenPortName(cfg.realmtable[cfg.size-1].usrclitable[listencount], helpbuf2);
         ++listencount;
       }
       else if (strcmp(helpbuf1, "pass")==0) {
@@ -305,8 +312,7 @@ parsefile(char* name, int* status)
         }
       }
       else if (strcmp(helpbuf1, "manage")==0) {
-        cfg.realmtable[cfg.size-1].usrclitable[managecount].manportnum=calloc(strlen(helpbuf2)+1, sizeof(char));
-        strcpy(cfg.realmtable[cfg.size-1].usrclitable[managecount].manportnum, helpbuf2);
+        UsrCli_set_managePortName(cfg.realmtable[cfg.size-1].usrclitable[managecount], helpbuf2);
         ++managecount;
       }
       else if (strcmp(helpbuf1, "users")==0) {
-- 
cgit v1.1