Skip to content

Fix: 2625 - start connection IDs at 1 (not zero) #2626

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

Merged
mwinkel-dev merged 4 commits into from
Sep 27, 2023
Merged

Fix: 2625 - start connection IDs at 1 (not zero) #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
865100f
Proposed fix for Issue 2625
Sep 25, 2023
d78bcde
Proposed change (part 2) for Issue 2625
mwinkel-dev Sep 26, 2023
9502a89
Edit a comment for Issue 2625
mwinkel-dev Sep 26, 2023
2ee237b
Fix: 2625 - Restore do loop for integrity check
Sep 27, 2023
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
3 changes: 2 additions & 1 deletion idl/mdsconnect.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ endcase
end

function sockmin
if !version.os eq 'linux' then return, 0 else return, 11-(!version.os eq 'MacOS')
; Connection IDs start at 1 (see Issue #2625 for details).
if !version.os eq 'linux' then return, 1 else return, 11-(!version.os eq 'MacOS')
end

function mds$socket,quiet=quiet,status=status,socket=socket
Expand Down
8 changes: 6 additions & 2 deletions mdstcpip/mdsipshr/Connections.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,13 +465,17 @@ static inline int authorize_client(Connection *c, char *username)
int AddConnection(Connection *c)
{
MDSIPTHREADSTATIC_INIT;

// Connection IDs are issued in sequence.
// Issue #2625 requires connection IDs starting at 1 to avoid IDL issues.
// Use of _FindConnection() is an integrity check of the data structures.
static int id = INVALID_CONNECTION_ID;
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_lock(&lock);
do
{
id++; // find next free id
} while (id == INVALID_CONNECTION_ID && _FindConnection(id, NULL, MDSIPTHREADSTATIC_VAR));
id++;
} while ((id == INVALID_CONNECTION_ID) || (id == 0) || _FindConnection(id, NULL, MDSIPTHREADSTATIC_VAR));
c->id = id;
pthread_mutex_unlock(&lock);
c->state |= CON_INLIST;
Expand Down