X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=245562631d18122084d97ca2af9f9afdec2cf59f;hp=8c61732592269301e22bd4ecfffc0c5cf5571ceb;hb=c00d7e25de7006d6f88aafb2b485057377a70324;hpb=732bf143e456df7fc2e845884fbbdfdaf3fafebc

diff --git a/server.c b/server.c
index 8c617325..24556263 100644
--- a/server.c
+++ b/server.c
@@ -14,7 +14,7 @@
  *
  *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- *	  \ref audioc.c, \ref fsck.c, \ref afh.c
+ *	  \ref audioc.c, \ref afh.c
  *	- Server: \ref server_command, \ref sender,
  *	- Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
  *	- Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
@@ -47,7 +47,6 @@
  *	- Time: \ref time.c,
  *	- Spawning processes: \ref exec.c,
  *	- Inter process communication: \ref ipc.c,
- *	- The object storage layer: \ref osl.c,
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
  *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
@@ -55,7 +54,6 @@
  * Low-level data structures:
  *
  *	- Doubly linked lists: \ref list.h,
- *	- Red-black trees: \ref rbtree.h, \ref rbtree.c,
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
  *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
  *	- Crypto: \ref crypt.c.
@@ -66,6 +64,7 @@
 #include <dirent.h>
 #include <sys/time.h>
 #include <openssl/rc4.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -320,7 +319,6 @@ static void signal_post_select(struct sched *s, struct task *t)
 		waitpid(mmd->afs_pid, NULL, 0);
 cleanup:
 		free(mmd->afd.afhi.chunk_table);
-		free(mmd->afd.afhi.info_string);
 		close_listed_fds();
 		mutex_destroy(mmd_mutex);
 		shm_detach(mmd);
@@ -362,7 +360,6 @@ static void command_post_select(struct sched *s, struct task *t)
 	char *peer_name;
 	pid_t child_pid;
 	uint32_t *chunk_table;
-	char *info_string;
 
 	if (!FD_ISSET(sct->listen_fd, &s->rfds))
 		return;
@@ -374,15 +371,15 @@ static void command_post_select(struct sched *s, struct task *t)
 	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
 	mmd->active_connections++;
-	/* The chunk table and the info_string are pointers located in the
-	 * mmd struct that point to dynamically allocated memory that must be
-	 * freed by the parent and the child. However, as the mmd struct is in
-	 * a shared memory area, there's no guarantee that after the fork these
-	 * pointers are still valid in child context. As these two pointers are
-	 * not used in the child anyway, we save them to local variables and
-	 * free the memory via that copy in the child.
+	/*
+	 * The chunk table is a pointer located in the mmd struct that points
+	 * to dynamically allocated memory, i.e. it must be freed by the parent
+	 * and the child. However, as the mmd struct is in a shared memory
+	 * area, there's no guarantee that after the fork this pointer is still
+	 * valid in child context. As it is not used in the child anyway, we
+	 * save it to a local variable before the fork and free the memory via
+	 * that copy in the child directly after the fork.
 	 */
-	info_string = mmd->afd.afhi.info_string;
 	chunk_table = mmd->afd.afhi.chunk_table;
 	child_pid = fork();
 	if (child_pid < 0) {
@@ -395,7 +392,6 @@ static void command_post_select(struct sched *s, struct task *t)
 		return;
 	}
 	/* mmd might already have changed at this point */
-	free(info_string);
 	free(chunk_table);
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();