X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Fbuffer.c;h=b3c8093ee24f9de51dc8df28f2021bf134d6513a;hb=326d03e0dc49158f24ab14c92b7245d860ecf7ed;hp=0048420ee736e2be8d98bae33e2aa863319b4724;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/buffer.c b/KernelLand/Modules/IPStack/buffer.c
index 0048420e..b3c8093e 100644
--- a/KernelLand/Modules/IPStack/buffer.c
+++ b/KernelLand/Modules/IPStack/buffer.c
@@ -14,6 +14,8 @@ struct sIPStackBuffer
 	 int	MaxSubBufffers;
 	 int	nSubBuffers;
 	size_t	TotalLength;
+	tMutex	lBufferLock;
+
 	struct _subbuffer
 	{
 		const void	*Data;
@@ -31,15 +33,19 @@ tIPStackBuffer *IPStack_Buffer_CreateBuffer(int MaxBuffers)
 	tIPStackBuffer *ret;
 	
 	ret = malloc( sizeof(*ret) + MaxBuffers * sizeof(ret->SubBuffers[0]) );
+	ASSERTR(ret, NULL);
 	ret->MaxSubBufffers = MaxBuffers;
 	ret->nSubBuffers = 0;
 	ret->TotalLength = 0;
+	memset(&ret->lBufferLock, 0, sizeof(ret->lBufferLock));
 	memset(ret->SubBuffers, 0, MaxBuffers * sizeof(ret->SubBuffers[0]));
 	return ret;
 }
 
 void IPStack_Buffer_ClearBuffer(tIPStackBuffer *Buffer)
 {
+	ASSERT(Buffer);
+	IPStack_Buffer_LockBuffer(Buffer);
 	for( int i = 0; i < Buffer->nSubBuffers; i ++ )
 	{
 		if( Buffer->SubBuffers[i].Cb == NULL )
@@ -51,22 +57,35 @@ void IPStack_Buffer_ClearBuffer(tIPStackBuffer *Buffer)
 			Buffer->SubBuffers[i].Data
 			);
 	}
-	// TODO: Fire callbacks?
 	Buffer->nSubBuffers = 0;
+	IPStack_Buffer_UnlockBuffer(Buffer);
 }
 
 void IPStack_Buffer_DestroyBuffer(tIPStackBuffer *Buffer)
 {
+	ASSERT(Buffer);
 	IPStack_Buffer_ClearBuffer(Buffer);
 	Buffer->MaxSubBufffers = 0;
 	free(Buffer);
 }
 
+void IPStack_Buffer_LockBuffer(tIPStackBuffer *Buffer)
+{
+	ASSERT(Buffer);
+	Mutex_Acquire(&Buffer->lBufferLock);
+}
+void IPStack_Buffer_UnlockBuffer(tIPStackBuffer *Buffer)
+{
+	ASSERT(Buffer);
+	Mutex_Release(&Buffer->lBufferLock);
+}
+
 void IPStack_Buffer_AppendSubBuffer(tIPStackBuffer *Buffer,
 	size_t HeaderLen, size_t FooterLen, const void *Data,
 	tIPStackBufferCb Cb, void *Arg
 	)
 {
+	ASSERT(Buffer);
 	if( Buffer->nSubBuffers == Buffer->MaxSubBufffers ) {
 		// Ah, oops?
 		Log_Error("IPStack", "Buffer %p only had %i sub-buffers allocated, which was not enough",
@@ -86,11 +105,13 @@ void IPStack_Buffer_AppendSubBuffer(tIPStackBuffer *Buffer,
 
 size_t IPStack_Buffer_GetLength(tIPStackBuffer *Buffer)
 {
+	ASSERT(Buffer);
 	return Buffer->TotalLength;
 }
 
 size_t IPStack_Buffer_GetData(tIPStackBuffer *Buffer, void *Dest, size_t MaxBytes)
 {
+	ASSERT(Buffer);
 	Uint8	*dest = Dest;
 	size_t	rem_space = MaxBytes;
 	size_t	len;
@@ -124,9 +145,8 @@ size_t IPStack_Buffer_GetData(tIPStackBuffer *Buffer, void *Dest, size_t MaxByte
 
 void *IPStack_Buffer_CompactBuffer(tIPStackBuffer *Buffer, size_t *Length)
 {
-	void	*ret;
-	
-	ret = malloc(Buffer->TotalLength);
+	ASSERT(Buffer);
+	void	*ret = malloc(Buffer->TotalLength);
 	if(!ret) {
 		*Length = 0;
 		return NULL;
@@ -141,6 +161,7 @@ void *IPStack_Buffer_CompactBuffer(tIPStackBuffer *Buffer, size_t *Length)
 
 int IPStack_Buffer_GetBuffer(tIPStackBuffer *Buffer, int Index, size_t *Length, const void **DataPtr)
 {
+	ASSERT(Buffer);
 	if( Index == -1 )	Index = 0;
 
 	if( Index >= Buffer->nSubBuffers*2 ) {
@@ -159,8 +180,10 @@ int IPStack_Buffer_GetBuffer(tIPStackBuffer *Buffer, int Index, size_t *Length,
 				return -1;
 		}
 
-		*DataPtr = (Uint8*)Buffer->SubBuffers[Index].Data + Buffer->SubBuffers[Index].PreLength;
-		*Length = Buffer->SubBuffers[Index].PostLength;
+		if( DataPtr )
+			*DataPtr = (Uint8*)Buffer->SubBuffers[Index].Data + Buffer->SubBuffers[Index].PreLength;
+		if( Length )
+			*Length = Buffer->SubBuffers[Index].PostLength;
 
 		return (Index + 1) + Buffer->nSubBuffers;
 	}
@@ -169,8 +192,10 @@ int IPStack_Buffer_GetBuffer(tIPStackBuffer *Buffer, int Index, size_t *Length,
 		 int	rv = Index + 1;
 		Index = Buffer->nSubBuffers - Index - 1;
 		// Prepended buffers
-		*DataPtr = Buffer->SubBuffers[Index].Data;
-		*Length = Buffer->SubBuffers[Index].PreLength;
+		if( DataPtr )
+			*DataPtr = Buffer->SubBuffers[Index].Data;
+		if( Length )
+			*Length = Buffer->SubBuffers[Index].PreLength;
 		return rv;
 	}
 }