Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add .clang-format #120

Merged
merged 2 commits into from
Apr 6, 2025
+114 −101
Merged

feat: add .clang-format #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f70bb
chore: apply .clang-format to existing code
saurabhraghuvanshii Apr 5, 2025
47af467
feat: add .clang-format for code format check
saurabhraghuvanshii Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
Language: Cpp
BasedOnStyle: LLVM
AlignArrayOfStructures: Left
ColumnLimit: 100
32 changes: 32 additions & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,38 @@ permissions:
contents: read

jobs:
clang-format-check:
name: Clang Format Check
runs-on: macos-15
timeout-minutes: 10
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 1

- name: Install Clang Format
run: |
brew update
brew install clang-format
clang-format --version

- name: Run Clang Format Check
run: |
# Format all source - if the source is formatted properly this will do nothing
clang-format -i *.c *.h client/*.c

# Do we have unwanted changes?
if ! git diff-index --quiet HEAD; then
# Show the changes
echo "ERROR: Code is not properly formatted."
echo
git --no-pager diff

echo
echo "Please run clang-format locally and commit the changes."
exit 1
fi

build:
name: Build
strategy:
Expand Down
38 changes: 17 additions & 21 deletions cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ static void print_usage(const char *argv0) {
printf("\n");
printf("--socket-group=GROUP socket group name (default: "
"\"" CLI_DEFAULT_SOCKET_GROUP "\")\n");
printf(
"--vmnet-mode=(host|shared|bridged) vmnet mode (default: \"shared\")\n");
printf("--vmnet-mode=(host|shared|bridged) vmnet mode (default: \"shared\")\n");
printf("--vmnet-interface=INTERFACE interface used for "
"--vmnet=bridged, e.g., \"en0\"\n");
printf("--vmnet-gateway=IP gateway used for "
Expand Down Expand Up @@ -83,18 +82,18 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
}

const struct option longopts[] = {
{"socket-group", required_argument, NULL, CLI_OPT_SOCKET_GROUP},
{"vmnet-mode", required_argument, NULL, CLI_OPT_VMNET_MODE},
{"vmnet-interface", required_argument, NULL, CLI_OPT_VMNET_INTERFACE},
{"vmnet-gateway", required_argument, NULL, CLI_OPT_VMNET_GATEWAY},
{"vmnet-dhcp-end", required_argument, NULL, CLI_OPT_VMNET_DHCP_END},
{"vmnet-mask", required_argument, NULL, CLI_OPT_VMNET_MASK},
{"vmnet-interface-id", required_argument, NULL, CLI_OPT_VMNET_INTERFACE_ID},
{"vmnet-nat66-prefix", required_argument, NULL, CLI_OPT_VMNET_NAT66_PREFIX},
{"pidfile", required_argument, NULL, 'p'},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'v'},
{0, 0, 0, 0},
{"socket-group", required_argument, NULL, CLI_OPT_SOCKET_GROUP },
{"vmnet-mode", required_argument, NULL, CLI_OPT_VMNET_MODE },
{"vmnet-interface", required_argument, NULL, CLI_OPT_VMNET_INTERFACE },
{"vmnet-gateway", required_argument, NULL, CLI_OPT_VMNET_GATEWAY },
{"vmnet-dhcp-end", required_argument, NULL, CLI_OPT_VMNET_DHCP_END },
{"vmnet-mask", required_argument, NULL, CLI_OPT_VMNET_MASK },
{"vmnet-interface-id", required_argument, NULL, CLI_OPT_VMNET_INTERFACE_ID},
{"vmnet-nat66-prefix", required_argument, NULL, CLI_OPT_VMNET_NAT66_PREFIX},
{"pidfile", required_argument, NULL, 'p' },
{"help", no_argument, NULL, 'h' },
{"version", no_argument, NULL, 'v' },
{0, 0, 0, 0 },
};
int opt = 0;
while ((opt = getopt_long(argc, argv, "hvp:", longopts, NULL)) != -1) {
Expand Down Expand Up @@ -158,8 +157,7 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {

/* fill default */
if (res->socket_group == NULL)
res->socket_group =
strdup(CLI_DEFAULT_SOCKET_GROUP); /* use strdup to make it freeable */
res->socket_group = strdup(CLI_DEFAULT_SOCKET_GROUP); /* use strdup to make it freeable */
if (res->vmnet_mode == 0)
res->vmnet_mode = VMNET_SHARED_MODE;
if (res->vmnet_gateway != NULL && res->vmnet_dhcp_end == NULL) {
Expand All @@ -182,8 +180,7 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
res->vmnet_dhcp_end = strdup(end_static);
}
if (res->vmnet_gateway != NULL && res->vmnet_mask == NULL)
res->vmnet_mask =
strdup("255.255.255.0"); /* use strdup to make it freeable */
res->vmnet_mask = strdup("255.255.255.0"); /* use strdup to make it freeable */
if (uuid_is_null(res->vmnet_interface_id)) {
uuid_generate_random(res->vmnet_interface_id);
}
Expand All @@ -196,7 +193,7 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
if (res->vmnet_gateway == NULL) {
if (res->vmnet_mode != VMNET_BRIDGED_MODE) {
WARN("--vmnet-gateway=IP should be explicitly specified to "
"avoid conflicting with other applications");
"avoid conflicting with other applications");
}
if (res->vmnet_dhcp_end != NULL) {
ERROR("--vmnet-dhcp-end=IP requires --vmnet-gateway=IP");
Expand All @@ -213,8 +210,7 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
}
struct in_addr dummy;
if (!inet_aton(res->vmnet_gateway, &dummy)) {
ERRORF("invalid address \"%s\" was specified for --vmnet-gateway",
res->vmnet_gateway);
ERRORF("invalid address \"%s\" was specified for --vmnet-gateway", res->vmnet_gateway);
goto error;
}
}
Expand Down
6 changes: 2 additions & 4 deletions client/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ int main(int argc, char *argv[]) {
}
strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
if (connect(socket_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
fprintf(stderr, "Failed to connect to \"%s\": %s\n", socket_path,
strerror(errno));
fprintf(stderr, "Failed to connect to \"%s\": %s\n", socket_path, strerror(errno));
exit(EXIT_FAILURE);
}
char **child_argv = argv + 2;
Expand All @@ -38,8 +37,7 @@ int main(int argc, char *argv[]) {
for (int i = 0; child_argv[i] != NULL; i++)
fprintf(stderr, "child_argv[%d]: \"%s\"\n", i, child_argv[i]);
if (execvp(child_argv[0], child_argv) < 0) {
fprintf(stderr, "Failed to exec \"%s\": %s\n", child_argv[0],
strerror(errno));
fprintf(stderr, "Failed to exec \"%s\": %s\n", child_argv[0], strerror(errno));
exit(EXIT_FAILURE);
}
return 0;
Expand Down
20 changes: 10 additions & 10 deletions log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

extern bool debug;

#define DEBUGF(fmt, ...) \
do { \
if (debug) \
fprintf(stderr, "DEBUG| " fmt "\n", __VA_ARGS__); \
#define DEBUGF(fmt, ...) \
do { \
if (debug) \
fprintf(stderr, "DEBUG| " fmt "\n", __VA_ARGS__); \
} while (0)

#define INFOF(fmt, ...) fprintf(stderr, "INFO | " fmt "\n", __VA_ARGS__)
#define ERROR(msg) fprintf(stderr, "ERROR| " msg "\n")
#define ERRORF(fmt, ...) fprintf(stderr, "ERROR| " fmt "\n", __VA_ARGS__)
#define ERRORN(name) ERRORF(name ": %s", strerror(errno))
#define WARN(msg) fprintf(stderr, "WARN | " msg "\n")
#define WARNF(fmt, ...) fprintf(stderr, "WARN | " fmt "\n", __VA_ARGS__)
#define INFOF(fmt, ...) fprintf(stderr, "INFO | " fmt "\n", __VA_ARGS__)
#define ERROR(msg) fprintf(stderr, "ERROR| " msg "\n")
#define ERRORF(fmt, ...) fprintf(stderr, "ERROR| " fmt "\n", __VA_ARGS__)
#define ERRORN(name) ERRORF(name ": %s", strerror(errno))
#define WARN(msg) fprintf(stderr, "WARN | " msg "\n")
#define WARNF(fmt, ...) fprintf(stderr, "WARN | " fmt "\n", __VA_ARGS__)

#endif /* SOCKET_VMNET_LOG_H */
Loading