diff --git a/Cargo.lock b/Cargo.lock index a604d12..8885015 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,15 +47,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.18" @@ -167,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-io", "futures-lite", @@ -202,7 +193,7 @@ dependencies = [ "async-signal", "async-task", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener", "futures-lite", "rustix", @@ -217,7 +208,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -229,7 +220,7 @@ dependencies = [ "async-io", "async-lock", "atomic-waker", - "cfg-if 1.0.0", + "cfg-if", "futures-core", "futures-io", "rustix", @@ -257,7 +248,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -274,7 +265,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -352,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -441,12 +432,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -459,12 +444,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chainerror" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce1bb7fb0c258a6600d699950da347a7a9dad66c3ce815769b5f11cf8fce78e" - [[package]] name = "chrono" version = "0.4.39" @@ -510,7 +489,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -596,7 +575,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -677,7 +656,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -700,7 +679,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -771,7 +750,7 @@ dependencies = [ "semver", "serde", "serde_tokenstream", - "syn 2.0.95", + "syn", ] [[package]] @@ -795,7 +774,7 @@ version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -822,7 +801,7 @@ checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -847,7 +826,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "home", "windows-sys 0.48.0", ] @@ -1016,7 +995,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -1059,22 +1038,13 @@ dependencies = [ "version_check", ] -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - [[package]] name = "getrandom" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi", @@ -1221,7 +1191,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "windows", ] @@ -1497,7 +1467,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -1713,7 +1683,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest", ] @@ -1799,7 +1769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases", "libc", "memoffset", @@ -1910,7 +1880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -1926,7 +1896,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2082,7 +2052,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -2133,33 +2103,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "peg" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f76678828272f177ac33b7e2ac2e3e73cc6c1cd1e3e387928aa69562fa51367" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636d60acf97633e48d266d7415a9355d4389cea327a193f87df395d88cd2b14d" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -2192,7 +2135,7 @@ checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2251,7 +2194,7 @@ version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", @@ -2335,7 +2278,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.95", + "syn", "thiserror 2.0.11", "typify", "unicode-ident", @@ -2356,7 +2299,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.95", + "syn", ] [[package]] @@ -2379,7 +2322,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2605,7 +2548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "getrandom", "libc", "spin", @@ -2740,15 +2683,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.27" @@ -2781,7 +2715,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.95", + "syn", ] [[package]] @@ -2852,7 +2786,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2863,7 +2797,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2896,7 +2830,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -2917,7 +2851,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.95", + "syn", ] [[package]] @@ -2951,7 +2885,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -2962,7 +2896,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -3164,7 +3098,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.95", + "syn", ] [[package]] @@ -3187,7 +3121,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.95", + "syn", "tempfile", "tokio", "url", @@ -3336,17 +3270,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[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 = "2.0.95" @@ -3375,7 +3298,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -3399,18 +3322,6 @@ dependencies = [ "libc", ] -[[package]] -name = "systemd-ipc" -version = "0.2.0" -dependencies = [ - "serde", - "serde_derive", - "serde_json", - "varlink", - "varlink_generator", - "walkdir", -] - [[package]] name = "take_mut" version = "0.2.2" @@ -3423,7 +3334,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "getrandom", "once_cell", @@ -3478,7 +3389,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -3489,7 +3400,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -3498,7 +3409,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -3586,7 +3497,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -3768,7 +3679,7 @@ dependencies = [ "http", "proc-macro2", "quote", - "syn 2.0.95", + "syn", "tracing", ] @@ -3792,7 +3703,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -3896,7 +3807,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn 2.0.95", + "syn", "thiserror 2.0.11", "unicode-ident", ] @@ -3914,7 +3825,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.95", + "syn", "typify-impl", ] @@ -3956,22 +3867,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unix_socket" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" -dependencies = [ - "cfg-if 0.1.10", - "libc", -] - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -4029,47 +3924,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "varlink" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409e275987d74665c23610c0959c133360cafd761c1a6ddb1ca6d0685c8cef5d" -dependencies = [ - "libc", - "serde", - "serde_derive", - "serde_json", - "tempfile", - "uds_windows", - "unix_socket", - "winapi", -] - -[[package]] -name = "varlink_generator" -version = "10.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8ff746c5b65d4bfb3a50f630b85cfb6a9d59f18720126e3ebd6bc98527fa51" -dependencies = [ - "chainerror", - "getopts", - "proc-macro2", - "quote", - "syn 1.0.109", - "varlink_parser", -] - -[[package]] -name = "varlink_parser" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35fb9f3c1e8ccb33cdb6c84a4477ef3f3884ce6f4b70514ef1fbf7686eae921e" -dependencies = [ - "ansi_term", - "chainerror", - "peg", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -4091,16 +3945,6 @@ dependencies = [ "atomic-waker", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -4128,7 +3972,7 @@ version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -4144,7 +3988,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.95", + "syn", "wasm-bindgen-shared", ] @@ -4154,7 +3998,7 @@ version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "once_cell", "wasm-bindgen", @@ -4179,7 +4023,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4261,15 +4105,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4543,7 +4378,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", "synstructure", ] @@ -4592,7 +4427,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.95", + "syn", "zbus_names", "zvariant", "zvariant_utils", @@ -4639,7 +4474,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -4659,7 +4494,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", "synstructure", ] @@ -4688,7 +4523,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn", ] [[package]] @@ -4743,7 +4578,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.95", + "syn", "zvariant_utils", ] @@ -4757,6 +4592,6 @@ dependencies = [ "quote", "serde", "static_assertions", - "syn 2.0.95", + "syn", "winnow 0.7.1", ] diff --git a/Cargo.toml b/Cargo.toml index d1a0b96..5afc72d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ members = [ "hostd", "trace-request", "xtask", - "systemd-ipc", ] default-members = [ "agent", diff --git a/systemd-ipc/.gitignore b/systemd-ipc/.gitignore deleted file mode 100644 index ea8c4bf..0000000 --- a/systemd-ipc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/systemd-ipc/Cargo.toml b/systemd-ipc/Cargo.toml deleted file mode 100644 index 4667cf5..0000000 --- a/systemd-ipc/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "systemd-ipc" -version.workspace = true -edition.workspace = true - -[dependencies] -serde.workspace = true -serde_derive = "1.0.217" -serde_json = "1.0.135" -varlink = "11.0.1" - -[build-dependencies] -varlink_generator = "10.1.0" -walkdir = "2.5.0" - -[package.metadata.cargo-machete] -ignored = ["serde"] diff --git a/systemd-ipc/build.rs b/systemd-ipc/build.rs deleted file mode 100644 index fcec0de..0000000 --- a/systemd-ipc/build.rs +++ /dev/null @@ -1,12 +0,0 @@ -extern crate varlink_generator; - -use walkdir::WalkDir; - -fn main() { - println!("cargo:rerun-if-changed=src/*.varlink"); - for entry in WalkDir::new("src").into_iter().filter_map(|e| e.ok()) { - if entry.file_name().to_str().unwrap().ends_with(".varlink") { - varlink_generator::cargo_build_tosource(&entry.path().display().to_string(), true); - } - } -} diff --git a/systemd-ipc/src/addrs.rs b/systemd-ipc/src/addrs.rs deleted file mode 100644 index 1e6f888..0000000 --- a/systemd-ipc/src/addrs.rs +++ /dev/null @@ -1,3 +0,0 @@ -#[allow(dead_code)] -pub const SYSTEMD_HOSTNAME: &str = "unix:/run/systemd/io.systemd.Hostname"; -pub const SYSTEMD_BOOTCONTROL: &str = "unix:/run/systemd/io.systemd.BootControl"; diff --git a/systemd-ipc/src/io.systemd.bootcontrol.varlink b/systemd-ipc/src/io.systemd.bootcontrol.varlink deleted file mode 100644 index 871e560..0000000 --- a/systemd-ipc/src/io.systemd.bootcontrol.varlink +++ /dev/null @@ -1,70 +0,0 @@ -# Boot Loader control APIs -interface io.systemd.BootControl - -# The type of a boot entry -type BootEntryType( - # Boot Loader Specification Type #1 entries (.conf files) - type1, - # Boot Loader Specification Type #2 entries (UKIs) - type2, - # Additional entries reported by boot loader - loader, - # Automatically generated entries - auto -) - -# A structure encapsulating a boot entry -type BootEntry( - type: BootEntryType, - # The string identifier of the entry - id: ?string, - path: ?string, - root: ?string, - title: ?string, - showTitle: ?string, - sortKey: ?string, - version: ?string, - machineId: ?string, - architecture: ?string, - options: ?string, - linux: ?string, - efi: ?string, - initrd: ?[]string, - devicetree: ?string, - devicetreeOverlay: ?[]string, - # Indicates whether the boot loader reported this entry on the current boot - isReported: bool, - # Indicates the number of tries left for this boot entry before it is assumed to be not working. - triesLeft: ?int, - # Indicates the number of unsuccessful tries already made for this boot entry. - triesDone: ?int, - # Indicates whether this entry is the default entry. - isDefault: ?bool, - # Indicates whether this entry has been booted. - isSelected: ?bool -) - -# Enumerates boot entries. Method call must be called with 'more' flag set. Each response returns one entry. If no entries are defined returns the NoSuchBootEntry error. -# [Requires 'more' flag] -method ListBootEntries() -> ( - # A boot menu entry structure - entry: ?BootEntry -) - -# Sets the reboot-to-firmware-UI flag of the firmware, if this concept exists. Returns the RebootToFirmwareNotSupported error if not. -method SetRebootToFirmware( - # The new value of the reboot-to-firmware-UI flag - state: bool -) -> () - -# Gets the current state of the reboot-to-firmware-UI flag of the firmware, if this concept exists. Returns the RebootToFirmwareNotSupported error if not. -method GetRebootToFirmware() -> ( - # The current state of the reboot-to-firmware-UI flag - state: bool -) - -# SetRebootToFirmware() and GetRebootToFirmware() return this if the firmware does not actually support the reboot-to-firmware-UI concept. -error RebootToFirmwareNotSupported() - -# No boot entry defined. -error NoSuchBootEntry() diff --git a/systemd-ipc/src/io.systemd.hostname.varlink b/systemd-ipc/src/io.systemd.hostname.varlink deleted file mode 100644 index be4cf01..0000000 --- a/systemd-ipc/src/io.systemd.hostname.varlink +++ /dev/null @@ -1,32 +0,0 @@ -interface io.systemd.Hostname - -method Describe() -> ( - Hostname: string, - StaticHostname: ?string, - PrettyHostname: ?string, - DefaultHostname: ?string, - HostnameSource: string, - IconName: ?string, - Chassis: ?string, - Deployment: ?string, - Location: ?string, - KernelName: string, - KernelRelease: string, - KernelVersion: string, - OperatingSystemPrettyName: ?string, - OperatingSystemCPEName: ?string, - OperatingSystemHomeURL: ?string, - OperatingSystemSupportEnd: ?int, - OperatingSystemReleaseData: ?[]string, - MachineInformationData: ?[]string, - HardwareVendor: ?string, - HardwareModel: ?string, - HardwareSerial: ?string, - FirmwareVersion: ?string, - FirmwareVendor: ?string, - FirmwareDate: ?int, - MachineID: string, - BootID: string, - ProductUUID: ?string, - VSockCID: ?int -) diff --git a/systemd-ipc/src/io_systemd_bootcontrol.rs b/systemd-ipc/src/io_systemd_bootcontrol.rs deleted file mode 100644 index e36709d..0000000 --- a/systemd-ipc/src/io_systemd_bootcontrol.rs +++ /dev/null @@ -1,356 +0,0 @@ -#![doc = "This file was automatically generated by the varlink rust generator"] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] -use serde_derive::{Deserialize, Serialize}; -use std::io::BufRead; -use std::sync::{Arc, RwLock}; -use varlink::{self, CallTrait}; -#[allow(dead_code)] -#[derive(Clone, PartialEq, Debug)] -#[allow(clippy::enum_variant_names)] -pub enum ErrorKind { - Varlink_Error, - VarlinkReply_Error, - NoSuchBootEntry(Option<NoSuchBootEntry_Args>), - RebootToFirmwareNotSupported(Option<RebootToFirmwareNotSupported_Args>), -} -impl ::std::fmt::Display for ErrorKind { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - match self { - ErrorKind::Varlink_Error => write!(f, "Varlink Error"), - ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), - ErrorKind::NoSuchBootEntry(v) => { - write!(f, "io.systemd.BootControl.NoSuchBootEntry: {:#?}", v) - } - ErrorKind::RebootToFirmwareNotSupported(v) => write!( - f, - "io.systemd.BootControl.RebootToFirmwareNotSupported: {:#?}", - v - ), - } - } -} -pub struct Error( - pub ErrorKind, - pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, - pub Option<&'static str>, -); -impl Error { - #[allow(dead_code)] - pub fn kind(&self) -> &ErrorKind { - &self.0 - } -} -impl From<ErrorKind> for Error { - fn from(e: ErrorKind) -> Self { - Error(e, None, None) - } -} -impl std::error::Error for Error { - fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { - self.1 - .as_ref() - .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) - } -} -impl std::fmt::Display for Error { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - std::fmt::Display::fmt(&self.0, f) - } -} -impl std::fmt::Debug for Error { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - use std::error::Error as StdError; - if let Some(ref o) = self.2 { - std::fmt::Display::fmt(o, f)?; - } - std::fmt::Debug::fmt(&self.0, f)?; - if let Some(e) = self.source() { - std::fmt::Display::fmt("\nCaused by:\n", f)?; - std::fmt::Debug::fmt(&e, f)?; - } - Ok(()) - } -} -#[allow(dead_code)] -pub type Result<T> = std::result::Result<T, Error>; -impl From<varlink::Error> for Error { - fn from(e: varlink::Error) -> Self { - match e.kind() { - varlink::ErrorKind::VarlinkErrorReply(r) => Error( - ErrorKind::from(r), - Some(Box::from(e)), - Some(concat!(file!(), ":", line!(), ": ")), - ), - _ => Error( - ErrorKind::Varlink_Error, - Some(Box::from(e)), - Some(concat!(file!(), ":", line!(), ": ")), - ), - } - } -} -#[allow(dead_code)] -impl Error { - pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { - use std::error::Error as StdError; - let mut s: &dyn StdError = self; - while let Some(c) = s.source() { - let k = self - .source() - .and_then(|e| e.downcast_ref::<varlink::Error>()) - .map(|e| e.kind()); - if k.is_some() { - return k; - } - s = c; - } - None - } -} -impl From<&varlink::Reply> for ErrorKind { - #[allow(unused_variables)] - fn from(e: &varlink::Reply) -> Self { - match e { - varlink::Reply { - error: Some(ref t), .. - } if t == "io.systemd.BootControl.NoSuchBootEntry" => match e { - varlink::Reply { - parameters: Some(p), - .. - } => match serde_json::from_value(p.clone()) { - Ok(v) => ErrorKind::NoSuchBootEntry(v), - Err(_) => ErrorKind::NoSuchBootEntry(None), - }, - _ => ErrorKind::NoSuchBootEntry(None), - }, - varlink::Reply { - error: Some(ref t), .. - } if t == "io.systemd.BootControl.RebootToFirmwareNotSupported" => match e { - varlink::Reply { - parameters: Some(p), - .. - } => match serde_json::from_value(p.clone()) { - Ok(v) => ErrorKind::RebootToFirmwareNotSupported(v), - Err(_) => ErrorKind::RebootToFirmwareNotSupported(None), - }, - _ => ErrorKind::RebootToFirmwareNotSupported(None), - }, - _ => ErrorKind::VarlinkReply_Error, - } - } -} -pub trait VarlinkCallError: varlink::CallTrait { - fn reply_no_such_boot_entry(&mut self) -> varlink::Result<()> { - self.reply_struct(varlink::Reply::error( - "io.systemd.BootControl.NoSuchBootEntry", - None, - )) - } - fn reply_reboot_to_firmware_not_supported(&mut self) -> varlink::Result<()> { - self.reply_struct(varlink::Reply::error( - "io.systemd.BootControl.RebootToFirmwareNotSupported", - None, - )) - } -} -impl<'a> VarlinkCallError for varlink::Call<'a> {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct r#BootEntry { - pub r#type: BootEntryType, - pub r#id: Option<String>, - pub r#path: Option<String>, - pub r#root: Option<String>, - pub r#title: Option<String>, - pub r#showTitle: Option<String>, - pub r#sortKey: Option<String>, - pub r#version: Option<String>, - pub r#machineId: Option<String>, - pub r#architecture: Option<String>, - pub r#options: Option<String>, - pub r#linux: Option<String>, - pub r#efi: Option<String>, - pub r#initrd: Option<Vec<String>>, - pub r#devicetree: Option<String>, - pub r#devicetreeOverlay: Option<Vec<String>>, - pub r#isReported: bool, - pub r#triesLeft: Option<i64>, - pub r#triesDone: Option<i64>, - pub r#isDefault: Option<bool>, - pub r#isSelected: Option<bool>, -} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub enum r#BootEntryType { - r#type1, - r#type2, - r#loader, - r#auto, -} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct NoSuchBootEntry_Args {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct RebootToFirmwareNotSupported_Args {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct GetRebootToFirmware_Reply { - pub r#state: bool, -} -impl varlink::VarlinkReply for GetRebootToFirmware_Reply {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct GetRebootToFirmware_Args {} -pub trait Call_GetRebootToFirmware: VarlinkCallError { - fn reply(&mut self, r#state: bool) -> varlink::Result<()> { - self.reply_struct(GetRebootToFirmware_Reply { r#state }.into()) - } -} -impl<'a> Call_GetRebootToFirmware for varlink::Call<'a> {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct ListBootEntries_Reply { - #[serde(skip_serializing_if = "Option::is_none")] - pub r#entry: Option<BootEntry>, -} -impl varlink::VarlinkReply for ListBootEntries_Reply {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct ListBootEntries_Args {} -pub trait Call_ListBootEntries: VarlinkCallError { - fn reply(&mut self, r#entry: Option<BootEntry>) -> varlink::Result<()> { - self.reply_struct(ListBootEntries_Reply { r#entry }.into()) - } -} -impl<'a> Call_ListBootEntries for varlink::Call<'a> {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct SetRebootToFirmware_Reply {} -impl varlink::VarlinkReply for SetRebootToFirmware_Reply {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct SetRebootToFirmware_Args { - pub r#state: bool, -} -pub trait Call_SetRebootToFirmware: VarlinkCallError { - fn reply(&mut self) -> varlink::Result<()> { - self.reply_struct(varlink::Reply::parameters(None)) - } -} -impl<'a> Call_SetRebootToFirmware for varlink::Call<'a> {} -pub trait VarlinkInterface { - fn get_reboot_to_firmware( - &self, - call: &mut dyn Call_GetRebootToFirmware, - ) -> varlink::Result<()>; - fn list_boot_entries(&self, call: &mut dyn Call_ListBootEntries) -> varlink::Result<()>; - fn set_reboot_to_firmware( - &self, - call: &mut dyn Call_SetRebootToFirmware, - r#state: bool, - ) -> varlink::Result<()>; - fn call_upgraded( - &self, - _call: &mut varlink::Call, - _bufreader: &mut dyn BufRead, - ) -> varlink::Result<Vec<u8>> { - Ok(Vec::new()) - } -} -pub trait VarlinkClientInterface { - fn get_reboot_to_firmware( - &mut self, - ) -> varlink::MethodCall<GetRebootToFirmware_Args, GetRebootToFirmware_Reply, Error>; - fn list_boot_entries( - &mut self, - ) -> varlink::MethodCall<ListBootEntries_Args, ListBootEntries_Reply, Error>; - fn set_reboot_to_firmware( - &mut self, - r#state: bool, - ) -> varlink::MethodCall<SetRebootToFirmware_Args, SetRebootToFirmware_Reply, Error>; -} -#[allow(dead_code)] -pub struct VarlinkClient { - connection: Arc<RwLock<varlink::Connection>>, -} -impl VarlinkClient { - #[allow(dead_code)] - pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { - VarlinkClient { connection } - } -} -impl VarlinkClientInterface for VarlinkClient { - fn get_reboot_to_firmware( - &mut self, - ) -> varlink::MethodCall<GetRebootToFirmware_Args, GetRebootToFirmware_Reply, Error> { - varlink::MethodCall::<GetRebootToFirmware_Args, GetRebootToFirmware_Reply, Error>::new( - self.connection.clone(), - "io.systemd.BootControl.GetRebootToFirmware", - GetRebootToFirmware_Args {}, - ) - } - fn list_boot_entries( - &mut self, - ) -> varlink::MethodCall<ListBootEntries_Args, ListBootEntries_Reply, Error> { - varlink::MethodCall::<ListBootEntries_Args, ListBootEntries_Reply, Error>::new( - self.connection.clone(), - "io.systemd.BootControl.ListBootEntries", - ListBootEntries_Args {}, - ) - } - fn set_reboot_to_firmware( - &mut self, - r#state: bool, - ) -> varlink::MethodCall<SetRebootToFirmware_Args, SetRebootToFirmware_Reply, Error> { - varlink::MethodCall::<SetRebootToFirmware_Args, SetRebootToFirmware_Reply, Error>::new( - self.connection.clone(), - "io.systemd.BootControl.SetRebootToFirmware", - SetRebootToFirmware_Args { r#state }, - ) - } -} -#[allow(dead_code)] -pub struct VarlinkInterfaceProxy { - inner: Box<dyn VarlinkInterface + Send + Sync>, -} -#[allow(dead_code)] -pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { - VarlinkInterfaceProxy { inner } -} -impl varlink::Interface for VarlinkInterfaceProxy { - fn get_description(&self) -> &'static str { - "# Boot Loader control APIs\ninterface io.systemd.BootControl\n\n# The type of a boot entry\ntype BootEntryType(\n\t# Boot Loader Specification Type #1 entries (.conf files)\n\ttype1,\n\t# Boot Loader Specification Type #2 entries (UKIs)\n\ttype2,\n\t# Additional entries reported by boot loader\n\tloader,\n\t# Automatically generated entries\n\tauto\n)\n\n# A structure encapsulating a boot entry\ntype BootEntry(\n\ttype: BootEntryType,\n\t# The string identifier of the entry\n\tid: ?string,\n\tpath: ?string,\n\troot: ?string,\n\ttitle: ?string,\n\tshowTitle: ?string,\n\tsortKey: ?string,\n\tversion: ?string,\n\tmachineId: ?string,\n\tarchitecture: ?string,\n\toptions: ?string,\n\tlinux: ?string,\n\tefi: ?string,\n\tinitrd: ?[]string,\n\tdevicetree: ?string,\n\tdevicetreeOverlay: ?[]string,\n\t# Indicates whether the boot loader reported this entry on the current boot\n\tisReported: bool,\n\t# Indicates the number of tries left for this boot entry before it is assumed to be not working.\n\ttriesLeft: ?int,\n\t# Indicates the number of unsuccessful tries already made for this boot entry.\n\ttriesDone: ?int,\n\t# Indicates whether this entry is the default entry.\n\tisDefault: ?bool,\n\t# Indicates whether this entry has been booted.\n\tisSelected: ?bool\n)\n\n# Enumerates boot entries. Method call must be called with 'more' flag set. Each response returns one entry. If no entries are defined returns the NoSuchBootEntry error.\n# [Requires 'more' flag]\nmethod ListBootEntries() -> (\n\t# A boot menu entry structure\n\tentry: ?BootEntry\n)\n\n# Sets the reboot-to-firmware-UI flag of the firmware, if this concept exists. Returns the RebootToFirmwareNotSupported error if not.\nmethod SetRebootToFirmware(\n\t# The new value of the reboot-to-firmware-UI flag\n\tstate: bool\n) -> ()\n\n# Gets the current state of the reboot-to-firmware-UI flag of the firmware, if this concept exists. Returns the RebootToFirmwareNotSupported error if not.\nmethod GetRebootToFirmware() -> (\n\t# The current state of the reboot-to-firmware-UI flag\n\tstate: bool\n)\n\n# SetRebootToFirmware() and GetRebootToFirmware() return this if the firmware does not actually support the reboot-to-firmware-UI concept.\nerror RebootToFirmwareNotSupported()\n\n# No boot entry defined.\nerror NoSuchBootEntry()\n" - } - fn get_name(&self) -> &'static str { - "io.systemd.BootControl" - } - fn call_upgraded( - &self, - call: &mut varlink::Call, - bufreader: &mut dyn BufRead, - ) -> varlink::Result<Vec<u8>> { - self.inner.call_upgraded(call, bufreader) - } - fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { - let req = call.request.unwrap(); - match req.method.as_ref() { - "io.systemd.BootControl.GetRebootToFirmware" => self - .inner - .get_reboot_to_firmware(call as &mut dyn Call_GetRebootToFirmware), - "io.systemd.BootControl.ListBootEntries" => self - .inner - .list_boot_entries(call as &mut dyn Call_ListBootEntries), - "io.systemd.BootControl.SetRebootToFirmware" => { - if let Some(args) = req.parameters.clone() { - let args: SetRebootToFirmware_Args = match serde_json::from_value(args) { - Ok(v) => v, - Err(e) => { - let es = format!("{}", e); - let _ = call.reply_invalid_parameter(es.clone()); - return Err(varlink::context!(varlink::ErrorKind::SerdeJsonDe(es))); - } - }; - self.inner.set_reboot_to_firmware( - call as &mut dyn Call_SetRebootToFirmware, - args.r#state, - ) - } else { - call.reply_invalid_parameter("parameters".into()) - } - } - m => call.reply_method_not_found(String::from(m)), - } - } -} diff --git a/systemd-ipc/src/io_systemd_hostname.rs b/systemd-ipc/src/io_systemd_hostname.rs deleted file mode 100644 index e9fa185..0000000 --- a/systemd-ipc/src/io_systemd_hostname.rs +++ /dev/null @@ -1,295 +0,0 @@ -#![doc = "This file was automatically generated by the varlink rust generator"] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] -use serde_derive::{Deserialize, Serialize}; -use std::io::BufRead; -use std::sync::{Arc, RwLock}; -use varlink::{self, CallTrait}; -#[allow(dead_code)] -#[derive(Clone, PartialEq, Debug)] -#[allow(clippy::enum_variant_names)] -pub enum ErrorKind { - Varlink_Error, - VarlinkReply_Error, -} -impl ::std::fmt::Display for ErrorKind { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - match self { - ErrorKind::Varlink_Error => write!(f, "Varlink Error"), - ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), - } - } -} -pub struct Error( - pub ErrorKind, - pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, - pub Option<&'static str>, -); -impl Error { - #[allow(dead_code)] - pub fn kind(&self) -> &ErrorKind { - &self.0 - } -} -impl From<ErrorKind> for Error { - fn from(e: ErrorKind) -> Self { - Error(e, None, None) - } -} -impl std::error::Error for Error { - fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { - self.1 - .as_ref() - .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) - } -} -impl std::fmt::Display for Error { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - std::fmt::Display::fmt(&self.0, f) - } -} -impl std::fmt::Debug for Error { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - use std::error::Error as StdError; - if let Some(ref o) = self.2 { - std::fmt::Display::fmt(o, f)?; - } - std::fmt::Debug::fmt(&self.0, f)?; - if let Some(e) = self.source() { - std::fmt::Display::fmt("\nCaused by:\n", f)?; - std::fmt::Debug::fmt(&e, f)?; - } - Ok(()) - } -} -#[allow(dead_code)] -pub type Result<T> = std::result::Result<T, Error>; -impl From<varlink::Error> for Error { - fn from(e: varlink::Error) -> Self { - match e.kind() { - varlink::ErrorKind::VarlinkErrorReply(r) => Error( - ErrorKind::from(r), - Some(Box::from(e)), - Some(concat!(file!(), ":", line!(), ": ")), - ), - _ => Error( - ErrorKind::Varlink_Error, - Some(Box::from(e)), - Some(concat!(file!(), ":", line!(), ": ")), - ), - } - } -} -#[allow(dead_code)] -impl Error { - pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { - use std::error::Error as StdError; - let mut s: &dyn StdError = self; - while let Some(c) = s.source() { - let k = self - .source() - .and_then(|e| e.downcast_ref::<varlink::Error>()) - .map(|e| e.kind()); - if k.is_some() { - return k; - } - s = c; - } - None - } -} -impl From<&varlink::Reply> for ErrorKind { - #[allow(unused_variables)] - fn from(e: &varlink::Reply) -> Self { - match e { - _ => ErrorKind::VarlinkReply_Error, - } - } -} -pub trait VarlinkCallError: varlink::CallTrait {} -impl<'a> VarlinkCallError for varlink::Call<'a> {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct Describe_Reply { - pub r#Hostname: String, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#StaticHostname: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#PrettyHostname: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#DefaultHostname: Option<String>, - pub r#HostnameSource: String, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#IconName: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#Chassis: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#Deployment: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#Location: Option<String>, - pub r#KernelName: String, - pub r#KernelRelease: String, - pub r#KernelVersion: String, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#OperatingSystemPrettyName: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#OperatingSystemCPEName: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#OperatingSystemHomeURL: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#OperatingSystemSupportEnd: Option<i64>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#OperatingSystemReleaseData: Option<Vec<String>>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#MachineInformationData: Option<Vec<String>>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#HardwareVendor: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#HardwareModel: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#HardwareSerial: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#FirmwareVersion: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#FirmwareVendor: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#FirmwareDate: Option<i64>, - pub r#MachineID: String, - pub r#BootID: String, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#ProductUUID: Option<String>, - #[serde(skip_serializing_if = "Option::is_none")] - pub r#VSockCID: Option<i64>, -} -impl varlink::VarlinkReply for Describe_Reply {} -#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] -pub struct Describe_Args {} -pub trait Call_Describe: VarlinkCallError { - fn reply( - &mut self, - r#Hostname: String, - r#StaticHostname: Option<String>, - r#PrettyHostname: Option<String>, - r#DefaultHostname: Option<String>, - r#HostnameSource: String, - r#IconName: Option<String>, - r#Chassis: Option<String>, - r#Deployment: Option<String>, - r#Location: Option<String>, - r#KernelName: String, - r#KernelRelease: String, - r#KernelVersion: String, - r#OperatingSystemPrettyName: Option<String>, - r#OperatingSystemCPEName: Option<String>, - r#OperatingSystemHomeURL: Option<String>, - r#OperatingSystemSupportEnd: Option<i64>, - r#OperatingSystemReleaseData: Option<Vec<String>>, - r#MachineInformationData: Option<Vec<String>>, - r#HardwareVendor: Option<String>, - r#HardwareModel: Option<String>, - r#HardwareSerial: Option<String>, - r#FirmwareVersion: Option<String>, - r#FirmwareVendor: Option<String>, - r#FirmwareDate: Option<i64>, - r#MachineID: String, - r#BootID: String, - r#ProductUUID: Option<String>, - r#VSockCID: Option<i64>, - ) -> varlink::Result<()> { - self.reply_struct( - Describe_Reply { - r#Hostname, - r#StaticHostname, - r#PrettyHostname, - r#DefaultHostname, - r#HostnameSource, - r#IconName, - r#Chassis, - r#Deployment, - r#Location, - r#KernelName, - r#KernelRelease, - r#KernelVersion, - r#OperatingSystemPrettyName, - r#OperatingSystemCPEName, - r#OperatingSystemHomeURL, - r#OperatingSystemSupportEnd, - r#OperatingSystemReleaseData, - r#MachineInformationData, - r#HardwareVendor, - r#HardwareModel, - r#HardwareSerial, - r#FirmwareVersion, - r#FirmwareVendor, - r#FirmwareDate, - r#MachineID, - r#BootID, - r#ProductUUID, - r#VSockCID, - } - .into(), - ) - } -} -impl<'a> Call_Describe for varlink::Call<'a> {} -pub trait VarlinkInterface { - fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()>; - fn call_upgraded( - &self, - _call: &mut varlink::Call, - _bufreader: &mut dyn BufRead, - ) -> varlink::Result<Vec<u8>> { - Ok(Vec::new()) - } -} -pub trait VarlinkClientInterface { - fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error>; -} -#[allow(dead_code)] -pub struct VarlinkClient { - connection: Arc<RwLock<varlink::Connection>>, -} -impl VarlinkClient { - #[allow(dead_code)] - pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { - VarlinkClient { connection } - } -} -impl VarlinkClientInterface for VarlinkClient { - fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error> { - varlink::MethodCall::<Describe_Args, Describe_Reply, Error>::new( - self.connection.clone(), - "io.systemd.Hostname.Describe", - Describe_Args {}, - ) - } -} -#[allow(dead_code)] -pub struct VarlinkInterfaceProxy { - inner: Box<dyn VarlinkInterface + Send + Sync>, -} -#[allow(dead_code)] -pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { - VarlinkInterfaceProxy { inner } -} -impl varlink::Interface for VarlinkInterfaceProxy { - fn get_description(&self) -> &'static str { - "interface io.systemd.Hostname\n\nmethod Describe() -> (\n\tHostname: string,\n\tStaticHostname: ?string,\n\tPrettyHostname: ?string,\n\tDefaultHostname: ?string,\n\tHostnameSource: string,\n\tIconName: ?string,\n\tChassis: ?string,\n\tDeployment: ?string,\n\tLocation: ?string,\n\tKernelName: string,\n\tKernelRelease: string,\n\tKernelVersion: string,\n\tOperatingSystemPrettyName: ?string,\n\tOperatingSystemCPEName: ?string,\n\tOperatingSystemHomeURL: ?string,\n\tOperatingSystemSupportEnd: ?int,\n\tOperatingSystemReleaseData: ?[]string,\n\tMachineInformationData: ?[]string,\n\tHardwareVendor: ?string,\n\tHardwareModel: ?string,\n\tHardwareSerial: ?string,\n\tFirmwareVersion: ?string,\n\tFirmwareVendor: ?string,\n\tFirmwareDate: ?int,\n\tMachineID: string,\n\tBootID: string,\n\tProductUUID: ?string,\n\tVSockCID: ?int\n)\n" - } - fn get_name(&self) -> &'static str { - "io.systemd.Hostname" - } - fn call_upgraded( - &self, - call: &mut varlink::Call, - bufreader: &mut dyn BufRead, - ) -> varlink::Result<Vec<u8>> { - self.inner.call_upgraded(call, bufreader) - } - fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { - let req = call.request.unwrap(); - match req.method.as_ref() { - "io.systemd.Hostname.Describe" => self.inner.describe(call as &mut dyn Call_Describe), - m => call.reply_method_not_found(String::from(m)), - } - } -} diff --git a/systemd-ipc/src/lib.rs b/systemd-ipc/src/lib.rs deleted file mode 100644 index 606c22e..0000000 --- a/systemd-ipc/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod addrs; -pub mod io_systemd_hostname;