Rust & Zig
This commit is contained in:
parent
ea4ef1d8b3
commit
c2e16f5b83
11 changed files with 226 additions and 15 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -90,3 +90,5 @@ clion*
|
||||||
/CUDSClient/cmake-build-debug/CMakeFiles/TargetDirectories.txt
|
/CUDSClient/cmake-build-debug/CMakeFiles/TargetDirectories.txt
|
||||||
/CUDSClient/cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
|
/CUDSClient/cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
|
||||||
*.c.o
|
*.c.o
|
||||||
|
|
||||||
|
**/.zig-cache/**
|
File diff suppressed because one or more lines are too long
|
@ -3,7 +3,6 @@
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#define CLIENT_SOCK_FILE "/tmp/cclient.sock"
|
|
||||||
#define SERVER_SOCK_FILE "/tmp/udsserver.sock"
|
#define SERVER_SOCK_FILE "/tmp/udsserver.sock"
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
|
@ -26,7 +25,5 @@ int main(void) {
|
||||||
perror("Unable to connect") ;
|
perror("Unable to connect") ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unlink (CLIENT_SOCK_FILE);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,21 +15,30 @@ public class Main {
|
||||||
new Main().run();
|
new Main().run();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void run() throws IOException {
|
private void run() {
|
||||||
try (var clientChannel = SocketChannel.open(StandardProtocolFamily.UNIX)) {
|
try (var clientChannel = SocketChannel.open(StandardProtocolFamily.UNIX)) {
|
||||||
var serverPath = Path.of("/tmp").resolve("udsserver.sock") ;
|
var serverPath = Path.of("/tmp").resolve("udsserver.sock") ;
|
||||||
var serverAddress = UnixDomainSocketAddress.of(serverPath);
|
var serverAddress = UnixDomainSocketAddress.of(serverPath);
|
||||||
clientChannel.connect(serverAddress);
|
clientChannel.connect(serverAddress);
|
||||||
|
|
||||||
var clientMessage = "quit från - " + UUID.randomUUID();
|
var clientMessage = "Hello world from Java";
|
||||||
|
|
||||||
sendMessage(clientMessage, clientChannel);
|
var messageBytes = clientMessage.getBytes(StandardCharsets.UTF_8);
|
||||||
}
|
var messageBuffer = ByteBuffer.allocate(400);
|
||||||
}
|
messageBuffer.put((byte) messageBytes.length);
|
||||||
|
messageBuffer.put(messageBytes);
|
||||||
|
messageBuffer.flip();
|
||||||
|
while (messageBuffer.hasRemaining()) {
|
||||||
|
clientChannel.write(messageBuffer);
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static void sendMessage(String clientMessage, SocketChannel clientChannel) throws IOException {
|
private static void sendMessage(String clientMessage, SocketChannel clientChannel) throws IOException {
|
||||||
var messageBytes = clientMessage.getBytes(StandardCharsets.UTF_8);
|
var messageBytes = clientMessage.getBytes(StandardCharsets.UTF_8);
|
||||||
var messageBuffer = ByteBuffer.allocate(500);
|
var messageBuffer = ByteBuffer.allocate(400);
|
||||||
messageBuffer.put((byte) messageBytes.length);
|
messageBuffer.put((byte) messageBytes.length);
|
||||||
messageBuffer.put(messageBytes);
|
messageBuffer.put(messageBytes);
|
||||||
messageBuffer.flip();
|
messageBuffer.flip();
|
||||||
|
|
7
RustUDSClient/Cargo.lock
generated
Normal file
7
RustUDSClient/Cargo.lock
generated
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 3
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "RustUDSClient"
|
||||||
|
version = "0.1.0"
|
6
RustUDSClient/Cargo.toml
Normal file
6
RustUDSClient/Cargo.toml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
[package]
|
||||||
|
name = "RustUDSClient"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
19
RustUDSClient/src/main.rs
Normal file
19
RustUDSClient/src/main.rs
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
use std::io::Write;
|
||||||
|
use std::os::unix::net::UnixStream;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let socket = "/tmp/udsserver.sock";
|
||||||
|
let stream_result = UnixStream::connect(socket);
|
||||||
|
match stream_result {
|
||||||
|
Ok(mut stream) => {
|
||||||
|
let message = "Hello, World from RUST™️!";
|
||||||
|
let mut size_buf = [0u8] ;
|
||||||
|
size_buf[0] = message.len() as u8;
|
||||||
|
stream.write(size_buf.as_slice()).unwrap();
|
||||||
|
stream.write_all(message.as_bytes()).unwrap();
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("Error: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
29
ZigUDSClient/main.c
Normal file
29
ZigUDSClient/main.c
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#define SERVER_SOCK_FILE "/tmp/udsserver.sock"
|
||||||
|
|
||||||
|
int main(void) {
|
||||||
|
struct sockaddr_un server_addr = {};
|
||||||
|
server_addr.sun_family = AF_UNIX;
|
||||||
|
strcpy(server_addr.sun_path, SERVER_SOCK_FILE); // XXX: should be limited to about 104 characters, system dependent
|
||||||
|
|
||||||
|
// get socket
|
||||||
|
int sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
|
||||||
|
|
||||||
|
if (connect(sockfd, (struct sockaddr *) &server_addr, sizeof(server_addr)) > -1) {
|
||||||
|
unsigned char messageBuffer[500] = {};
|
||||||
|
const char* message = "Hello from C";
|
||||||
|
size_t messageLengthInBytes = strlen(message);
|
||||||
|
messageBuffer[0] = messageLengthInBytes;
|
||||||
|
// Lucky for us the message just happens to be compatible with UTF-8 encoding
|
||||||
|
strcpy((char *)messageBuffer+1, message);
|
||||||
|
send(sockfd, messageBuffer, messageLengthInBytes+1, 0);
|
||||||
|
} else {
|
||||||
|
perror("Unable to connect") ;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
66
zigUDSClient/build.zig
Normal file
66
zigUDSClient/build.zig
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
const std = @import("std");
|
||||||
|
|
||||||
|
// Although this function looks imperative, note that its job is to
|
||||||
|
// declaratively construct a build graph that will be executed by an external
|
||||||
|
// runner.
|
||||||
|
pub fn build(b: *std.Build) void {
|
||||||
|
// Standard target options allows the person running `zig build` to choose
|
||||||
|
// what target to build for. Here we do not override the defaults, which
|
||||||
|
// means any target is allowed, and the default is native. Other options
|
||||||
|
// for restricting supported target set are available.
|
||||||
|
const target = b.standardTargetOptions(.{});
|
||||||
|
|
||||||
|
// Standard optimization options allow the person running `zig build` to select
|
||||||
|
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
|
||||||
|
// set a preferred release mode, allowing the user to decide how to optimize.
|
||||||
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
|
|
||||||
|
const exe = b.addExecutable(.{
|
||||||
|
.name = "zigUDSClient",
|
||||||
|
.root_source_file = b.path("src/main.zig"),
|
||||||
|
.target = target,
|
||||||
|
.optimize = optimize,
|
||||||
|
});
|
||||||
|
|
||||||
|
// This declares intent for the executable to be installed into the
|
||||||
|
// standard location when the user invokes the "install" step (the default
|
||||||
|
// step when running `zig build`).
|
||||||
|
b.installArtifact(exe);
|
||||||
|
|
||||||
|
// This *creates* a Run step in the build graph, to be executed when another
|
||||||
|
// step is evaluated that depends on it. The next line below will establish
|
||||||
|
// such a dependency.
|
||||||
|
const run_cmd = b.addRunArtifact(exe);
|
||||||
|
|
||||||
|
// By making the run step depend on the install step, it will be run from the
|
||||||
|
// installation directory rather than directly from within the cache directory.
|
||||||
|
// This is not necessary, however, if the application depends on other installed
|
||||||
|
// files, this ensures they will be present and in the expected location.
|
||||||
|
run_cmd.step.dependOn(b.getInstallStep());
|
||||||
|
|
||||||
|
// This allows the user to pass arguments to the application in the build
|
||||||
|
// command itself, like this: `zig build run -- arg1 arg2 etc`
|
||||||
|
if (b.args) |args| {
|
||||||
|
run_cmd.addArgs(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
// This creates a build step. It will be visible in the `zig build --help` menu,
|
||||||
|
// and can be selected like this: `zig build run`
|
||||||
|
// This will evaluate the `run` step rather than the default, which is "install".
|
||||||
|
const run_step = b.step("run", "Run the app");
|
||||||
|
run_step.dependOn(&run_cmd.step);
|
||||||
|
|
||||||
|
const exe_unit_tests = b.addTest(.{
|
||||||
|
.root_source_file = b.path("src/main.zig"),
|
||||||
|
.target = target,
|
||||||
|
.optimize = optimize,
|
||||||
|
});
|
||||||
|
|
||||||
|
const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
|
||||||
|
|
||||||
|
// Similar to creating the run step earlier, this exposes a `test` step to
|
||||||
|
// the `zig build --help` menu, providing a way for the user to request
|
||||||
|
// running the unit tests.
|
||||||
|
const test_step = b.step("test", "Run unit tests");
|
||||||
|
test_step.dependOn(&run_exe_unit_tests.step);
|
||||||
|
}
|
67
zigUDSClient/build.zig.zon
Normal file
67
zigUDSClient/build.zig.zon
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
.{
|
||||||
|
.name = "zigUDSClient",
|
||||||
|
// This is a [Semantic Version](https://semver.org/).
|
||||||
|
// In a future version of Zig it will be used for package deduplication.
|
||||||
|
.version = "0.0.0",
|
||||||
|
|
||||||
|
// This field is optional.
|
||||||
|
// This is currently advisory only; Zig does not yet do anything
|
||||||
|
// with this value.
|
||||||
|
//.minimum_zig_version = "0.11.0",
|
||||||
|
|
||||||
|
// This field is optional.
|
||||||
|
// Each dependency must either provide a `url` and `hash`, or a `path`.
|
||||||
|
// `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
|
||||||
|
// Once all dependencies are fetched, `zig build` no longer requires
|
||||||
|
// internet connectivity.
|
||||||
|
.dependencies = .{
|
||||||
|
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
||||||
|
//.example = .{
|
||||||
|
// // When updating this field to a new URL, be sure to delete the corresponding
|
||||||
|
// // `hash`, otherwise you are communicating that you expect to find the old hash at
|
||||||
|
// // the new URL.
|
||||||
|
// .url = "https://example.com/foo.tar.gz",
|
||||||
|
//
|
||||||
|
// // This is computed from the file contents of the directory of files that is
|
||||||
|
// // obtained after fetching `url` and applying the inclusion rules given by
|
||||||
|
// // `paths`.
|
||||||
|
// //
|
||||||
|
// // This field is the source of truth; packages do not come from a `url`; they
|
||||||
|
// // come from a `hash`. `url` is just one of many possible mirrors for how to
|
||||||
|
// // obtain a package matching this `hash`.
|
||||||
|
// //
|
||||||
|
// // Uses the [multihash](https://multiformats.io/multihash/) format.
|
||||||
|
// .hash = "...",
|
||||||
|
//
|
||||||
|
// // When this is provided, the package is found in a directory relative to the
|
||||||
|
// // build root. In this case the package's hash is irrelevant and therefore not
|
||||||
|
// // computed. This field and `url` are mutually exclusive.
|
||||||
|
// .path = "foo",
|
||||||
|
|
||||||
|
// // When this is set to `true`, a package is declared to be lazily
|
||||||
|
// // fetched. This makes the dependency only get fetched if it is
|
||||||
|
// // actually used.
|
||||||
|
// .lazy = false,
|
||||||
|
//},
|
||||||
|
},
|
||||||
|
|
||||||
|
// Specifies the set of files and directories that are included in this package.
|
||||||
|
// Only files and directories listed here are included in the `hash` that
|
||||||
|
// is computed for this package.
|
||||||
|
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
||||||
|
// the build root itself.
|
||||||
|
// A directory listed here means that all files within, recursively, are included.
|
||||||
|
.paths = .{
|
||||||
|
// This makes *all* files, recursively, included in this package. It is generally
|
||||||
|
// better to explicitly list the files and directories instead, to insure that
|
||||||
|
// fetching from tarballs, file system paths, and version control all result
|
||||||
|
// in the same contents hash.
|
||||||
|
"",
|
||||||
|
// For example...
|
||||||
|
//"build.zig",
|
||||||
|
//"build.zig.zon",
|
||||||
|
//"src",
|
||||||
|
//"LICENSE",
|
||||||
|
//"README.md",
|
||||||
|
},
|
||||||
|
}
|
12
zigUDSClient/src/main.zig
Normal file
12
zigUDSClient/src/main.zig
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
const std = @import("std");
|
||||||
|
const net = std.net;
|
||||||
|
|
||||||
|
pub fn main() !void {
|
||||||
|
if (net.connectUnixSocket("/tmp/udsserver.sock")) |stream| {
|
||||||
|
defer stream.close();
|
||||||
|
const msg = "Hello from Zig ⚡" ;
|
||||||
|
try stream.writeAll(msg);
|
||||||
|
} else |err| {
|
||||||
|
std.debug.print("Error connecting to socket: {}", .{err});
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue