Skip to content

Gm fix mdsip ast #2462

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
GabrieleManduchi merged 4 commits into from
May 25, 2022
Merged

Gm fix mdsip ast #2462

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
9af196e
Fix:Wrong shell files
Jun 25, 2020
43afd38
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
Jun 15, 2021
783ba24
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
May 17, 2022
ac56966
Fix:mdsip event ast
May 17, 2022
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: 3 additions & 2 deletions mdstcpip/mdsip_connections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ typedef struct
char data[12];
char eventid;
} JMdsEventInfo;

struct _connection;
typedef struct _eventlist
{
int conid;
//int conid;
struct _connection *connection;
int eventid;
char jeventid;
MdsEventInfo *info;
Expand Down
6 changes: 3 additions & 3 deletions mdstcpip/mdsipshr/ProcessMessage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,12 @@ static inline void _client_event_ast(MdsEventList *e, int data_len, char *data,
(*m)->h.dtype = DTYPE_EVENT_NOTIFY;
if (data_len > 0)
memcpy(e->info->data, data, (data_len < 12) ? data_len : 12);
SendMdsMsg(e->conid, *m, MSG_DONTWAIT);
SendMdsMsgC(e->connection, *m, MSG_DONTWAIT);
}

static void client_event_ast(MdsEventList *e, int data_len, char *data)
{
const client_t client_type = GetConnectionClientType(e->conid);
const client_t client_type = e->connection->client_type;
// Check Connection: if down, cancel the event and return
if (client_type == INVALID_CLIENT)
{
Expand Down Expand Up @@ -723,7 +723,7 @@ static int execute_message(Connection *connection, Message *message)
DESCRIPTOR_LONG(eventiddsc, &eventid);
MdsEventList *newe = (MdsEventList *)malloc(sizeof(MdsEventList));
struct descriptor_a *info = (struct descriptor_a *)connection->descrip[2];
newe->conid = connection->id;
newe->connection = connection;

evname = malloc(connection->descrip[1]->length + 1);
memcpy(evname, connection->descrip[1]->pointer,
Expand Down