vrouter sets the port incorrectly for fat flow

[Vedamurthy Joshi]

R2.20 111 Ubuntu 14.04 Juno multinode

User had set fat flow for this port on protocol tcp, port 22

But in vrouter, the port is seen as 1 instead of 22

vif0/4 OS: tapf0773247-b9
            Type:Virtual HWaddr:00:00:5e:00:01:00 IPaddr:0
            Vrf:2 Flags:PL3L2D MTU:9160 Ref:6
            RX packets:2447 bytes:254756 errors:0
            TX packets:2492 bytes:260538 errors:0
            FatFlows: 6:1

[Anand H. Krishnan (anandhk)]

Reviewed: https://review.opencontrail.org/15521
Committed: http://github.org/Juniper/contrail-vrouter/commit/a67adbda1ab6329828657f6fa457b3fdce276d37
Submitter: Zuul
Branch: R2.20

commit a67adbda1ab6329828657f6fa457b3fdce276d37
Author: Anand H. Krishnan <email address hidden>
Date: Tue Dec 1 16:40:10 2015 +0530

FatFlow: wrong port calculation

The macro to extract port from proto_port combination uses logical
and instead of binary and, resulting in wrong port calulcation.

Change-Id: Icc4c7e6038a6e15ad21f17fa03bb377b724372ac
Partial-BUG: 1518234

[Anand H. Krishnan (anandhk)]

Master

https://github.com/Juniper/contrail-vrouter/commit/2b59f288c324c2ed132604bb5e21ad0afe45b4d3