Skip to content

Commit f7fa448

Browse files
hazmi-e205hazmi-e205
authored
Merge pull request #4 from hazmi-e205/instruments
+ instruments experimental
2 parents 5b3bc35 + d8595f8 commit f7fa448

12 files changed

Lines changed: 452 additions & 197 deletions

‎Externals/_Patches/libidevice.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Prj/libidevice.lua‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎Prj/libinstruments.lua‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
include "common.lua"
2+
3+
project "instruments"
4+
kind "StaticLib"
5+
QtConfigs {"force_debug_info"}
6+
7+
files
8+
{
9+
-- Public headers
10+
"../Externals/libinstruments/include/**.h",
11+
12+
-- Utilities
13+
"../Externals/libinstruments/src/util/**.h",
14+
"../Externals/libinstruments/src/util/**.cpp",
15+
16+
-- NSKeyedArchiver
17+
"../Externals/libinstruments/src/nskeyedarchiver/**.h",
18+
"../Externals/libinstruments/src/nskeyedarchiver/**.cpp",
19+
20+
-- DTX protocol
21+
"../Externals/libinstruments/src/dtx/**.h",
22+
"../Externals/libinstruments/src/dtx/**.cpp",
23+
24+
-- Connection
25+
"../Externals/libinstruments/src/connection/**.h",
26+
"../Externals/libinstruments/src/connection/**.cpp",
27+
28+
-- Services
29+
"../Externals/libinstruments/src/services/**.h",
30+
"../Externals/libinstruments/src/services/**.cpp",
31+
32+
-- Facade
33+
"../Externals/libinstruments/src/instruments.cpp",
34+
}
35+
36+
includedirs
37+
{
38+
"../Externals/libinstruments/include",
39+
"../Externals/libinstruments/src",
40+
"../Externals/libinstruments/src/connection", -- lwipopts.h, arch/cc.h
41+
"../Externals/libplist/include",
42+
"../Externals/libimobiledevice/include",
43+
"../Externals/libimobiledevice-glue/include",
44+
"../Externals/libusbmuxd/include",
45+
"../Externals/openssl/include",
46+
"../Externals/picoquic/picoquic",
47+
"../Externals/picotls/include",
48+
"../Externals/picotls/picotlsvs/picotls",
49+
"../Externals/lwip/src/include",
50+
}
51+
52+
defines
53+
{
54+
"INSTRUMENTS_STATIC",
55+
"INSTRUMENTS_HAS_QUIC",
56+
"INSTRUMENTS_ENABLE_LOGGING",
57+
"LIBIMOBILEDEVICE_STATIC",
58+
"LIBUSBMUXD_STATIC",
59+
"LIBPLIST_STATIC",
60+
"LIMD_GLUE_STATIC",
61+
}
62+
63+
buildoptions
64+
{
65+
"-Wno-unused-parameter",
66+
"-Wno-missing-field-initializers",
67+
}
68+
69+
if IsWindows() then
70+
defines { "_WINDOWS", "gettimeofday=gettimeofday" }
71+
end

‎Prj/lwip.lua‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
include "common.lua"
2+
3+
project "lwip"
4+
kind "StaticLib"
5+
QtConfigs {"force_debug_info"}
6+
language "C"
7+
8+
files
9+
{
10+
-- Core TCP/IP stack
11+
"../Externals/lwip/src/core/init.c",
12+
"../Externals/lwip/src/core/def.c",
13+
"../Externals/lwip/src/core/dns.c",
14+
"../Externals/lwip/src/core/inet_chksum.c",
15+
"../Externals/lwip/src/core/ip.c",
16+
"../Externals/lwip/src/core/mem.c",
17+
"../Externals/lwip/src/core/memp.c",
18+
"../Externals/lwip/src/core/netif.c",
19+
"../Externals/lwip/src/core/pbuf.c",
20+
"../Externals/lwip/src/core/raw.c",
21+
"../Externals/lwip/src/core/stats.c",
22+
"../Externals/lwip/src/core/sys.c",
23+
"../Externals/lwip/src/core/altcp.c",
24+
"../Externals/lwip/src/core/altcp_alloc.c",
25+
"../Externals/lwip/src/core/altcp_tcp.c",
26+
"../Externals/lwip/src/core/tcp.c",
27+
"../Externals/lwip/src/core/tcp_in.c",
28+
"../Externals/lwip/src/core/tcp_out.c",
29+
"../Externals/lwip/src/core/timeouts.c",
30+
"../Externals/lwip/src/core/udp.c",
31+
32+
-- IPv4
33+
"../Externals/lwip/src/core/ipv4/acd.c",
34+
"../Externals/lwip/src/core/ipv4/autoip.c",
35+
"../Externals/lwip/src/core/ipv4/dhcp.c",
36+
"../Externals/lwip/src/core/ipv4/etharp.c",
37+
"../Externals/lwip/src/core/ipv4/icmp.c",
38+
"../Externals/lwip/src/core/ipv4/igmp.c",
39+
"../Externals/lwip/src/core/ipv4/ip4.c",
40+
"../Externals/lwip/src/core/ipv4/ip4_addr.c",
41+
"../Externals/lwip/src/core/ipv4/ip4_frag.c",
42+
43+
-- IPv6
44+
"../Externals/lwip/src/core/ipv6/dhcp6.c",
45+
"../Externals/lwip/src/core/ipv6/ethip6.c",
46+
"../Externals/lwip/src/core/ipv6/icmp6.c",
47+
"../Externals/lwip/src/core/ipv6/inet6.c",
48+
"../Externals/lwip/src/core/ipv6/ip6.c",
49+
"../Externals/lwip/src/core/ipv6/ip6_addr.c",
50+
"../Externals/lwip/src/core/ipv6/ip6_frag.c",
51+
"../Externals/lwip/src/core/ipv6/mld6.c",
52+
"../Externals/lwip/src/core/ipv6/nd6.c",
53+
54+
-- API (minimal - only err.c needed for NO_SYS=1)
55+
"../Externals/lwip/src/api/err.c",
56+
57+
-- Network interface
58+
"../Externals/lwip/src/netif/ethernet.c",
59+
60+
-- Headers
61+
"../Externals/lwip/src/include/**.h",
62+
}
63+
64+
includedirs
65+
{
66+
"../Externals/lwip/src/include",
67+
-- lwipopts.h will be in libinstruments src/connection/
68+
"../Externals/libinstruments/src/connection",
69+
}
70+
71+
buildoptions
72+
{
73+
"-Wno-unused-parameter",
74+
"-Wno-missing-field-initializers",
75+
"-Wno-sign-compare",
76+
"-Wno-address",
77+
"-Wno-extra",
78+
}

‎Prj/picoquic.lua‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
include "common.lua"
2+
3+
project "picoquic"
4+
kind "StaticLib"
5+
QtConfigs {"force_debug_info"}
6+
language "C"
7+
8+
files
9+
{
10+
"../Externals/picoquic/picoquic/bbr.c",
11+
"../Externals/picoquic/picoquic/bbr1.c",
12+
"../Externals/picoquic/picoquic/bytestream.c",
13+
"../Externals/picoquic/picoquic/c4.c",
14+
"../Externals/picoquic/picoquic/cc_common.c",
15+
"../Externals/picoquic/picoquic/config.c",
16+
"../Externals/picoquic/picoquic/cubic.c",
17+
"../Externals/picoquic/picoquic/ech.c",
18+
"../Externals/picoquic/picoquic/error_names.c",
19+
"../Externals/picoquic/picoquic/fastcc.c",
20+
"../Externals/picoquic/picoquic/frames.c",
21+
"../Externals/picoquic/picoquic/intformat.c",
22+
"../Externals/picoquic/picoquic/logger.c",
23+
"../Externals/picoquic/picoquic/logwriter.c",
24+
"../Externals/picoquic/picoquic/loss_recovery.c",
25+
"../Externals/picoquic/picoquic/newreno.c",
26+
"../Externals/picoquic/picoquic/pacing.c",
27+
"../Externals/picoquic/picoquic/packet.c",
28+
"../Externals/picoquic/picoquic/paths.c",
29+
"../Externals/picoquic/picoquic/performance_log.c",
30+
"../Externals/picoquic/picoquic/picohash.c",
31+
"../Externals/picoquic/picoquic/picoquic_lb.c",
32+
"../Externals/picoquic/picoquic/picoquic_ptls_openssl.c",
33+
"../Externals/picoquic/picoquic/picoquic_ptls_minicrypto.c",
34+
"../Externals/picoquic/picoquic/picosplay.c",
35+
"../Externals/picoquic/picoquic/port_blocking.c",
36+
"../Externals/picoquic/picoquic/prague.c",
37+
"../Externals/picoquic/picoquic/quicctx.c",
38+
"../Externals/picoquic/picoquic/register_all_cc_algorithms.c",
39+
"../Externals/picoquic/picoquic/sacks.c",
40+
"../Externals/picoquic/picoquic/sender.c",
41+
"../Externals/picoquic/picoquic/sim_link.c",
42+
"../Externals/picoquic/picoquic/siphash.c",
43+
"../Externals/picoquic/picoquic/spinbit.c",
44+
"../Externals/picoquic/picoquic/ticket_store.c",
45+
"../Externals/picoquic/picoquic/timing.c",
46+
"../Externals/picoquic/picoquic/token_store.c",
47+
"../Externals/picoquic/picoquic/tls_api.c",
48+
"../Externals/picoquic/picoquic/transport.c",
49+
"../Externals/picoquic/picoquic/unified_log.c",
50+
"../Externals/picoquic/picoquic/util.c",
51+
52+
-- Headers
53+
"../Externals/picoquic/picoquic/**.h",
54+
}
55+
56+
-- Exclude socket layer (libinstruments handles its own I/O) and optional backends
57+
excludes
58+
{
59+
"../Externals/picoquic/picoquic/picoquic_ptls_fusion.c",
60+
"../Externals/picoquic/picoquic/picoquic_mbedtls.c",
61+
"../Externals/picoquic/picoquic/memory_log.c",
62+
"../Externals/picoquic/picoquic/winsockloop.c",
63+
"../Externals/picoquic/picoquic/sockloop.c",
64+
}
65+
66+
includedirs
67+
{
68+
"../Externals/picoquic/picoquic",
69+
"../Externals/picotls/include",
70+
"../Externals/picotls/deps/cifra/src",
71+
"../Externals/picotls/deps/cifra/src/ext",
72+
"../Externals/picotls/deps/micro-ecc",
73+
"../Externals/openssl/include",
74+
}
75+
76+
defines
77+
{
78+
"PTLS_WITHOUT_FUSION",
79+
"DISABLE_DEBUG_PRINTF",
80+
}
81+
82+
buildoptions
83+
{
84+
"-Wno-unused-parameter",
85+
"-Wno-missing-field-initializers",
86+
"-Wno-sign-compare",
87+
"-Wno-extra",
88+
"-Wno-type-limits",
89+
"-Wno-unknown-pragmas",
90+
}
91+
92+
93+
if IsWindows() then
94+
defines { "_WINDOWS", "gettimeofday=gettimeofday", "_WIN32_WINNT=0x0A00" }
95+
else
96+
defines { "_GNU_SOURCE" }
97+
end

‎Prj/picotls.lua‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
include "common.lua"
2+
3+
project "picotls"
4+
kind "StaticLib"
5+
QtConfigs {"force_debug_info"}
6+
language "C"
7+
8+
-- picotls-core + picotls-openssl sources
9+
files
10+
{
11+
-- Core TLS implementation
12+
"../Externals/picotls/lib/picotls.c",
13+
"../Externals/picotls/lib/hpke.c",
14+
"../Externals/picotls/lib/pembase64.c",
15+
"../Externals/picotls/lib/asn1.c",
16+
17+
-- OpenSSL backend (works with OpenSSL 1.1.x)
18+
"../Externals/picotls/lib/openssl.c",
19+
20+
-- Minicrypto backend (needed by picoquic for some operations)
21+
"../Externals/picotls/lib/cifra.c",
22+
"../Externals/picotls/lib/cifra/x25519.c",
23+
"../Externals/picotls/lib/cifra/chacha20.c",
24+
"../Externals/picotls/lib/cifra/aes128.c",
25+
"../Externals/picotls/lib/cifra/aes256.c",
26+
"../Externals/picotls/lib/cifra/random.c",
27+
"../Externals/picotls/lib/minicrypto-pem.c",
28+
"../Externals/picotls/lib/uecc.c",
29+
"../Externals/picotls/lib/ffx.c",
30+
31+
-- Cifra crypto primitives
32+
"../Externals/picotls/deps/micro-ecc/uECC.c",
33+
"../Externals/picotls/deps/cifra/src/aes.c",
34+
"../Externals/picotls/deps/cifra/src/blockwise.c",
35+
"../Externals/picotls/deps/cifra/src/chacha20.c",
36+
"../Externals/picotls/deps/cifra/src/chash.c",
37+
"../Externals/picotls/deps/cifra/src/curve25519.c",
38+
"../Externals/picotls/deps/cifra/src/drbg.c",
39+
"../Externals/picotls/deps/cifra/src/hmac.c",
40+
"../Externals/picotls/deps/cifra/src/gcm.c",
41+
"../Externals/picotls/deps/cifra/src/gf128.c",
42+
"../Externals/picotls/deps/cifra/src/modes.c",
43+
"../Externals/picotls/deps/cifra/src/poly1305.c",
44+
"../Externals/picotls/deps/cifra/src/sha256.c",
45+
"../Externals/picotls/deps/cifra/src/sha512.c",
46+
47+
-- Headers
48+
"../Externals/picotls/include/**.h",
49+
}
50+
51+
includedirs
52+
{
53+
"../Externals/picotls/include",
54+
"../Externals/picotls/picotlsvs/picotls",
55+
"../Externals/picotls/deps/cifra/src/ext",
56+
"../Externals/picotls/deps/cifra/src",
57+
"../Externals/picotls/deps/micro-ecc",
58+
"../Externals/openssl/include",
59+
}
60+
61+
buildoptions
62+
{
63+
"-Wno-unused-parameter",
64+
"-Wno-missing-field-initializers",
65+
"-Wno-sign-compare",
66+
"-Wno-cast-function-type",
67+
"-Wno-incompatible-pointer-types",
68+
}
69+
70+
71+
if IsWindows() then
72+
defines { "_WINDOWS", "gettimeofday=gettimeofday" }
73+
else
74+
defines { "_GNU_SOURCE" }
75+
buildoptions { "-pthread" }
76+
end

0 commit comments

Comments
 (0)