sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-11-04 15:31:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

isobusfs: pack the protocol structures

Browse Source 
The isobusfs protocol structures describe the message layout defined in
ISO 11783-13 but were not packed. The compiler added padding bytes in
front of 16/32 bit values which follow an odd number of bytes, e.g. the
Read File Request (8 bytes according to C.3.5.2) had a size of 10 bytes
and the count value at the wrong position. Server and client of the
can-utils used the same structures and understood each other but the
messages were not compatible to other ISOBUS devices. Additionally the
padding bytes sent uninitialized content.

Add __attribute__((__packed__)) to all protocol structures as it is
already done in j1939_vehicle_position.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
This commit is contained in:
Oliver Hartkopp
2026-10-14 10:21:56 +00:00
parent 8222f517b7
commit aa54819b65
5 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
isobusfs/isobusfs_cmn_fh.h
+10 -10
View File
@@ -32,7 +32,7 @@ struct isobusfs_move_file_request {
/* Variable length data follows */
/* uint8_t src_path[]; */
/* uint8_t dst_path[]; */
};
} __attribute__((__packed__));
/**
* C.4.2.3 Move File Response
@@ -64,7 +64,7 @@ struct isobusfs_move_file_response {
uint8_t tan;
uint8_t error_code;
uint8_t reserved[5];
};
} __attribute__((__packed__));
/**
* C.4.3.1 Delete File Request
@@ -87,7 +87,7 @@ struct isobusfs_delete_file_request {
uint8_t mode;
__le16 path_len;
uint8_t path[];
};
} __attribute__((__packed__));
/**
@@ -118,7 +118,7 @@ struct isobusfs_delete_file_response {
uint8_t tan;
uint8_t error_code;
uint8_t reserved[5];
};
} __attribute__((__packed__));
/**
* C.4.4.2 Get File Attributes Request
@@ -139,7 +139,7 @@ struct isobusfs_get_file_attributes_request {
uint8_t tan;
__le16 pathname_len;
uint8_t pathname[];
};
} __attribute__((__packed__));
/**
* C.4.4.3 Get File Attributes Response
@@ -171,7 +171,7 @@ struct isobusfs_get_file_attributes_response {
uint8_t error_code;
uint8_t attributes;
__le32 file_size;
};
} __attribute__((__packed__));
/**
* C.4.5.2 Set File Attributes Request
@@ -194,7 +194,7 @@ struct isobusfs_set_file_attributes_request {
uint8_t attributes;
__le16 name_length;
uint8_t name[]; /* Variable length */
};
} __attribute__((__packed__));
/**
* C.4.5.3 Set File Attributes Response
@@ -225,7 +225,7 @@ struct isobusfs_set_file_attributes_response {
uint8_t tan;
uint8_t error_code;
uint8_t reserved[5];
};
} __attribute__((__packed__));
/**
* C.4.6.2 Get File Date & Time Request
@@ -246,7 +246,7 @@ struct isobusfs_get_file_date_time_request {
uint8_t tan;
__le16 name_length;
uint8_t name[]; /* Variable length */
};
} __attribute__((__packed__));
/**
* C.4.6.2 Get File Date & Time Response
@@ -278,6 +278,6 @@ struct isobusfs_get_file_date_time_response {
uint8_t error_code;
__le16 date;
__le16 time;
};
} __attribute__((__packed__));
#endif /* _LINUX_ISOBUS_FS_H */