Skip to content

Commit 6d3b0f8

Browse files
committed
Merge branch 'master' of https://github.com/F-Stack/f-stack into master
2 parents e12886c + d1b5277 commit 6d3b0f8

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

config.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ savelen= 16777216
7676
# Correspond to dpdk.port_list's index: port0, port1...
7777
[port0]
7878
addr=192.168.1.2
79-
netmask=255.255.225.0
79+
netmask=255.255.255.0
8080
broadcast=192.168.1.255
8181
gateway=192.168.1.1
8282
# IPv6 net addr
@@ -183,7 +183,7 @@ net.inet.tcp.recvbuf_inc=524288
183183
net.inet.tcp.sack.enable=1
184184
net.inet.tcp.blackhole=1
185185
net.inet.tcp.msl=2000
186-
net.inet.tcp.delayed_ack=0
186+
net.inet.tcp.delayed_ack=1
187187

188188
net.inet.udp.blackhole=1
189189
net.inet.ip.redirect=0

lib/ff_compat.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ struct prisonlist allprison;
6767

6868
MALLOC_DEFINE(M_FADVISE, "fadvise", "posix_fadvise(2) information");
6969
int async_io_version;
70+
extern unsigned int rand_r(unsigned int *seed);
71+
unsigned int seed = 0;
7072

7173
#define M_ZERO 0x0100 /* bzero the allocation */
7274

@@ -294,7 +296,10 @@ arc4rand(void *ptr, unsigned int len, int reseed)
294296
uint32_t
295297
arc4random(void)
296298
{
297-
return ff_arc4random();
299+
if (seed == 0) {
300+
seed = ff_arc4random();
301+
}
302+
return (uint32_t)rand_r(&seed);
298303
}
299304

300305
void

0 commit comments

Comments
 (0)