Changeset 279:844eb81f5228 in verona

Timestamp:

Aug 31, 2011 4:48:32 PM (22 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

Fix handling of mobility flags

Location:

phapi

Files:

• phapi.c (modified) (2 diffs)
• phapi.h (modified) (1 diff)

phapi/phapi.c

@@ -1349 +1349 @@
         assert(vl != NULL);
 
-        if (vl->mobility == PH_LINE_MOBILITY_PHONE)
+        if (checkmobility(vl->mobility,PH_LINE_MOBILITY_PHONE))
                 uphone=";user=phone";
 
@@ -3336 +3336 @@
         }
 
-        if (mobility == PH_LINE_MOBILITY_FIXED)
+        if (checkmobility(mobility,PH_LINE_MOBILITY_FIXED))
                 add_contact_param(vl, "mobility", "fixed", FALSE);
-        else if (mobility == PH_LINE_MOBILITY_MOBILE)
+        else if (checkmobility(mobility, PH_LINE_MOBILITY_MOBILE))
                 add_contact_param(vl, "mobility", "mobile", FALSE);
-        else if (mobility == PH_LINE_MOBILITY_PHONE)
+        else if (checkmobility(mobility,PH_LINE_MOBILITY_PHONE))
                 add_contact_param(vl, "user", "phone", TRUE);
 

phapi/phapi.h

@@ -196 +196 @@
   PH_LINE_MOBILITY_FIXED,
   PH_LINE_MOBILITY_MOBILE,
-  PH_LINE_MOBILITY_PHONE
-};
-
+  PH_LINE_MOBILITY_PHONE,
+  PH_LINE_MOBILITY_MASK = 255
+};
+#define checkmobility(m, v) ((((m) & PH_LINE_MOBILITY_MASK) == (v)))
 
 #ifndef SWIG