mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

soccr: rectify Alpine build

Browse Source 
Made a symlink to CRIU's generated config.h, played with
moving some code to soccr.h header.
Changed types from u32 to uint32_t, otherwise we should
include CRIU's "int.h" in soccr, but I'm lazy to add that.

Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Dmitry Safonov
2016-09-26 18:18:21 +03:00
committed by Pavel Emelyanov
parent 51e301571a
commit f92b8d9c44
4 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
criu/sk-tcp.c
View File

@@ -27,45 +27,6 @@
#include "protobuf.h" #include "protobuf.h"
#include "images/tcp-stream.pb-c.h" #include "images/tcp-stream.pb-c.h"
#ifndef CONFIG_HAS_TCP_REPAIR_WINDOW
struct tcp_repair_window {
u32 snd_wl1;
u32 snd_wnd;
u32 max_window;
u32 rcv_wnd;
u32 rcv_wup;
};
#endif
#ifndef CONFIG_HAS_TCP_REPAIR
/*
* It's been reported that both tcp_repair_opt
* and TCP_ enum already shipped in netinet/tcp.h
* system header by some distros thus we need a
* test if we can use predefined ones or provide
* our own.
*/
struct tcp_repair_opt {
u32 opt_code;
u32 opt_val;
};
enum {
TCP_NO_QUEUE,
TCP_RECV_QUEUE,
TCP_SEND_QUEUE,
TCP_QUEUES_NR,
};
#endif
#ifndef TCP_TIMESTAMP
#define TCP_TIMESTAMP 24
#endif
#ifndef TCP_REPAIR_WINDOW
#define TCP_REPAIR_WINDOW 29
#endif
static LIST_HEAD(cpt_tcp_repair_sockets); static LIST_HEAD(cpt_tcp_repair_sockets);
static LIST_HEAD(rst_tcp_repair_sockets); static LIST_HEAD(rst_tcp_repair_sockets);

1
soccr/config.h Symbolic link
View File

@@ -0,0 +1 @@
../criu/include/config.h

13
soccr/soccr.c
View File

@@ -11,19 +11,6 @@
#define SIOCOUTQNSD 0x894B #define SIOCOUTQNSD 0x894B
#endif #endif
#ifndef TCP_REPAIR_WINDOW
#define TCP_REPAIR_WINDOW 29
#endif
struct tcp_repair_window {
__u32 snd_wl1;
__u32 snd_wnd;
__u32 max_window;
__u32 rcv_wnd;
__u32 rcv_wup;
};
static void (*log)(unsigned int loglevel, const char *format, ...) static void (*log)(unsigned int loglevel, const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3))); __attribute__ ((__format__ (__printf__, 2, 3)));
static unsigned int log_level = 0; static unsigned int log_level = 0;

43
soccr/soccr.h
View File

@@ -1,6 +1,49 @@
#ifndef __LIBSOCCR_H__ #ifndef __LIBSOCCR_H__
#define __LIBSOCCR_H__ #define __LIBSOCCR_H__
#include <linux/types.h> #include <linux/types.h>
#include <stdint.h>
#include "config.h"
#ifndef CONFIG_HAS_TCP_REPAIR_WINDOW
struct tcp_repair_window {
uint32_t snd_wl1;
uint32_t snd_wnd;
uint32_t max_window;
uint32_t rcv_wnd;
uint32_t rcv_wup;
};
#endif
#ifndef CONFIG_HAS_TCP_REPAIR
/*
* It's been reported that both tcp_repair_opt
* and TCP_ enum already shipped in netinet/tcp.h
* system header by some distros thus we need a
* test if we can use predefined ones or provide
* our own.
*/
struct tcp_repair_opt {
uint32_t opt_code;
uint32_t opt_val;
};
enum {
TCP_NO_QUEUE,
TCP_RECV_QUEUE,
TCP_SEND_QUEUE,
TCP_QUEUES_NR,
};
#endif
#ifndef TCP_TIMESTAMP
#define TCP_TIMESTAMP 24
#endif
#ifndef TCP_REPAIR_WINDOW
#define TCP_REPAIR_WINDOW 29
#endif
struct libsoccr_sk; struct libsoccr_sk;