Merge branch 'release/0.3.0'

nwtgck · Feb 18, 2022 · c1d6a54 · c1d6a54
2 parents d839099 + 2d7bcb6
commit c1d6a54
Show file tree

Hide file tree

Showing 6 changed files with 273 additions and 70 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -118,6 +118,19 @@ jobs:
           diff expected_response.txt <(curl --unix-socket /tmp/my_unginx http:/index.html)
           kill %1
           rm my_pipe
+      - name: UDP
+        run: |
+          set -eu
+          cp ./yamux-x86_64-unknown-linux-musl/yamux yamux
+          mkfifo my_pipe
+          cat my_pipe | ./yamux -u 1.1.1.1 53 | ./yamux -ul 1053 > ./my_pipe &
+          sleep 1
+          # DNS request twice
+          # NOTE: if 1053 port is not available they will be timeout errors
+          dig example.com @127.0.0.1 -p 1053
+          dig example.com @127.0.0.1 -p 1053
+          kill %1
+          rm my_pipe
 
   build_for_mac:
     strategy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [0.3.0] - 2022-02-18
+### Changed
+* Update dependencies
+
+### Added
+* Support UDP
+
 ## [0.2.1] - 2022-01-30
 ### Changed
 * (internal) Reduce allocation when connecting
@@ -18,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Added
 * Initial release
 
-[Unreleased]: https://github.com/nwtgck/yamux-cli-rust/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/nwtgck/yamux-cli-rust/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/nwtgck/yamux-cli-rust/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/nwtgck/yamux-cli-rust/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/nwtgck/yamux-cli-rust/compare/v0.1.0...v0.2.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yamux-cli"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 
 [[bin]]
@@ -11,10 +11,10 @@ path = "src/main.rs"
 yamux = "0.10"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 tokio = { version = "1.16", features = ["rt-multi-thread", "macros", "net", "io-std", "io-util"] }
-tokio-util = { version = "0.6", features=["compat"] }
+tokio-util = { version = "0.7", features=["compat"] }
 anyhow = "1.0"
 pin-project-lite = "0.2"
-clap = { version = "3.0.13", features = ["derive"] }
+clap = { version = "3.0.14", features = ["derive"] }
 log = "0.4"
 env_logger = "0.9"
 auto_enums = { version = "0.7", features = ["tokio1"] }

diff --git a/README.md b/README.md
@@ -6,21 +6,21 @@ Multiplexing TCP connection CLI using [yamux](https://github.com/hashicorp/yamux
 ### Linux
 
 ```bash
-curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.0/yamux-x86_64-unknown-linux-musl.tar.gz | tar xzf -
+curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.1/yamux-x86_64-unknown-linux-musl.tar.gz | tar xzf -
 ./yamux-x86_64-unknown-linux-musl/yamux --help
 ```
 
 ### macOS (Intel)
 
 ```bash
-curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.0/yamux-x86_64-apple-darwin.tar.gz | tar xzf -
+curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.1/yamux-x86_64-apple-darwin.tar.gz | tar xzf -
 ./yamux-x86_64-apple-darwin/yamux --help
 ```
 
 ### macOS (Apple Silicon)
 
 ```bash
-curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.0/yamux-aarch64-apple-darwin.tar.gz | tar xzf -
+curl -L https://github.com/nwtgck/yamux-cli-rust/releases/download/v0.2.1/yamux-aarch64-apple-darwin.tar.gz | tar xzf -
 ./yamux-aarch64-apple-darwin/yamux --help
 ```
 
@@ -48,6 +48,16 @@ Other binaries are found in <https://github.com/nwtgck/yamux-cli-rust/releases>.
 ... | yamux -U -l /unix/domain/socket/path | ...
 ```
 
+### UDP
+
+```bash
+... | yamux -u 1.1.1.1 53 | ...
+```
+
+```bash
+... | yamux -ul 1053 | ...
+```
+
 ## Complete example
 
 Here is a complete simple example, but not useful. This is forwarding local 80 port to local 8080 port.