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.

Sign up for GitHub

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

Underflow fix #35

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Underflow fix #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ddbec4
disable rate-limiting
neonphog Sep 4, 2024
753dce1
underflow fix
neonphog Oct 22, 2024
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
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ panic = "abort"

[workspace.dependencies]
# workspace member deps
sbd-bench = { version = "0.0.6-alpha", path = "rust/sbd-bench" }
sbd-client = { version = "0.0.6-alpha", path = "rust/sbd-client" }
sbd-e2e-crypto-client = { version = "0.0.6-alpha", path = "rust/sbd-e2e-crypto-client" }
sbd-o-bahn-client-tester = { version = "0.0.6-alpha", path = "rust/sbd-o-bahn-client-tester" }
sbd-o-bahn-server-tester = { version = "0.0.6-alpha", path = "rust/sbd-o-bahn-server-tester" }
sbd-server = { version = "0.0.6-alpha", path = "rust/sbd-server" }
sbd-bench = { version = "0.0.7-alpha", path = "rust/sbd-bench" }
sbd-client = { version = "0.0.7-alpha", path = "rust/sbd-client" }
sbd-e2e-crypto-client = { version = "0.0.7-alpha", path = "rust/sbd-e2e-crypto-client" }
sbd-o-bahn-client-tester = { version = "0.0.7-alpha", path = "rust/sbd-o-bahn-client-tester" }
sbd-o-bahn-server-tester = { version = "0.0.7-alpha", path = "rust/sbd-o-bahn-server-tester" }
sbd-server = { version = "0.0.7-alpha", path = "rust/sbd-server" }
# crate deps
anstyle = "1.0.6"
base64 = "0.22.0"
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbd-bench"
version = "0.0.6-alpha"
version = "0.0.7-alpha"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbd-client"
version = "0.0.6-alpha"
version = "0.0.7-alpha"
description = "simple websocket-based message relay client"
license = "MIT OR Apache-2.0"
repository = "https://github.com/holochain/sbd"
Expand Down
6 changes: 5 additions & 1 deletion rust/sbd-client/src/send_buf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ impl SendBuf {
self.limit_rate = limit;
let kbps = (8_000_000.0 / limit as f64) as u64;
let now = self.origin.elapsed().as_nanos() as u64;
let next_send_s = (now - self.next_send_at) as f64 / 1_000_000_000.0;
let next_send_s = if now > self.next_send_at {
(now - self.next_send_at) as f64 / 1_000_000_000.0
} else {
0.0
};
tracing::debug!(
target: "NETAUDIT",
full_url = self.full_url,
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-e2e-crypto-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ documentation = "https://docs.rs/sbd-e2e-crypto-client"
authors = ["Holochain Core Dev Team <[email protected]>"]
keywords = ["holochain", "holo", "p2p", "networking"]
categories = ["network-programming"]
version = "0.0.6-alpha"
version = "0.0.7-alpha"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-o-bahn-client-tester/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbd-o-bahn-client-tester"
version = "0.0.6-alpha"
version = "0.0.7-alpha"
description = "simple websocket-based message relay client tester"
license = "MIT OR Apache-2.0"
repository = "https://github.com/holochain/sbd"
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-o-bahn-server-tester/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbd-o-bahn-server-tester"
version = "0.0.6-alpha"
version = "0.0.7-alpha"
description = "simple websocket-based message relay server tester"
license = "MIT OR Apache-2.0"
repository = "https://github.com/holochain/sbd"
Expand Down
2 changes: 1 addition & 1 deletion rust/sbd-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbd-server"
version = "0.0.6-alpha"
version = "0.0.7-alpha"
description = "simple websocket-based message relay server"
license = "MIT OR Apache-2.0"
repository = "https://github.com/holochain/sbd"
Expand Down
8 changes: 8 additions & 0 deletions ts/sbd-server/src/signal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,13 @@ export class DoSignal extends DurableObject {
* closing the websocket if we violate the limit.
*/
async ipRateLimit(ip: string, pk: string, bytes: number, ws: WebSocket) {
// disabling rate limiting temporarily as an experiment
const HACK_NANOS_PER_BYTE = 1;
if (this.curLimit !== HACK_NANOS_PER_BYTE) {
this.curLimit = HACK_NANOS_PER_BYTE;
ws.send(new MsgLbrt(HACK_NANOS_PER_BYTE).encoded());
}
/*
try {
const ipId = this.env.RATE_LIMIT.idFromName(ip);
const ipStub = this.env.RATE_LIMIT.get(
Expand All @@ -179,6 +186,7 @@ export class DoSignal extends DurableObject {
} catch (e) {
throw common.err(`limit ${e}`, 429);
}
*/
}

/**
Expand Down
Loading