← Back to branch summary

~ssalley/ubuntu/maverick/likewise-open/likewise-open.fix627272

« back to all changes in this revision

Viewing changes to lwmsg/src/peer-task.c

  • Committer: Bazaar Package Importer
  • Author(s): Gerald Carter, Michael Casadevall, Gerald Carter
  • Date: 2010-03-13 07:42:44 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100313074244-j1gy0zo19cc32xhl
Tags: 5.4.0.42111-1
https://launchpad.net/bugs/517300
https://launchpad.net/bugs/538616
[ Michael Casadevall ]
* LP: #517300
  - added debian/patches/disable_parallel_builds.diff to allow successful builds
    on non-x86 architectures caused by improperly parsing /proc/cpuinfo to
    determine the number of CPUs and set make -jX.
  - added debian/patches/correct_lwio_configure_detection.diff to correct configure
    tests for properly checking proc filesystems on non-x86 linux platforms
  - added ${misc:Depends} to Depends lines to satisfy lintian
  - Added debian/README.source to satisfy lintian 
  - Bumped standards version to 3.8.3

[ Gerald Carter ]
* New upstream release. (LP: #538616)
* likewise-open.install: Include uninstalled binaries and ncalrpc
    servers required for domainjoin-cli {join,leave}
* patches/version-in-share.diff:
  - Corrected location of VERSION file in lsassd

Show diffs side-by-side

added added

removed removed

Lines of Context:
lwmsg/src/peer-task.c
746
746
    *next_timeout = *timeout;
747
747
    *next_trigger = lwmsg_peer_task_assoc_trigger(task->assoc);
748
748
 
749
 
    if (lwmsg_peer_task_subject_to_timeout(peer, task, trigger))
 
749
    if (lwmsg_time_is_positive(timeout) &&
 
750
        lwmsg_peer_task_subject_to_timeout(peer, task, trigger))
750
751
    {
751
752
        *next_trigger |= LWMSG_TASK_TRIGGER_TIME;
752
753
    }
1031
1032
    LWMsgRing* next = NULL;
1032
1033
    PeerCall* call = NULL;
1033
1034
    LWMsgMessage cancel = LWMSG_MESSAGE_INITIALIZER;
 
1035
    LWMsgMessage message = LWMSG_MESSAGE_INITIALIZER;
1034
1036
 
1035
1037
    pthread_mutex_lock(&task->call_lock);
1036
1038
 
1041
1043
 
1042
1044
        if (!call->is_outgoing && call->state & PEER_CALL_COMPLETED)
1043
1045
        {
 
1046
            message.tag = call->params.incoming.out.tag;
 
1047
            message.data = call->params.incoming.out.data;
 
1048
            lwmsg_assoc_destroy_message(task->assoc, &message);
1044
1049
            lwmsg_peer_call_delete(call);
1045
1050
        }
1046
1051
        else if (!(call->state & PEER_CALL_COMPLETED))
1474
1479
            }
1475
1480
        }
1476
1481
        /* Completed incoming call -- send reply */
1477
 
        else if (call->state & PEER_CALL_COMPLETED)
 
1482
        else if (call->state & PEER_CALL_COMPLETED &&
 
1483
                 call->state & PEER_CALL_DISPATCHED)
1478
1484
        {
1479
1485
            lwmsg_message_init(&task->outgoing_message);
1480
1486
            task->outgoing_message.flags = LWMSG_MESSAGE_FLAG_REPLY;