SVN_SILENT made messages (.desktop file) - always resolve ours
AbandonedPublic

Authored by ahiemstra on Oct 2 2019, 9:51 AM.

Details

Reviewers
None
Summary

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

networkhelper: Properly lock access to Accumulator::m_data

Since there are different threads accessing it.

Fixes OpenSuse Bug 1152634

networkhelper: Close the pcap instance when stop() is called

This prevents leaking of the pcap instance should start() ever be called
again after stop().

This fixes most of OpenSuse Bug 1152638

networkhelper: Limit maximum size of incoming packet queue

Should there be so much traffic that the rest of the code cannot keep
up, there now should be no risk that memory usage will keep growing.

Fixes OpenSuse Bug 1152639

networkhelper: Remove unused m_active member

It was a leftover from when we manually did the loop.

Fixes OpenSuse Bug 1152641

networkhelper: Ensure readlinkat results in a null terminated string

Apparently, readlinkat() will not ensure the result is null terminated,
so decrease write size by one so the terminating null does not get
overwritten.

Fixes OpenSuse Bug 1152642

networkhelper: Check for data length before trying to access packet parts

This ensures we actually have packet data with the required length
instead of just assuming it does.

Fixes OpenSuse Bug 1152644

networkhelper: Do not call pcap_freecode when compilation failed

Since the structure will be empty in that case.

Fixes OpenSuse Bug 1152646

networkhelper: Properly convert IPv6 u8 array to u32

And-ing the parts would result in empty bytes and implcit conversion
might fail.

Fixes Comment 3 of OpenSuse Bug 1151190

Diff Detail

Repository
R106 KSysguard
Branch
secteam_fixes
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 17235
Build 17253: arc lint + arc unit
ahiemstra created this revision.Oct 2 2019, 9:51 AM
Restricted Application added a project: Plasma. · View Herald TranscriptOct 2 2019, 9:51 AM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
ahiemstra requested review of this revision.Oct 2 2019, 9:51 AM
ahiemstra abandoned this revision.Oct 2 2019, 9:52 AM