Changeset 447:e8e3b471e274 in qutecom-2.2 for wifo/phapi/phapi-old.c

Timestamp:

Dec 3, 2009 3:48:32 PM (3 years ago)

Author:

laurent@…

Branch:

default

Message:

Show error codes in a more fashion way

File:

• wifo/phapi/phapi-old.c (modified) (4 diffs)

wifo/phapi/phapi-old.c

@@ -3498 +3498 @@
         info.localUri = je->local_uri;
         info.userData = je->external_reference;
-        if (je->status_code == 486)
-        {
+        switch(je->status_code) {
+
+        case 486:
                 info.event = phCALLBUSY;
                 info.u.remoteUri = je->remote_uri;
-
                 owplFireCallEvent(ca->cid, CALLSTATE_DISCONNECTED, CALLSTATE_DISCONNECTED_BUSY, ca->remote_uri, 0);
-        }
-        else
-        {
+                break;
+
+        case 404:
+                info.event = phCALLERROR;
+                info.u.remoteUri = je->remote_uri;
+                owplFireCallEvent(ca->cid, CALLSTATE_DISCONNECTED, CALLSTATE_DISCONNECTED_USER_NOT_FOUND, ca->remote_uri, 0);
+                break;
+
+        case 603:
+                info.event = phCALLERROR;
+                info.u.remoteUri = je->remote_uri;
+                owplFireCallEvent(ca->cid, CALLSTATE_DISCONNECTED, CALLSTATE_DISCONNECTED_REJECTED, ca->remote_uri, 0);
+                break;
+
+        case 480:
+                info.event = phCALLERROR;
+                info.u.remoteUri = je->remote_uri;
+                owplFireCallEvent(ca->cid, CALLSTATE_DISCONNECTED, CALLSTATE_DISCONNECTED_USER_NOT_AVAILABLE, ca->remote_uri, 0);
+                break;
+                
+        default:
                 info.event = phCALLERROR;
                 info.u.errorCode = je->status_code;
-
                 owplFireCallEvent(ca->cid, CALLSTATE_DISCONNECTED, CALLSTATE_DISCONNECTED_UNKNOWN, ca->remote_uri, 0);
-        }
+                break;
+
+        }
+
 
         if (phcb->callProgress) {
@@ -4381 +4401 @@
                 owplFireSubscriptionEvent(je->sid, OWPL_SUBSCRIPTION_ACTIVE, SUBSCRIPTION_CAUSE_NORMAL, je->remote_uri, 0);
         }
-        else if (je->type == EXOSIP_SUBSCRIPTION_REQUESTFAILURE)
-        {
-                if (je->status_code == 481) {
+        else if (je->type == EXOSIP_SUBSCRIPTION_REQUESTFAILURE || je->type == EXOSIP_SUBSCRIPTION_SERVERFAILURE)
+        {
+            if (je->status_code < 200 || je->status_code > 299) {
                     char proxyBuf[256];
                     int n = sizeof(proxyBuf);
@@ -4533 +4553 @@
 
                 case EXOSIP_SUBSCRIPTION_REQUESTFAILURE:
+                case EXOSIP_SUBSCRIPTION_SERVERFAILURE:
                 case EXOSIP_SUBSCRIPTION_ANSWERED:
                         ph_subscription_progress(je);
@@ -4765 +4786 @@
 
                                 case EXOSIP_SUBSCRIPTION_REQUESTFAILURE:
+                                case EXOSIP_SUBSCRIPTION_SERVERFAILURE:
                                 case EXOSIP_SUBSCRIPTION_ANSWERED:
                                         ph_subscription_progress(je);