@@ -9,9 +9,11 @@ clean:

 	rm -f *.o kakumei kakumei-invite ../res/gen_res.[ch]

 kakumei: kakumei.o loglib.o parselib.o sbuf.o \

-		socklib.o webkernel.o gen_res.o

+		socklib.o webkernel.o gen_res.o \

+		kakumei_session.o

 	$(CC) $(LDFLAGS) kakumei.o loglib.o parselib.o sbuf.o \

-		socklib.o webkernel.o gen_res.o -o kakumei

+		socklib.o webkernel.o gen_res.o \

+		kakumei_session.o -o kakumei

 kakumei.o: kakumei.c ../src/gen_res.c

@@ -18,19 +18,8 @@

 #include "gen_res.h"

 #include "socklib.h"

 #include "webkernel.h"

-

-#define INVITATIONUSER "invitation"

-#define DATADIR "data"

-#define INVITESDIR "data/invitations"

-#define USERSDIR "data/users"

-#define POSTSDIR "data/posts"

-#define SESSIONSDIR "data/sessions"

-

-typedef struct kakumei {

-        sselect *ssel;

-        wk *web;

-} kakumei;

-

+#include "kakumei.h"

+#include "kakumei_session.h"

 static int signal_init(int signum, void (*fn)(int));

 static void sigint(int signum);

@@ -41,9 +30,6 @@ wk_action http_login(wk *web, int connid, wk_uri *uri, void *userptr);

 wk_action http_newuser(wk *web, int connid, wk_uri *uri, void *userptr);

 int pass_check(char *user, char *passwd);

-char *session_new(char *user, char *session, int sessionsize);

-

-

 int

 main(int argc, char *argv[])

@@ -132,6 +118,9 @@ http_login(wk *web, int connid, wk_uri *uri, void *userptr)

         char userpath[1024];

         char session[1024];

         struct stat st;

+        kakumei *ka=(kakumei *)userptr;

+        if(web==NULL || connid<0 || uri==NULL || ka==NULL)

+                return(wkact_finished); /* internal error */

         if(wk_uri_copyvar(uri,"u",u,sizeof(u))==NULL)

                 u[0]='\0';

         if(wk_uri_copyvar(uri,"p",p,sizeof(p))==NULL)

@@ -151,7 +140,7 @@ http_login(wk *web, int connid, wk_uri *uri, void *userptr)

                 return(wkact_finished);

         } else if(strchr(u,'/')==NULL && strchr(u,'.')==NULL &&

           stat(userpath,&st)==0 && S_ISREG(st.st_mode) && pass_check(u,p)==0 &&

-          session_new(u,session,sizeof(session))!=NULL) {

+          session_new(ka,u,session,sizeof(session))!=NULL) {

                 /* valid login */

                 snprintf(reply,sizeof(reply),"/posts.html?s=%s",session);

                 reply[sizeof(reply)-1]='\0';

@@ -178,10 +167,3 @@ pass_check(char *user, char *passwd)

         return(-1);

 }

-char *

-session_new(char *user, char *session, int sessionsize)

-{

-#warning TODO

-        return(NULL);

-}

-

new file mode 100644

@@ -0,0 +1,30 @@

+/*

+ * kakumei.h

+ *

+ * Private group web.

+ *

+ * Header file

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This progran is licensed under the terms of the Affero GPL v1+

+ */

+

+#ifndef KAKUMEI_H

+#define KAKUMEI_H

+

+#include "socklib.h"

+#include "webkernel.h"

+

+#define INVITATIONUSER "invitation"

+#define DATADIR "data"

+#define INVITESDIR "data/invitations"

+#define USERSDIR "data/users"

+#define POSTSDIR "data/posts"

+#define SESSIONSDIR "data/sessions"

+

+typedef struct kakumei {

+        sselect *ssel;

+        wk *web;

+} kakumei;

+

+#endif

new file mode 100644

@@ -0,0 +1,28 @@

+/*

+ * kakumei_session.c

+ *

+ * Session handling for kakumei.

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This progran is licensed under the terms of the Affero GPL v1+

+ */

+

+#include "kakumei.h"

+#include "kakumei_session.h"

+

+char *

+session_new(kakumei *ka, char *user, char *session, int sessionsize)

+{

+

+}

+

+int

+session_check(kakumei *ka, char *session)

+{

+}

+

+int

+session_del(kakumei *ka, char *session)

+{

+}

+

new file mode 100644

@@ -0,0 +1,17 @@

+/*

+ * kakumei_session.h

+ *

+ * Session handling for kakumei.

+ *

+ * Header file

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This progran is licensed under the terms of the Affero GPL v1+

+ */

+

+#include "kakumei.h"

+

+char *session_new(kakumei *ka, char *user, char *session, int sessionsize);

+int session_check(kakumei *ka, char *session);

+int session_del(kakumei *ka, char *session);

+