[Users] nat flag and branch routes

[Juha Heinanen]

Bogdan-Andrei Iancu writes:

 >     - you have flag set X in branch array and a flag set Y in the 
 > request - when the branch is built in TM, the per-branch flag set should 
 > be X|Y, right?

when ul creates adds the branches for the contacts, it would mark in
struct branch of each contact if that branch is behind nat or not.  when
nat flag is then tested in branch route, it would be that branch
specific nat flag.  so only the nat flag would be overridden.

if you want to store all flags per branch, then things get more
complicated, since i guess we would need to mark in branch struct also
which flags have been set per branch, because only those should be
overridden for each branch route.

-- juha