Skip to content
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

Jump to bottom

Fix compilation #2011

Merged
merged 1 commit into from
Jun 15, 2023
Merged

Fix compilation #2011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/include/ndpi_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,8 +1675,8 @@ struct ndpi_flow_struct {
_Static_assert(sizeof(((struct ndpi_flow_struct *)0)->protos) <= 210,
"Size of the struct member protocols increased to more than 210 bytes, "
"please check if this change is necessary.");
_Static_assert(sizeof(struct ndpi_flow_struct) <= 944,
"Size of the flow struct increased to more than 944 bytes, "
_Static_assert(sizeof(struct ndpi_flow_struct) <= 952,
"Size of the flow struct increased to more than 952 bytes, "
"please check if this change is necessary.");
#endif
#endif
Expand Down
8 changes: 3 additions & 5 deletions src/lib/ndpi_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6160,11 +6160,9 @@ static void ndpi_reconcile_protocols(struct ndpi_detection_module_struct *ndpi_s
}

if(ret->app_protocol == NDPI_PROTOCOL_SKYPE_TEAMS_CALL) {
struct ndpi_packet_struct *packet = &ndpi_str->packet;

if((packet != NULL) && (packet->udp != NULL)) {
u_int16_t sport = ntohs(packet->udp->source);
u_int16_t dport = ntohs(packet->udp->dest);
if(flow->l4_proto == IPPROTO_UDP) {
u_int16_t sport = ntohs(flow->c_port);
u_int16_t dport = ntohs(flow->s_port);

/*
https://extremeportal.force.com/ExtrArticleDetail?an=000101782
Expand Down