diff options
author | Himbeer <himbeer@disroot.org> | 2025-01-24 16:19:47 +0100 |
---|---|---|
committer | Himbeer <himbeer@disroot.org> | 2025-01-24 16:19:47 +0100 |
commit | c1fbf162562eec951baafc4cdb8151b43139b9f2 (patch) | |
tree | fa635607d44f70eaf5d74fa21474ae8a8dd01332 | |
parent | 3782f3ddbf7aa3af50d85bf492fbc4c9be8cdb3c (diff) |
Update to fixed mt.ToCltMediaPush
This commit fixes #159 by updating mt and inverting the ShouldCache /
Ephemeral field.
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | go.sum | 4 | ||||
-rw-r--r-- | process.go | 10 | ||||
-rw-r--r-- | server_conn.go | 4 |
4 files changed, 10 insertions, 10 deletions
@@ -3,7 +3,7 @@ module github.com/HimbeerserverDE/mt-multiserver-proxy go 1.21 require ( - github.com/HimbeerserverDE/mt v0.0.0-20241207155652-48a3f283af97 + github.com/HimbeerserverDE/mt v0.0.0-20250124151607-b2c1ec5b4f2a github.com/HimbeerserverDE/srp v0.0.0 github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.22 @@ -1,5 +1,5 @@ -github.com/HimbeerserverDE/mt v0.0.0-20241207155652-48a3f283af97 h1:snfGOfcraf7Up2jS/wH87JvU8TfYoDM5Zo4oXS20iE8= -github.com/HimbeerserverDE/mt v0.0.0-20241207155652-48a3f283af97/go.mod h1:RSf7NAuQ5zZC6CTPj5ey/uXPHOdu/oiIvHT8tH3fWK8= +github.com/HimbeerserverDE/mt v0.0.0-20250124151607-b2c1ec5b4f2a h1:pv/umw2U710+YZUak91C67K3lOIMxuKyFWuDHpV+IfE= +github.com/HimbeerserverDE/mt v0.0.0-20250124151607-b2c1ec5b4f2a/go.mod h1:RSf7NAuQ5zZC6CTPj5ey/uXPHOdu/oiIvHT8tH3fWK8= github.com/HimbeerserverDE/srp v0.0.0 h1:Iy2GIF7DJphXXO9NjncLEBO6VsZd8Yhrlxl/qTr09eE= github.com/HimbeerserverDE/srp v0.0.0/go.mod h1:pxNH8S2nh4n2DWE0ToX5GnnDr/uEAuaAhJsCpkDLIWw= github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= @@ -667,7 +667,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) { dynInfo, ok := sc.dynMedia[f.Name] if ok { - if dynInfo.cache { + if !dynInfo.ephemeral { cacheMedia(f.Data) } @@ -813,11 +813,11 @@ func (sc *ServerConn) process(pkt mt.Pkt) { } sc.dynMedia[cmd.Filename] = struct { - token uint32 - cache bool + ephemeral bool + token uint32 }{ - token: cmd.CallbackToken, - cache: cmd.ShouldCache, + ephemeral: cmd.Ephemeral, + token: cmd.CallbackToken, } sc.SendCmd(&mt.ToSrvReqMedia{Filenames: []string{filename}}) diff --git a/server_conn.go b/server_conn.go index 34ab129..1b37fc7 100644 --- a/server_conn.go +++ b/server_conn.go @@ -31,8 +31,8 @@ type ServerConn struct { mediaPool string dynMedia map[string]struct { - token uint32 - cache bool + ephemeral bool + token uint32 } inv mt.Inv |