Protocol Updates #83

QuantumEntangledAndy · 2020-10-15T04:24:24Z

This contains updates to the protocol and is set as a draft for now as I think it should be discussed. In the PR #80 we analysed the messagse in more detail and discovered that xmls of the form.

<body>
...
</body>

Always went after in the binary block offset

And that xmls of the form

<Extension>
...
</Extension>

Always went before the binary block offset.

I believe this means that we were serde'ing incorrectly. It only worked before because neolink only ever sent Extension xml where it correctly set binary_offset to the message length. We also only every received either

Body xml: in which case it was assumed that the 0 in the binary_offset was a mistake (this is not the case),
Extentsion + Binary in which case we had special logic to parse it

This applies appropriate changes so that extension xml is always before the binary_offset which is renamed to payload offset, and that body xml and binary payloads are after the payload_offset

This simplifies the serde so we don't need to keep in_bin_mode in context which was a nice bonus

This also include the changes requred to send command and control messages to neolink that was required for the MQTT PR #78

P.s. Also applied some things to the readme: formatting, fixed some of my spelling mistakes and closed an unclosed backtick.

QuantumEntangledAndy · 2020-10-17T04:08:59Z

Things to add/added

Rework message structure
Handle unencrypted/encrypted flag correctly
Add message handle
Use message handle in get stream (2 streams one connection)

Co-Authored-By: twistedddx <bits@live.com>

Co-Authored-By: twistedddx <bits@live.com> Conflicts: dissector/baichuan.lua src/bc_protocol.rs src/bc_protocol/media_packet.rs

Co-Authored-By: twistedddx <bits@live.com>

Using u8 for channel id throughtout Using simpler map_err Co-Authored-By: twistedddx <bits@live.com>

Co-Authored-By: twistedddx <bits@live.com>

…tocol_updates

QuantumEntangledAndy · 2021-04-17T05:38:35Z

Now with added AES encryption protocol. See #149

thirtythreeforty · 2021-04-17T06:03:05Z

Is this ready to go? I had been mostly ignoring it while it was marked draft.

QuantumEntangledAndy · 2021-04-17T06:05:31Z

Yes it should be now. The only thing I might want to add is getting SD and HD streams together. Alot of checks are failing though need to see why

QuantumEntangledAndy · 2021-04-17T06:07:07Z

Ahh we need openssl now in the docker images

thirtythreeforty · 2021-04-17T06:07:23Z

~~Checks are failing because of the moving target that is GitHub runners...~~ EDIT: ah you're right

If you wouldn't mind separating out HD+SD, that would be appreciated. This is taking a minute to digest :)

thirtythreeforty · 2021-04-17T06:08:26Z

Want to grab a pure Rust AES implementation? I had tentatively selected block-cipher.

QuantumEntangledAndy · 2021-04-17T10:07:25Z

Yes that was it all is fine again.. Sigh that was embarassing

QuantumEntangledAndy · 2021-04-17T14:32:44Z

Ok changes have been made but I want to try changing to pure rust AES. If you want to have a go at that please do else I'll work on it tomorrow

thirtythreeforty · 2021-04-17T21:05:47Z

Done changing to pure Rust. CI seems happy. See my branch.

I checked performance on a lark and the debug build now uses a lot more CPU (10% of my 5-year-old i5). But the release build is < 1%, so it's fine.

QuantumEntangledAndy · 2021-04-18T00:15:27Z

Ok so it looks good now and all the checks pass except clippy. In the case of clippy it is because of issues with the lexical-core package (a dependency of nom). Bumping up nom's version may solve this.

QuantumEntangledAndy · 2021-04-18T02:12:01Z

Everything should now pass and I've even updated the tests. Please review when you can

thirtythreeforty

Looks great, thanks for all the work.

QuantumEntangledAndy · 2021-04-18T03:37:38Z

Awesome. Next job is SD and HD in the same login.

QuantumEntangledAndy · 2021-04-18T03:38:25Z

Any comments on subscribing on msg number over message id

thirtythreeforty · 2021-04-18T03:39:17Z

I am going to tackle getting a Windows service implemented. It is long overdue.

…

On Sat, Apr 17, 2021, 10:37 PM Andrew King ***@***.***> wrote: Awesome. Next job is SD and HD in the same login. — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <#83 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AA6E7ZKGTU37OO3HJ5A4AWDTJJHY3ANCNFSM4SROMDIA> .

QuantumEntangledAndy · 2021-04-18T03:47:13Z

I had a little look into the service as part of #66. I came up with two solutions. Either nssm which we would need to package the binary with neolink or windows-service-rs which would allow us to run neolink as the sevice Daemon itself at the cost of extra code and maintenance.

Maybe tackle an MSI too so we can close #1 too. If you do want to tackle the MSI maybe have a look at #66 as that has a go at it.

QuantumEntangledAndy · 2021-04-18T05:09:52Z

@twistedddx The current master version should now be able to handle unencrypted connections for the older cameras. Could you maybe try it when you get the chance?

twistedddx · 2021-04-18T09:08:47Z

Neolink now works great with the older cams using unencrypted XML.

QuantumEntangledAndy · 2021-04-18T09:11:27Z

Thanks for testing. I'm glad we can close this one.

…ocol_updates Protocol Updates

QuantumEntangledAndy added 7 commits October 15, 2020 10:59

Implement bc make ext xml

5baacbe

Updates to the readme

3acd0b4

Refractored bc connection to treat binary as a generic payload

4ff53b7

Rename bin_offset to payload_offset

31aefdb

Refractor to apply ext xml before payload_offset

d0f760e

Fixes from rebase

edf2f25

Rust fmted

d92cb38

QuantumEntangledAndy and others added 9 commits October 29, 2020 12:52

Base encryption solely off legacy login reply

71de7da

Work on switching encoffset with channelid and msg_mum

6e1cf2f

More chances to confrom to new protocol

25b561c

Add message handle and status codes and handel encryption correctly

dda603a

Co-Authored-By: twistedddx <bits@live.com>

Merge branch 'master'

2103007

Co-Authored-By: twistedddx <bits@live.com> Conflicts: dissector/baichuan.lua src/bc_protocol.rs src/bc_protocol/media_packet.rs

Merge branch 'error_updates'

9604ecb

Co-Authored-By: twistedddx <bits@live.com>

Bug fixes from merges

a961829

Using u8 for channel id throughtout Using simpler map_err Co-Authored-By: twistedddx <bits@live.com>

Merge branch 'error_updates' into protocol_updates

882d34d

Format error cause nicely

2e04405

Co-Authored-By: twistedddx <bits@live.com>

This was referenced Jan 27, 2021

Update documentation for status code and additional encryption offset data #107

Merged

Use camera's motion detection #58

Open

QuantumEntangledAndy added 4 commits April 14, 2021 17:17

Bug fix and preperation for new encryption protocol

772ba86

Merge branch 'master' of github.com:thirtythreeforty/neolink into pro…

a2ca630

…tocol_updates

Added firmware update to messages.md

f479c82

Added AES encryption

02f4cab

QuantumEntangledAndy marked this pull request as ready for review April 17, 2021 06:05

Bug fixes and making serde respect the status code to send

30fad08

QuantumEntangledAndy force-pushed the protocol_updates branch from 644d888 to 30fad08 Compare April 17, 2021 10:03

QuantumEntangledAndy added 5 commits April 17, 2021 17:07

Treat AES encrypt and decrypt differently

f4630f4

Restore timeout duration

eda598c

Removed extra init method for context

ce9f3e7

Removed docs for prototype mqtt

0dc2569

Use context to keep track of binary

4721d36

thirtythreeforty added 2 commits April 17, 2021 15:53

Use pure Rust AES implementation

949192b

cargo fmt

6ac4b70

Bump nom version

05cb032

QuantumEntangledAndy force-pushed the protocol_updates branch from 89fc52d to 05cb032 Compare April 18, 2021 01:13

Update tests to the new protocol model

9692aa8

thirtythreeforty approved these changes Apr 18, 2021

View reviewed changes

thirtythreeforty merged commit 5a62bb1 into thirtythreeforty:master Apr 18, 2021

QuantumEntangledAndy deleted the protocol_updates branch April 18, 2021 05:09

twistedddx mentioned this pull request Apr 18, 2021

Neolink fails to connect to devices not using encryption #79

Closed

entropin pushed a commit to entropin/neolink that referenced this pull request Aug 18, 2021

Merge pull request thirtythreeforty#83 from QuantumEntangledAndy/prot…

84407f8

…ocol_updates Protocol Updates

QuantumEntangledAndy referenced this pull request in kevin-david/neolink May 19, 2023

Merge pull request QuantumEntangledAndy#83 from PrplHaz4/patch-1

4a95740

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Protocol Updates #83

Protocol Updates #83

QuantumEntangledAndy commented Oct 15, 2020 •

edited

QuantumEntangledAndy commented Oct 17, 2020 •

edited

QuantumEntangledAndy commented Apr 17, 2021 •

edited

thirtythreeforty commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

thirtythreeforty commented Apr 17, 2021 •

edited

thirtythreeforty commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

thirtythreeforty commented Apr 17, 2021 •

edited

QuantumEntangledAndy commented Apr 18, 2021 •

edited

QuantumEntangledAndy commented Apr 18, 2021

thirtythreeforty left a comment

QuantumEntangledAndy commented Apr 18, 2021

QuantumEntangledAndy commented Apr 18, 2021

thirtythreeforty commented Apr 18, 2021 via email

QuantumEntangledAndy commented Apr 18, 2021 •

edited

QuantumEntangledAndy commented Apr 18, 2021

twistedddx commented Apr 18, 2021

QuantumEntangledAndy commented Apr 18, 2021

Protocol Updates #83

Protocol Updates #83

Conversation

QuantumEntangledAndy commented Oct 15, 2020 • edited

QuantumEntangledAndy commented Oct 17, 2020 • edited

QuantumEntangledAndy commented Apr 17, 2021 • edited

thirtythreeforty commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

thirtythreeforty commented Apr 17, 2021 • edited

thirtythreeforty commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

QuantumEntangledAndy commented Apr 17, 2021

thirtythreeforty commented Apr 17, 2021 • edited

QuantumEntangledAndy commented Apr 18, 2021 • edited

QuantumEntangledAndy commented Apr 18, 2021

thirtythreeforty left a comment

Choose a reason for hiding this comment

QuantumEntangledAndy commented Apr 18, 2021

QuantumEntangledAndy commented Apr 18, 2021

thirtythreeforty commented Apr 18, 2021 via email

QuantumEntangledAndy commented Apr 18, 2021 • edited

QuantumEntangledAndy commented Apr 18, 2021

twistedddx commented Apr 18, 2021

QuantumEntangledAndy commented Apr 18, 2021

QuantumEntangledAndy commented Oct 15, 2020 •

edited

QuantumEntangledAndy commented Oct 17, 2020 •

edited

QuantumEntangledAndy commented Apr 17, 2021 •

edited

thirtythreeforty commented Apr 17, 2021 •

edited

thirtythreeforty commented Apr 17, 2021 •

edited

QuantumEntangledAndy commented Apr 18, 2021 •

edited

QuantumEntangledAndy commented Apr 18, 2021 •

edited