Rev 2637 | Rev 2660 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2637 | Rev 2638 | ||
|---|---|---|---|
| Line 182... | Line 182... | ||
| 182 | /* The connection was not accepted */ |
182 | /* The connection was not accepted */ |
| 183 | phone_dealloc(phoneid); |
183 | phone_dealloc(phoneid); |
| 184 | } else { |
184 | } else { |
| 185 | /* The connection was accepted */ |
185 | /* The connection was accepted */ |
| 186 | phone_connect(phoneid, &answer->sender->answerbox); |
186 | phone_connect(phoneid, &answer->sender->answerbox); |
| 187 | /* Set 'phone hash' as arg3 of response */ |
187 | /* Set 'phone hash' as arg5 of response */ |
| 188 | IPC_SET_ARG5(answer->data, |
188 | IPC_SET_ARG5(answer->data, |
| 189 | (unative_t) &TASK->phones[phoneid]); |
189 | (unative_t) &TASK->phones[phoneid]); |
| 190 | } |
190 | } |
| 191 | } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) { |
191 | } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) { |
| 192 | /* If the users accepted call, connect */ |
192 | /* If the users accepted call, connect */ |
| Line 267... | Line 267... | ||
| 267 | switch (IPC_GET_METHOD(call->data)) { |
267 | switch (IPC_GET_METHOD(call->data)) { |
| 268 | case IPC_M_CONNECT_ME_TO: |
268 | case IPC_M_CONNECT_ME_TO: |
| 269 | newphid = phone_alloc(); |
269 | newphid = phone_alloc(); |
| 270 | if (newphid < 0) |
270 | if (newphid < 0) |
| 271 | return ELIMIT; |
271 | return ELIMIT; |
| 272 | /* Set arg3 for server */ |
272 | /* Set arg5 for server */ |
| 273 | IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]); |
273 | IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]); |
| 274 | call->flags |= IPC_CALL_CONN_ME_TO; |
274 | call->flags |= IPC_CALL_CONN_ME_TO; |
| 275 | call->priv = newphid; |
275 | call->priv = newphid; |
| 276 | break; |
276 | break; |
| 277 | case IPC_M_AS_AREA_SEND: |
277 | case IPC_M_AS_AREA_SEND: |