networking/interface.c: get rid of global "smallint interface_opt_a"

[oweals/busybox.git] / networking / tcpudp_perhost.c

diff --git a/networking/tcpudp_perhost.c b/networking/tcpudp_perhost.c
index 10541088379ac75de5efad89a88a060d6a33212e..2643f8d16ad368854725937988461268acdaae41 100644 (file)
--- a/networking/tcpudp_perhost.c
+++ b/networking/tcpudp_perhost.c
@@ -10,25 +10,21 @@
 #include "libbb.h"
 #include "tcpudp_perhost.h"
 
-static struct hcc *cc;
-static unsigned cclen;
-
-/* to be optimized */
-
-void ipsvd_perhost_init(unsigned c)
+struct hcc* FAST_FUNC ipsvd_perhost_init(unsigned c)
 {
 //     free(cc);
-       cc = xzalloc(c * sizeof(*cc));
-       cclen = c;
+       struct hcc *cc = xzalloc((c + 1) * sizeof(*cc));
+       cc[c].pid = -1; /* "end" marker */
+       return cc;
 }
 
-unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp)
+unsigned FAST_FUNC ipsvd_perhost_add(struct hcc *cc, char *ip, unsigned maxconn, struct hcc **hccpp)
 {
        unsigned i;
        unsigned conn = 1;
        int freepos = -1;
 
-       for (i = 0; i < cclen; ++i) {
+       for (i = 0; cc[i].pid >= 0; ++i) {
                if (!cc[i].ip) {
                        freepos = i;
                        continue;
@@ -46,10 +42,10 @@ unsigned ipsvd_perhost_add(char *ip, unsigned maxconn, struct hcc **hccpp)
        return conn;
 }
 
-void ipsvd_perhost_remove(int pid)
+void FAST_FUNC ipsvd_perhost_remove(struct hcc *cc, int pid)
 {
        unsigned i;
-       for (i = 0; i < cclen; ++i) {
+       for (i = 0; cc[i].pid >= 0; ++i) {
                if (cc[i].pid == pid) {
                        free(cc[i].ip);
                        cc[i].ip = NULL;
@@ -59,7 +55,7 @@ void ipsvd_perhost_remove(int pid)
        }
 }
 
-//void ipsvd_perhost_free(void)
+//void ipsvd_perhost_free(struct hcc *cc)
 //{
 //     free(cc);
 //}