planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WTP sends session id.

Browse Source 
FossilOrigin-Name: 32e0df82a8e40e3a3953127ceae58359cdce56696d802e54983f813b00ed1342
This commit is contained in:
7u83@mail.ru
2015-04-10 19:44:05 +00:00
parent 3fe1bc0d21
commit 76e044c1fb
17 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/capwap/cw_rand.c
View File

@ -30,17 +30,17 @@
#include "cw_util.h"
#include "log.h"
char * cw_rand_dev = "/dev/random";
char *cw_rand_dev = "/dev/random";
int cw_rand_r(uint8_t*dst, int len)
int cw_rand_r(uint8_t * dst, int len)
{
int rf;
int l;
rf = open(cw_rand_dev, O_RDONLY | O_NDELAY);
if (rf<0){
rf = open(cw_rand_dev, O_RDONLY | O_NDELAY);
if (rf < 0) {
cw_log(LOG_ERR,"Can't open %s: %s",cw_rand_dev,strerror(errno));
cw_log(LOG_ERR, "Can't open %s: %s", cw_rand_dev, strerror(errno));
return 0;
}
@ -48,8 +48,8 @@ int cw_rand_r(uint8_t*dst, int len)
l = read(rf, dst, len);
close(rf);
if ((l<0) && (errno != EAGAIN)){
cw_log(LOG_ERR,"Cant read from %s: %s",cw_rand_dev,strerror(errno));
if ((l < 0) && (errno != EAGAIN)) {
cw_log(LOG_ERR, "Cant read from %s: %s", cw_rand_dev, strerror(errno));
return 0;
}
@ -58,25 +58,24 @@ int cw_rand_r(uint8_t*dst, int len)
int cw_rand(uint8_t *dst, int len)
int cw_rand(uint8_t * dst, int len)
{
static uint32_t rinit = 0;
if (!rinit){
if (!rinit) {
int l = cw_rand_r((uint8_t*)(&rinit),sizeof(uint32_t));
if (l<sizeof(uint32_t)){
cw_log(LOG_WARNING,"Can't read enough bytes from %s. Using time to init rand instead.",cw_rand_dev);
rinit=time(NULL);
int l = cw_rand_r((uint8_t *) (&rinit), sizeof(uint32_t));
if (l < sizeof(uint32_t)) {
cw_log(LOG_WARNING,
"Can't read enough bytes from %s. Using time to init rand instead.",
cw_rand_dev);
rinit = time(NULL);
}
srand(rinit);
}
int i;
for (i=0; i<len; i++){
dst[i]=rand();
for (i = 0; i < len; i++) {
dst[i] = rand();
}
return len;
}