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_fa.h
+11 -11
View File
@@ -105,7 +105,7 @@ struct isobusfs_fa_openf_req {
uint8_t flags;
__le16 name_len;
uint8_t name[];
};
} __attribute__((__packed__));
/**
* C.3.3.3 Open File Response
@@ -141,7 +141,7 @@ struct isobusfs_fa_openf_res {
uint8_t handle;
uint8_t attributes;
uint8_t reserved[3];
};
} __attribute__((__packed__));
/* B.17 Position mode */
/* From the beginning of the file */
@@ -168,7 +168,7 @@ struct isobusfs_fa_seekf_req {
uint8_t handle;
uint8_t position_mode;
__le32 offset;
};
} __attribute__((__packed__));
/**
* C.3.4.2 Seek File Response
@@ -195,7 +195,7 @@ struct isobusfs_fa_seekf_res {
uint8_t error_code;
uint8_t reserved;
__le32 position;
};
} __attribute__((__packed__));
/**
* C.3.5.2 Read File Request
@@ -220,7 +220,7 @@ struct isobusfs_fa_readf_req {
uint8_t handle;
__le16 count;
uint8_t reserved[3];
};
} __attribute__((__packed__));
/**
* C.3.5.3 Read File Response (Handle-referenced file)
@@ -250,7 +250,7 @@ struct isobusfs_read_file_response {
uint8_t error_code;
__le16 count;
uint8_t data[];
};
} __attribute__((__packed__));
/**
* C.3.5.4 Read Directory Response (Handle-referenced directory)
@@ -280,7 +280,7 @@ struct isobusfs_read_dir_response {
uint8_t error_code;
__le16 count;
uint8_t data[];
};
} __attribute__((__packed__));
/**
* C.3.6.2 Write File Request
@@ -303,7 +303,7 @@ struct isobusfs_write_file_request {
uint8_t handle;
__le16 count;
uint8_t data[];
};
} __attribute__((__packed__));
/**
* C.3.6.3 Write File Response
@@ -333,7 +333,7 @@ struct isobusfs_write_file_response {
uint8_t error_code;
__le16 count;
uint8_t reserved[3];
};
} __attribute__((__packed__));
/**
* C.3.7.1 Close File Request
@@ -354,7 +354,7 @@ struct isobusfs_close_file_request {
uint8_t tan;
uint8_t handle;
uint8_t reserved[5];
};
} __attribute__((__packed__));
/**
* C.3.7.2 Close File Response
@@ -378,7 +378,7 @@ struct isobusfs_close_file_res {
uint8_t tan;
uint8_t error_code;
uint8_t reserved[6];
};
} __attribute__((__packed__));
#endif /* _LINUX_ISOBUS_FS_H */