Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete Siduck code #1780

Merged
merged 6 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-mac-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:

- name: Building picoquic
run: |
brew reinstall openssl
brew install pkg-config
brew install openssl
whereis openssl
export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
./ci/build_picotls.sh
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else()
endif()

project(picoquic
VERSION 1.1.28.0
VERSION 1.1.28.1
DESCRIPTION "picoquic library"
LANGUAGES C CXX)

Expand Down Expand Up @@ -196,7 +196,6 @@ set(PICOHTTP_LIBRARY_FILES
picohttp/h3zero_server.c
picohttp/h3zero_uri.c
picohttp/quicperf.c
picohttp/siduck.c
picohttp/webtransport.c
picohttp/wt_baton.c)

Expand Down
2 changes: 0 additions & 2 deletions picohttp/democlient.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ static picoquic_alpn_list_t alpn_list[] = {
{ picoquic_alpn_http_0_9, "hq-28", 5 },
{ picoquic_alpn_http_3, "h3-27", 5 },
{ picoquic_alpn_http_0_9, "hq-27", 5 },
{ picoquic_alpn_siduck, "siduck", 6 },
{ picoquic_alpn_siduck, "siduck-00", 9 },
{ picoquic_alpn_quicperf, QUICPERF_ALPN, QUICPERF_ALPN_LEN}
};

Expand Down
4 changes: 0 additions & 4 deletions picohttp/demoserver.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "h3zero.h"
#include "democlient.h"
#include "demoserver.h"
#include "siduck.h"
#include "quicperf.h"
/* The HTTP 0.9 server code is used for early test of the QUIC transport functions.
* The simple server provides simple responses, precanned index files or randomly
Expand Down Expand Up @@ -615,9 +614,6 @@ int picoquic_demo_server_callback(picoquic_cnx_t* cnx,
case picoquic_alpn_http_3:
ret = h3zero_callback(cnx, stream_id, bytes, length, fin_or_event, callback_ctx, v_stream_ctx);
break;
case picoquic_alpn_siduck:
ret = siduck_callback(cnx, stream_id, bytes, length, fin_or_event, callback_ctx, v_stream_ctx);
break;
case picoquic_alpn_quicperf:
ret = quicperf_callback(cnx, stream_id, bytes, length, fin_or_event, callback_ctx, v_stream_ctx);
break;
Expand Down
2 changes: 0 additions & 2 deletions picohttp/picohttp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@
<ClCompile Include="h3zero_server.c" />
<ClCompile Include="h3zero_uri.c" />
<ClCompile Include="quicperf.c" />
<ClCompile Include="siduck.c" />
<ClCompile Include="webtransport.c" />
<ClCompile Include="wt_baton.c" />
</ItemGroup>
Expand All @@ -157,7 +156,6 @@
<ClInclude Include="h3zero_uri.h" />
<ClInclude Include="pico_webtransport.h" />
<ClInclude Include="quicperf.h" />
<ClInclude Include="siduck.h" />
<ClInclude Include="wincompat.h" />
<ClInclude Include="wt_baton.h" />
</ItemGroup>
Expand Down
6 changes: 0 additions & 6 deletions picohttp/picohttp.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<ClCompile Include="h3zero.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="siduck.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="quicperf.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -48,9 +45,6 @@
<ClInclude Include="wincompat.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="siduck.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="pico_webtransport.h">
<Filter>Source Files</Filter>
</ClInclude>
Expand Down
225 changes: 0 additions & 225 deletions picohttp/siduck.c

This file was deleted.

50 changes: 0 additions & 50 deletions picohttp/siduck.h

This file was deleted.

3 changes: 1 addition & 2 deletions picoquic/picoquic.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
extern "C" {
#endif

#define PICOQUIC_VERSION "1.1.28.0"
#define PICOQUIC_VERSION "1.1.28.1"
#define PICOQUIC_ERROR_CLASS 0x400
#define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
#define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)
Expand Down Expand Up @@ -1643,7 +1643,6 @@ typedef enum {
picoquic_alpn_undef = 0,
picoquic_alpn_http_0_9,
picoquic_alpn_http_3,
picoquic_alpn_siduck,
picoquic_alpn_quicperf
} picoquic_alpn_enum;

Expand Down
Loading
Loading