search

HSAnet / glimpse_client

GLIMPSE is an end host-based network measurement tool.
http://www.measure-it.net
Other
6 stars 6 forks source link

New Measurement: Extended UPnP #307

Closed s1st closed 9 years ago

s1st commented 9 years ago

Added new measurement extUPnP for a better and more diversivied analysis of UPNP and others.

monstermunchkin commented 9 years ago

Please remove the code-comments you added in ae828d8 – they are unnecessary. You also need to resolve the merge conflict by rebasing onto HSAnet/develop.

MKV21 commented 9 years ago

As far as I can see your code should work, so please merge this code with the existing UPnP measurement code. Add a parameter for the UPnP definition so we can specify what we want to measure (Media Server, Internet Gateway, All, ....), evaluate those in the measurement, and act accordingly. Make sure only fields with data are in the result.

monstermunchkin commented 9 years ago

This PR will not be merged unless you resolve the merge conflict. Just rebase onto HSAnet/develop via

git fetch <remote> develop
git rebase <remote>/develop

# ... resolve conflict(s) ...

git add <conflicted-file(s)>
git rebase --continue

git push --force origin develop

Note: Replace <remote> with the upstream remote, e.g. HSAnet or upstream.