Skip to content

refactor: merge neqo-client and neqo-server into neqo-bin#1724

Merged
larseggert merged 1 commit into
mozilla:mainfrom
mxinden:merge-client-server-2
Mar 11, 2024
Merged

refactor: merge neqo-client and neqo-server into neqo-bin#1724
larseggert merged 1 commit into
mozilla:mainfrom
mxinden:merge-client-server-2

Conversation

@mxinden

@mxinden mxinden commented Mar 8, 2024

Copy link
Copy Markdown
Member

This commit merges the neqo-client and neqo-server crates into a single new neqo-bin crate. In addition it de-duplicates command line argument definitions by introducing a SharedArgs struct.

Future commits will consolidate more shared code into neqo-bin/src/lib.rs and its sub-modules.

Note that binary names are unchanged. E.g. one can still run the client via cargo run --bin neqo-client. See neqo-bin/Cargo.toml for binary declarations.


Part of #1696. See also past issue #1403.

Small step forward already:
image

This commit merges the `neqo-client` and `neqo-server` crates into a single new
`neqo-bin` crate. In addition it de-duplicates command line argument definitions
by introducing a `SharedArgs` `struct`.

Future commits will consolidate more shared code into `neqo-bin/src/lib.rs` and
its sub-modules.

Note that binary names are unchanged. E.g. one can still run the client via
`cargo run --bin neqo-client`. See `neqo-bin/Cargo.toml` for binary declarations.
@mxinden mxinden force-pushed the merge-client-server-2 branch from 1b23ae1 to d897122 Compare March 8, 2024 08:54

@larseggert larseggert left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but would like to hear from the others.

@larseggert larseggert added this pull request to the merge queue Mar 11, 2024
Merged via the queue into mozilla:main with commit 4494927 Mar 11, 2024
mxinden added a commit to mxinden/neqo that referenced this pull request Mar 16, 2024
Before mozilla#1724 `neqo-server` would always run
with `ConnectionParameters::pacing` `true`. `neqo-client` would provide a
command line flag `--pacing` which defaulted to `false`.

mozilla#1724 consolidated the `QuicParameters`
`struct` from `neqo-client` and `neqo-server`. Since both `neqo-client` and
`neqo-server` default to `pacing` `false`.

This commit restores the pre-mozilla#1724 behavior, i.e. `neqo-server` defaulting to
`pacing=true` and `neqo-client` defaulting to `pacing=false`.

(Note that you will have to provide a value to `--pacing` from now on. I.e.
`--pacing=true` or `--pacing=false` instead of just `--pacing`.)
larseggert added a commit to larseggert/neqo that referenced this pull request Mar 16, 2024
github-merge-queue Bot pushed a commit that referenced this pull request Mar 17, 2024
Should have been part of #1724
mxinden added a commit to mxinden/neqo that referenced this pull request Mar 17, 2024
Before mozilla#1724 `neqo-server` would always run
with `ConnectionParameters::pacing` `true`. `neqo-client` would provide a
command line flag `--pacing` which defaulted to `false`.

mozilla#1724 consolidated the `QuicParameters`
`struct` from `neqo-client` and `neqo-server`. Since both `neqo-client` and
`neqo-server` default to `pacing` `false`.

This commit replaces the `--pacing` flag with `--no-pacing`. Pacing is enabled
by default on both `neqo-server` and `neqo-client`.
github-merge-queue Bot pushed a commit that referenced this pull request Mar 17, 2024
* fix(bin): enable pacing on server by default

Before #1724 `neqo-server` would always run
with `ConnectionParameters::pacing` `true`. `neqo-client` would provide a
command line flag `--pacing` which defaulted to `false`.

#1724 consolidated the `QuicParameters`
`struct` from `neqo-client` and `neqo-server`. Since both `neqo-client` and
`neqo-server` default to `pacing` `false`.

This commit restores the pre-#1724 behavior, i.e. `neqo-server` defaulting to
`pacing=true` and `neqo-client` defaulting to `pacing=false`.

(Note that you will have to provide a value to `--pacing` from now on. I.e.
`--pacing=true` or `--pacing=false` instead of just `--pacing`.)

* fix(bin): enable pacing by default and add optional --no-pacing

Before #1724 `neqo-server` would always run
with `ConnectionParameters::pacing` `true`. `neqo-client` would provide a
command line flag `--pacing` which defaulted to `false`.

#1724 consolidated the `QuicParameters`
`struct` from `neqo-client` and `neqo-server`. Since both `neqo-client` and
`neqo-server` default to `pacing` `false`.

This commit replaces the `--pacing` flag with `--no-pacing`. Pacing is enabled
by default on both `neqo-server` and `neqo-client`.

* Update test/upload_test.sh

* Update comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants