diff --git a/Cargo.lock b/Cargo.lock index 0559dfc..1932080 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,16 +1,22 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] -name = "ansi_term" -version = "0.11.0" +name = "addr2line" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "winapi", + "gimli", ] +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "ansi_term" version = "0.12.1" @@ -22,15 +28,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.39" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "atty" @@ -45,47 +45,68 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "backtrace" +version = "0.3.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] [[package]] name = "bitflags" -version = "0.4.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.2.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.0.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "can-dbc" -version = "3.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc2e1f9f6f7fe6f3dbcfc44036eb07596ef1d37517ce822111f0c3d6eeed82a" +checksum = "cbe0d033ec316c3bb50e2e53d7ef3d8805e65c5f976d49daea65a12f7e0f9ce8" dependencies = [ "derive-getters", - "nom 4.2.3", + "nom 7.1.3", ] [[package]] name = "canutils" version = "1.0.0" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "anyhow", "can-dbc", "futures", - "nom 5.1.2", + "nom 8.0.0", "pretty-hex", "rand", "rand_core", @@ -94,24 +115,29 @@ dependencies = [ "socketcan", "structopt", "tokio", - "tokio-socketcan", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", @@ -120,20 +146,35 @@ dependencies = [ [[package]] name = "derive-getters" -version = "0.1.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16dc4e2517f08ca167440ccb11023c1308ee19a4022d7b03c0e652f971171869" +checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "embedded-can" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d2e857f87ac832df68fa498d18ddc679175cf3d2e4aa893988e5601baf9438" +dependencies = [ + "nb", ] [[package]] name = "futures" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -146,9 +187,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -156,15 +197,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -173,39 +214,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 2.0.104", ] [[package]] name = "futures-sink" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.13" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -216,218 +256,241 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.2.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "instant" -version = "0.1.9" +name = "io-uring" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" dependencies = [ + "bitflags 2.9.1", "cfg-if", + "libc", ] [[package]] name = "itertools" -version = "0.4.19" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical-core" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -dependencies = [ - "arrayvec", - "bitflags 1.2.1", - "cfg-if", - "ryu", - "static_assertions", -] +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.91" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "lock_api" -version = "0.4.2" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "cfg-if", + "autocfg", ] [[package]] -name = "memchr" -version = "2.3.4" +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", +] [[package]] name = "mio" -version = "0.7.11" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] -name = "miow" -version = "0.3.7" +name = "nb" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] +checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] -name = "nix" -version = "0.5.1" +name = "neli" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79" +checksum = "93062a0dce6da2517ea35f301dfc88184ce18d3601ec786a727a87bf535deca9" dependencies = [ - "bitflags 0.4.0", + "byteorder", "libc", + "log", + "neli-proc-macros", ] [[package]] -name = "nom" -version = "4.2.3" +name = "neli-proc-macros" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +checksum = "0c8034b7fbb6f9455b2a96c19e6edf8dc9fc34c70449938d8ee3b4df363f61fe" dependencies = [ - "memchr", - "version_check 0.1.5", + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", ] [[package]] -name = "nom" -version = "5.1.2" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "lexical-core", - "memchr", - "version_check 0.9.3", + "bitflags 2.9.1", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", ] [[package]] -name = "ntapi" -version = "0.3.6" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "winapi", + "memchr", + "minimal-lexical", ] [[package]] -name = "num_cpus" -version = "1.13.0" +name = "nom" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" dependencies = [ - "hermit-abi", - "libc", + "memchr", ] [[package]] -name = "once_cell" -version = "1.7.2" +name = "object" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", + "windows-targets", ] [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -437,15 +500,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty-hex" -version = "0.2.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" +checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "proc-macro-error" @@ -456,8 +522,8 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", - "version_check 0.9.3", + "syn 1.0.109", + "version_check", ] [[package]] @@ -468,57 +534,48 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.3", + "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" -version = "0.7.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "getrandom", - "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core", @@ -526,100 +583,117 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.5.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" -version = "0.2.5" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.9.1", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "rustc-demangle" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.125" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.104", ] [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.2" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] [[package]] name = "socketcan" -version = "1.7.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3101efc6ef5af6f1c1a488241b469757b7a183baca63af958cd90e4696446c80" +checksum = "7654092b2859221c29ac4b43dc502a8e156a7f2533e8617aaaa056b664d1230e" dependencies = [ + "bitflags 2.9.1", + "embedded-can", + "futures", "hex", "itertools", "libc", + "log", + "mio", + "nb", + "neli", "nix", - "try_from", + "socket2 0.5.10", + "thiserror", + "tokio", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.8.0" @@ -628,9 +702,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ "clap", "lazy_static", @@ -639,26 +713,37 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.14" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.64" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -672,92 +757,72 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.104", ] [[package]] name = "tokio" -version = "1.4.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" dependencies = [ - "autocfg", + "backtrace", "bytes", + "io-uring", "libc", - "memchr", "mio", - "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", + "slab", + "socket2 0.6.0", "tokio-macros", - "winapi", + "windows-sys 0.59.0", ] [[package]] name = "tokio-macros" -version = "1.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.104", ] [[package]] -name = "tokio-socketcan" -version = "0.3.0" +name = "unicode-ident" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db5713701556875951c876d743de32b36ac8cba0c1cdbc6481b3ec3baf706be" -dependencies = [ - "futures", - "libc", - "mio", - "socketcan", - "thiserror", - "tokio", -] - -[[package]] -name = "try_from" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923a7ee3e97dbfe8685261beb4511cc9620a1252405d02693d43169729570111" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "vec_map" @@ -767,21 +832,24 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.1.5" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "version_check" -version = "0.9.3" +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "winapi" @@ -804,3 +872,114 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.1", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] diff --git a/Cargo.toml b/Cargo.toml index 0680808..044f02a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,18 +17,17 @@ travis-ci = { repository = "marcelbuesing/canutils-rs", branch = "master" } [dependencies] ansi_term = "0.12" anyhow = "1.0" -can-dbc = "3.0" +can-dbc = "6.0" futures = "0.3" -pretty-hex = "0.2" -nom = "5.1" -rand = "0.7" -rand_core = "0.5" +pretty-hex = "0.4" +nom = "8.0.0" +rand = "0.9" +rand_core = "0.9" serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } structopt = "0.3" -socketcan = "1.7" +socketcan = {version = "3.5", features = ["tokio"]} tokio = { version = "1.4", features = ["full"] } -tokio-socketcan = "0.3" [[bin]] name = "candumprb" diff --git a/src/bin/candumprb.rs b/src/bin/candumprb.rs index 0c5a781..f94e028 100644 --- a/src/bin/candumprb.rs +++ b/src/bin/candumprb.rs @@ -2,7 +2,8 @@ use ansi_term::Color::{self, Cyan, Fixed, Green, Purple}; use anyhow::Result; use can_dbc::{ByteOrder, Signal}; use futures::StreamExt; -use socketcan::CANFrame; +use socketcan::Id; +use socketcan::{tokio::CanSocket, CanFrame, EmbeddedFrame}; use std::collections::HashMap; use std::convert::TryInto; use std::fmt::Write; @@ -10,7 +11,6 @@ use std::path::PathBuf; use structopt::StructOpt; use tokio::fs::File; use tokio::io::AsyncReadExt; -use tokio_socketcan; const COLOR_CAN_ID: Color = Color::White; const COLOR_CAN_SFF: Color = Color::Blue; @@ -97,7 +97,7 @@ struct Opt { async fn main() -> Result<()> { let opt = Opt::from_args(); - let mut socket_rx = tokio_socketcan::CANSocket::open(&opt.can_interface).unwrap(); + let mut socket_rx = CanSocket::open(&opt.can_interface).unwrap(); let byte_hex_table: Vec = (0u8..=u8::max_value()) .map(|i| { @@ -117,7 +117,7 @@ async fn main() -> Result<()> { for msg in dbc.messages() { signal_lookup.insert( - msg.message_id().0 & !socketcan::EFF_FLAG, + msg.message_id().raw(), (msg.message_name().clone(), msg.signals().clone()), ); } @@ -144,7 +144,7 @@ async fn main() -> Result<()> { write!( buffer, "{}", - COLOR_CAN_ID.paint(format!("{:08x} ", frame.id())) + COLOR_CAN_ID.paint(format!("{:?} ", frame.id())) )?; for b in frame.data() { @@ -163,8 +163,11 @@ async fn main() -> Result<()> { } // Given a CAN Frame, lookup the can signals and print the signal values -fn print_dbc_signals(signal_lookup: &HashMap)>, frame: &CANFrame) { - let id = frame.id() & !socketcan::EFF_FLAG; +fn print_dbc_signals(signal_lookup: &HashMap)>, frame: &CanFrame) { + let id = match frame.id() { + Id::Standard(id) => id.as_raw() as u32, + Id::Extended(id) => id.as_raw(), + }; let (message_name, signals) = signal_lookup.get(&id).expect("Unknown message id"); println!("\n{}", Purple.paint(message_name)); diff --git a/src/bin/cangenrb.rs b/src/bin/cangenrb.rs index 7f2c451..98c2a6e 100644 --- a/src/bin/cangenrb.rs +++ b/src/bin/cangenrb.rs @@ -5,7 +5,10 @@ use ansi_term::{ use can_dbc::{self, Message}; use pretty_hex::*; use rand::Rng; -use socketcan; +use socketcan::{ + tokio::CanSocket, CanDataFrame, CanErrorFrame, CanFrame, CanRemoteFrame, EmbeddedFrame, + ExtendedId, Id, StandardId, +}; use std::{ fs::File, io::{self, prelude::*}, @@ -14,7 +17,6 @@ use std::{ }; use structopt::StructOpt; use tokio::time; -use tokio_socketcan::CANFrame; #[derive(Debug, StructOpt)] #[structopt( @@ -62,7 +64,7 @@ async fn main() -> io::Result<()> { let mut buffer = Vec::new(); f.read_to_end(&mut buffer)?; - let socket_tx = tokio_socketcan::CANSocket::open(&opt.can_interface).unwrap(); + let socket_tx = CanSocket::open(&opt.can_interface).unwrap(); let dbc = can_dbc::DBC::from_slice(&buffer).expect("Failed to parse DBC"); // Filter messages by transmitter @@ -101,7 +103,7 @@ async fn main() -> io::Result<()> { dbc_signal_range_gen.gen() }; - socket_tx.write_frame(can_frame).unwrap().await.unwrap(); + socket_tx.write_frame(can_frame).await.unwrap(); messages_sent_counter += 1; @@ -117,7 +119,7 @@ async fn main() -> io::Result<()> { } trait CanFrameGenStrategy: Send { - fn gen(&self) -> CANFrame; + fn gen(&self) -> CanFrame; } /// Generates signal values based on a given DBC messages. @@ -130,50 +132,73 @@ struct DBCSignalRangeGen { } impl CanFrameGenStrategy for DBCSignalRangeGen { - fn gen(&self) -> CANFrame { - let mut rng = rand::thread_rng(); - let message_idx: usize = rng.gen_range(0, self.dbc_messages.len() - 1); + fn gen(&self) -> CanFrame { + let mut rng = rand::rng(); + let message_idx: usize = rng.random_range(..(self.dbc_messages.len() - 1)); let message = self.dbc_messages.get(message_idx).unwrap(); - - println!("\n{}", Purple.paint(message.message_name())); - let rtr_rand = if self.rtr_frames { - rand::random() - } else { - false + let message_id = match message.message_id() { + can_dbc::MessageId::Standard(id) => { + Id::Standard(StandardId::new(*id).expect("Invalid StandardId")) + } + can_dbc::MessageId::Extended(id) => { + Id::Extended(ExtendedId::new(*id).expect("Invalid ExtendedId")) + } }; - - let err_rand = if self.err_frames { - rand::random() - } else { - false + println!("\n{}", Purple.paint(message.message_name())); + let frame_constructor = match (self.err_frames, self.rtr_frames) { + (true, true) => { + let rand = rng.random_range(0..3); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + 1 => |id, data| (CanErrorFrame::new(id, data).map(CanFrame::Error)), + _ => |id, data| (CanRemoteFrame::new(id, data).map(CanFrame::Remote)), + } + } + (true, false) => { + let rand = rng.random_range(0..2); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + _ => |id, data| (CanErrorFrame::new(id, data).map(CanFrame::Error)), + } + } + (false, true) => { + let rand = rng.random_range(0..2); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + _ => |id, data| (CanRemoteFrame::new(id, data).map(CanFrame::Remote)), + } + } + (false, false) => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), }; let rand_frame_data = if *message.message_size() > 8 { - println!("Non random message body due to currently unsupported size `{}` - id: `{:x}`. Size {} > 8", message.message_name(), message.message_id().0, message.message_size()); - [0; 8] + println!("Non random message body due to currently unsupported size `{}` - id: `{:#?}`. Size {} > 8", message.message_name(), message.message_id(), message.message_size()); + vec![0; 8] } else { self.gen_msg_frame_data(&message) }; + let frame = frame_constructor( + message_id, + &rand_frame_data[..(*message.message_size() as usize)], + ) + .expect("Failed to create frame"); + println!( "→ ERR: {} RTR: {} Data: {}", - err_rand, - rtr_rand, + matches!(frame, CanFrame::Error(_)), + matches!(frame, CanFrame::Remote(_)), rand_frame_data.to_vec().hex_dump() ); - - let message_id = message.message_id().0 & socketcan::EFF_MASK; - - CANFrame::new(message_id, &rand_frame_data, rtr_rand, err_rand) - .expect("Failed to create frame") + frame } } impl DBCSignalRangeGen { - fn gen_msg_frame_data(&self, message: &can_dbc::Message) -> [u8; 8] { + fn gen_msg_frame_data(&self, message: &can_dbc::Message) -> Vec { let mut frame_data_rand: u64 = 0; - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for signal in message.signals() { let actual_value: f64 = if signal.min() == signal.max() { @@ -185,7 +210,7 @@ impl DBCSignalRangeGen { ); *signal.min() } else { - rng.gen_range(signal.min(), signal.max()) + rng.random_range(*signal.min()..*signal.max()) }; let random_signal_value = (actual_value - signal.offset) / signal.factor; @@ -213,7 +238,7 @@ impl DBCSignalRangeGen { frame_data_rand |= shifted_signal_value; } - frame_data_rand.to_le_bytes() + frame_data_rand.to_le_bytes()[..(*message.message_size() as usize)].to_vec() } } @@ -226,36 +251,60 @@ struct RandomFrameDataGen { } impl CanFrameGenStrategy for RandomFrameDataGen { - fn gen(&self) -> CANFrame { - let mut rng = rand::thread_rng(); - let message_idx: usize = rng.gen_range(0, self.dbc_messages.len() - 1); + fn gen(&self) -> CanFrame { + let mut rng = rand::rng(); + let message_idx: usize = rng.random_range(0..(self.dbc_messages.len() - 1)); let message = self.dbc_messages.get(message_idx).unwrap(); + let message_id = match message.message_id() { + can_dbc::MessageId::Standard(id) => { + Id::Standard(StandardId::new(*id).expect("Invalid StandardId")) + } + can_dbc::MessageId::Extended(id) => { + Id::Extended(ExtendedId::new(*id).expect("Invalid ExtendedId")) + } + }; println!("\n{}", Purple.paint(message.message_name())); - let rtr_rand = if self.rtr_frames { - rand::random() - } else { - false + let frame_constructor = match (self.err_frames, self.rtr_frames) { + (true, true) => { + let rand = rng.random_range(0..3); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + 1 => |id, data| (CanErrorFrame::new(id, data).map(CanFrame::Error)), + _ => |id, data| (CanRemoteFrame::new(id, data).map(CanFrame::Remote)), + } + } + (true, false) => { + let rand = rng.random_range(0..2); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + _ => |id, data| (CanErrorFrame::new(id, data).map(CanFrame::Error)), + } + } + (false, true) => { + let rand = rng.random_range(0..2); + match rand { + 0 => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), + _ => |id, data| (CanRemoteFrame::new(id, data).map(CanFrame::Remote)), + } + } + (false, false) => |id, data| (CanDataFrame::new(id, data).map(CanFrame::Data)), }; - let err_rand = if self.err_frames { - rand::random() - } else { - false - }; + let mut rand_frame_data = Vec::new(); + rand_frame_data.resize(*message.message_size() as usize, 0); + rng.fill(rand_frame_data.as_mut_slice()); - let mut rand_frame_data: [u8; 8] = [0; 8]; - rng.fill(&mut rand_frame_data[..]); + let frame = frame_constructor(message_id, rand_frame_data.as_slice()) + .expect("Failed to create frame"); println!( "→ ERR: {} RTR: {} Data: {}", - err_rand, - rtr_rand, + matches!(frame, CanFrame::Error(_)), + matches!(frame, CanFrame::Remote(_)), rand_frame_data.to_vec().hex_dump() ); - let message_id = message.message_id().0 & socketcan::EFF_MASK; - CANFrame::new(message_id, &rand_frame_data, rtr_rand, err_rand) - .expect("Failed to create frame") + frame } } diff --git a/src/bin/canstatsrb.rs b/src/bin/canstatsrb.rs index c6a0d9c..3d9507b 100644 --- a/src/bin/canstatsrb.rs +++ b/src/bin/canstatsrb.rs @@ -1,8 +1,8 @@ use core::fmt::Display; use futures::StreamExt; +use socketcan::{tokio::CanSocket, EmbeddedFrame, Frame, Id}; use std::{collections::HashMap, fmt}; use structopt::StructOpt; -use tokio_socketcan; #[derive(Debug, StructOpt)] #[structopt(name = "canstatsrb", about = "SocketCAN message statistics")] @@ -14,7 +14,7 @@ struct Opt { #[derive(Default, Debug)] struct Stats { - msg_ids: HashMap, + msg_ids: HashMap, rx_frames: u64, eff_frames_total: u64, eff_frames_err: u64, @@ -37,10 +37,10 @@ impl Display for Stats { writeln!(f, "RTR: {}", self.sff_frames_rtr)?; writeln!(f, "Messages by CAN ID")?; - let mut count_vec: Vec<(&u32, &u64)> = self.msg_ids.iter().collect(); + let mut count_vec: Vec<(&Id, &u64)> = self.msg_ids.iter().collect(); count_vec.sort_by(|a, b| a.0.cmp(b.0)); for (ref id, ref count) in &count_vec { - writeln!(f, "{: ^10} → #{: ^7}", id, count)?; + writeln!(f, "{:?} → #{: ^7}", id, count)?; } Ok(()) } @@ -50,7 +50,7 @@ impl Display for Stats { async fn main() -> std::io::Result<()> { let opt = Opt::from_args(); - let mut socket_rx = tokio_socketcan::CANSocket::open(&opt.can_interface).unwrap(); + let mut socket_rx = CanSocket::open(&opt.can_interface).unwrap(); let mut stats: Stats = Default::default(); @@ -62,21 +62,21 @@ async fn main() -> std::io::Result<()> { if frame.is_extended() { stats.sff_frames_total += 1; - if frame.is_error() { + if frame.is_error_frame() { stats.sff_frames_err += 1; } - if frame.is_rtr() { + if frame.is_remote_frame() { stats.sff_frames_rtr += 1; } } else { stats.eff_frames_total += 1; - if frame.is_error() { + if frame.is_error_frame() { stats.eff_frames_err += 1; } - if frame.is_rtr() { + if frame.is_remote_frame() { stats.eff_frames_rtr += 1; } } diff --git a/src/candump_parser.rs b/src/candump_parser.rs index 4245fd8..f29e559 100644 --- a/src/candump_parser.rs +++ b/src/candump_parser.rs @@ -1,28 +1,9 @@ -use nom::character::complete::{alphanumeric1, digit1, hex_digit1, space0}; - -#[cfg(test)] -mod tests { - use crate::candump_parser::*; - - #[test] - fn it_works() { - let exp = DumpEntry { - timestamp: Timestamp { - seconds: 1547046014, - nanos: 597158, - }, - can_interface: "vcan0".to_string(), - can_frame: CanFrame { - frame_id: 123, - frame_body: 455, - }, - }; - assert_eq!( - dump_entry("(1547046014.597158) vcan0 7B#1C7"), - Ok(("", exp)) - ); - } -} +use nom::{ + bytes::complete::tag, + character::complete::{alphanumeric1, digit1, hex_digit1, space0}, + combinator::map_res, + Parser, +}; #[derive(Debug, PartialEq)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] @@ -31,16 +12,18 @@ pub struct Timestamp { pub nanos: u64, } -named!(timestamp<&str, Timestamp>, - do_parse!( - tag!("(") >> - seconds: map_res!(digit1, |d: &str| d.parse()) >> - tag!(".") >> - nanos: map_res!(digit1, |d: &str| d.parse()) >> - tag!(")") >> - (Timestamp { seconds, nanos }) +fn timestamp(input: &str) -> nom::IResult<&str, Timestamp> { + let (input, (_, seconds, _, nanos, _)) = ( + tag("("), + map_res(digit1, |d: &str| d.parse::()), + tag("."), + map_res(digit1, |d: &str| d.parse::()), + tag(")"), ) -); + .parse(input)?; + + Ok((input, Timestamp { seconds, nanos })) +} #[derive(Debug, PartialEq)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] @@ -49,14 +32,22 @@ pub struct CanFrame { pub frame_body: u64, } -named!(can_frame<&str, CanFrame>, - do_parse!( - frame_id: map_res!(hex_digit1, |d| u32::from_str_radix(d, 16)) >> - tag!("#") >> - frame_body: map_res!(hex_digit1, |d| u64::from_str_radix(d, 16)) >> - (CanFrame { frame_id, frame_body }) +fn can_frame(input: &str) -> nom::IResult<&str, CanFrame> { + let (input, (frame_id, _, frame_body)) = ( + map_res(hex_digit1, |d: &str| u32::from_str_radix(d, 16)), + tag("#"), + map_res(hex_digit1, |d: &str| u64::from_str_radix(d, 16)), ) -); + .parse(input)?; + + Ok(( + input, + CanFrame { + frame_id, + frame_body, + }, + )) +} #[derive(Debug, PartialEq)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] @@ -80,13 +71,40 @@ impl DumpEntry { } } -named!(pub dump_entry<&str, DumpEntry>, - do_parse!( - timestamp: timestamp >> - space0 >> - can_interface: alphanumeric1 >> - space0 >> - can_frame: can_frame >> - (DumpEntry { timestamp, can_interface: can_interface.to_string(), can_frame }) - ) -); +fn dump_entry(input: &str) -> nom::IResult<&str, DumpEntry> { + let (input, (timestamp, _, can_interface, _, can_frame)) = + (timestamp, space0, alphanumeric1, space0, can_frame).parse(input)?; + + Ok(( + input, + DumpEntry { + timestamp, + can_interface: can_interface.to_string(), + can_frame, + }, + )) +} + +#[cfg(test)] +mod tests { + use crate::candump_parser::*; + + #[test] + fn it_works() { + let exp = DumpEntry { + timestamp: Timestamp { + seconds: 1547046014, + nanos: 597158, + }, + can_interface: "vcan0".to_string(), + can_frame: CanFrame { + frame_id: 123, + frame_body: 455, + }, + }; + assert_eq!( + dump_entry("(1547046014.597158) vcan0 7B#1C7"), + Ok(("", exp)) + ); + } +}