From 5e93c53d46b635eb8623624286635a1c9d7ed331 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Fri, 15 Aug 2014 21:31:33 +0000
Subject: [PATCH] Added Licence info, some code cleaning.
FossilOrigin-Name: 22c1b887630b59ac7732b88661c9562ac8ef73ba985ee7794e1cdb331690efbe
---
src/capwap/conn_q_get_packet.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/capwap/conn_q_get_packet.c b/src/capwap/conn_q_get_packet.c
index 63a4203c..d7bffb22 100644
--- a/src/capwap/conn_q_get_packet.c
+++ b/src/capwap/conn_q_get_packet.c
@@ -1,32 +1,39 @@
+/*
+ This file is part of libcapwap.
+
+ libcapwap is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ libcapwap is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Foobar. If not, see .
+
+*/
#include
-
#include "conn.h"
-
uint8_t * conn_q_get_packet(struct conn * conn)
{
struct timespec timespec;
clock_gettime(CLOCK_REALTIME,×pec);
timespec.tv_sec++;
-
-// sem_wait(&conn->q_sem);
+ /* wait one second to get a packet */
if (sem_timedwait(&conn->q_sem,×pec)==-1){
return NULL;
};
+
int qrpos = conn->qrpos+1;
if (qrpos==conn->qsize)
qrpos=0;
conn->qrpos=qrpos;
return conn->q[qrpos];
-/*
- uint8_t * packet = conn->q[qrpos]+4;
- int len = *( (uint32_t*)(conn->q[qrpos]));
-
- conn_process_packet(conn->conn,packet,len);
-// free(conn->q[qrpos]);
-*/
}
-