Skip to content

Commit

Permalink
Merge pull request #46 from marckleinebudde/fix-codingstye
Browse files Browse the repository at this point in the history
Fix codingstye
  • Loading branch information
marckleinebudde authored Dec 6, 2024
2 parents d27da24 + 906162b commit add4d32
Show file tree
Hide file tree
Showing 12 changed files with 1,259 additions and 499 deletions.
764 changes: 764 additions & 0 deletions .clang-format

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions beacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
#include "socketcand.h"
#include "beacon.h"

void *beacon_loop(void *ptr) {
void *beacon_loop(void *ptr)
{
int i, n, chars_left, ret;
int udp_socket;
int optval;
Expand All @@ -29,44 +30,44 @@ void *beacon_loop(void *ptr) {
/* Activate broadcast option */
optval = 1;
ret = setsockopt(udp_socket, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(int));
if(ret) {
if (ret) {
PRINT_ERROR("Could not activate SO_BROADCAST\n");
}

/* Connect the socket */
if(connect(udp_socket, (struct sockaddr *) &broadcast_addr, sizeof(broadcast_addr)) < 0) {
if (connect(udp_socket, (struct sockaddr *)&broadcast_addr, sizeof(broadcast_addr)) < 0) {
PRINT_ERROR("Failed to connect broadcast socket");
return NULL;
}

while(1) {
while (1) {
/* Build the beacon */
gethostname((char *) &hostname, (size_t) 32);
gethostname((char *)&hostname, (size_t)32);
snprintf(buffer, BEACON_LENGTH, "<CANBeacon name=\"%s\" type=\"%s\" description=\"%s\">\n<URL>can://%s:%d</URL>",
hostname, BEACON_TYPE, description, inet_ntoa( saddr.sin_addr ), port);
hostname, BEACON_TYPE, description, inet_ntoa(saddr.sin_addr), port);

for(i=0;i<interface_count;i++) {
for (i = 0; i < interface_count; i++) {
/* Find \0 in beacon buffer */
for(n=0;;n++) {
if(buffer[n] == '\0')
for (n = 0;; n++) {
if (buffer[n] == '\0')
break;
}
chars_left = BEACON_LENGTH - n;

snprintf(buffer+(n*sizeof(char)), chars_left, "<Bus name=\"%s\"/>", interface_names[i]);
snprintf(buffer + (n * sizeof(char)), chars_left, "<Bus name=\"%s\"/>", interface_names[i]);
}

/* Find \0 in beacon buffer */
for(n=0;;n++) {
if(buffer[n] == '\0')
for (n = 0;; n++) {
if (buffer[n] == '\0')
break;
}
chars_left = BEACON_LENGTH - n;

snprintf(buffer+(n*sizeof(char)), chars_left, "</CANBeacon>");
snprintf(buffer + (n * sizeof(char)), chars_left, "</CANBeacon>");

ret = send(udp_socket, buffer, strlen(buffer), 0);
if(ret == -1) {
if (ret == -1) {
PRINT_ERROR("Error in beacon send()\n");
}
sleep(3);
Expand Down
33 changes: 16 additions & 17 deletions canctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@ int canctl_set_bittiming(const char *bus_name, const char *buff_bittiming_conf,
{
int bitrate, sample_point, tq, prop_seg, phase_seg1, phase_seg2, sjw, brp, items;

items = sscanf(buff_bittiming_conf, "< %*s B %d %d %d %d %d %d %d %d >",
&bitrate,
&sample_point,
&tq,
&prop_seg,
&phase_seg1,
&phase_seg2,
&sjw,
&brp
);

if (items != 8) {
items = sscanf(buff_bittiming_conf, "< %*s B %d %d %d %d %d %d %d %d >",
&bitrate,
&sample_point,
&tq,
&prop_seg,
&phase_seg1,
&phase_seg2,
&sjw,
&brp);

if (items != 8) {
return -1;
}

Expand Down Expand Up @@ -50,7 +49,7 @@ int canctl_set_bittiming(const char *bus_name, const char *buff_bittiming_conf,
if (phase_seg2 >= 0) {
bt.phase_seg2 = phase_seg2;
}

if (sjw >= 0) {
bt.sjw = sjw;
}
Expand All @@ -66,8 +65,8 @@ int canctl_set_control_modes(const char *bus_name, const char *buff_control_mode
{
int listen_only, loopback, three_samples, items;

items = sscanf(buff_control_modes_conf, "< %*s C %d %d %d >",
&listen_only, &loopback, &three_samples);
items = sscanf(buff_control_modes_conf, "< %*s C %d %d %d >",
&listen_only, &loopback, &three_samples);

if (items != 3) {
return -1;
Expand All @@ -83,6 +82,6 @@ int canctl_set_control_modes(const char *bus_name, const char *buff_control_mode
cm.flags |= CAN_CTRLMODE_LOOPBACK;
if (three_samples)
cm.flags |= CAN_CTRLMODE_3_SAMPLES;

return !(can_do_stop(bus_name) || can_set_ctrlmode(bus_name, &cm)) ? 0 : -1;
}
}
Loading

0 comments on commit add4d32

Please sign in to comment.