Author: kgiusti
Date: Tue Nov 13 18:51:29 2012
New Revision: 1408886
URL: http://svn.apache.org/viewvc?rev=1408886&view=rev
Log:
PROTON-74: integrate new names
Modified:
qpid/proton/trunk/proton-c/examples/mailbox/fetch
qpid/proton/trunk/proton-c/examples/mailbox/post
qpid/proton/trunk/proton-c/examples/mailbox/server
Modified: qpid/proton/trunk/proton-c/examples/mailbox/fetch
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/examples/mailbox/fetch?rev=1408886&r1=1408885&r2=1408886&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/examples/mailbox/fetch (original)
+++ qpid/proton/trunk/proton-c/examples/mailbox/fetch Tue Nov 13 18:51:29 2012
@@ -110,7 +110,8 @@ class FetchClient(object):
self.log("Fetching from mailbox = %s" % self.mailbox)
self.ssn = pn_session(self.conn)
self.link = pn_receiver(self.ssn, "receiver")
- pn_set_source(self.link, self.mailbox)
+ src = pn_link_source(self.link)
+ pn_terminus_set_address(src, self.mailbox)
# now open all the engine endpoints
pn_connection_open(self.conn)
@@ -161,11 +162,11 @@ class FetchClient(object):
"""
# locally settle any remotely settled deliveries
d = pn_unsettled_head(self.link)
- while d and not pn_readable(d): # can stop when we hit first
+ while d and not pn_delivery_readable(d): # can stop when we hit
first
# delivery that has not yet been read
_next = pn_unsettled_next(d)
- if pn_remote_settled(d): # remote has seen our ack (or doesn't
care)
- pn_settle(d) # now free it
+ if pn_delivery_settled(d): # remote has seen our ack (or doesn't
care)
+ pn_delivery_settle(d) # now free it
d = _next
@@ -222,40 +223,40 @@ def main():
return -1;
# check if the server recognizes the mailbox, fail if it does not
- if pn_remote_source(receiver.link) != options.mailbox:
+ if pn_link_remote_source(receiver.link) != options.mailbox:
print("Error: mailbox %s does not exist!" % options.mailbox)
return -2
# Allow the server to send "count" messages to the receiver by setting
# the credit to the expected count
- pn_flow(receiver.link, options.count)
+ pn_link_flow(receiver.link, options.count)
# main loop: continue fetching messages until 'count' messages have been
# retrieved
- while pn_credit(receiver.link) > 0 and not receiver.closed(): # while
all msgs have not arrived
- if pn_queued(receiver.link) == 0: # wait for some to arrive
+ while pn_link_credit(receiver.link) > 0 and not receiver.closed(): #
while all msgs have not arrived
+ if pn_link_queued(receiver.link) == 0: # wait for some to arrive
receiver.wait()
# read all queued deliveries
- while pn_queued(receiver.link):
- delivery = pn_current(receiver.link)
+ while pn_link_queued(receiver.link):
+ delivery = pn_link_current(receiver.link)
# read all bytes of message
- rc, msg = pn_recv(receiver.link, pn_pending(delivery))
+ rc, msg = pn_link_recv(receiver.link,
pn_delivery_pending(delivery))
receiver.log("Received count/status=%d" % rc)
if rc < 0:
print("Error: Receive failed (%s), exiting..." % rc)
return -3
print("%s" % msg)
# let the server know we accept the message
- pn_disposition(delivery, PN_ACCEPTED)
- pn_advance(receiver.link) # next delivery
+ pn_delivery_update(delivery, PN_ACCEPTED)
+ pn_link_advance(receiver.link) # next delivery
# settle any deliveries that the server has seen
receiver.settle()
# block until any leftover deliveries are settled
- while pn_unsettled(receiver.link) > 0 and not receiver.closed():
+ while pn_link_unsettled(receiver.link) > 0 and not receiver.closed():
receiver.wait()
receiver.settle()
Modified: qpid/proton/trunk/proton-c/examples/mailbox/post
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/examples/mailbox/post?rev=1408886&r1=1408885&r2=1408886&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/examples/mailbox/post (original)
+++ qpid/proton/trunk/proton-c/examples/mailbox/post Tue Nov 13 18:51:29 2012
@@ -111,7 +111,8 @@ class PostClient(object):
self.log("Posting to mailbox = %s" % self.mailbox)
self.ssn = pn_session(self.conn)
self.link = pn_sender(self.ssn, "sender")
- pn_set_target(self.link, self.mailbox)
+ dst = pn_link_target(self.link)
+ pn_terminus_set_address(dst, self.mailbox)
# now open all the engine endpoints
pn_connection_open(self.conn)
@@ -165,11 +166,11 @@ class PostClient(object):
_next = pn_unsettled_next(d)
# if the remote has either settled this delivery OR set the
# disposition, we consider the message received.
- disp = pn_remote_disposition(d)
+ disp = pn_delivery_remote_state(d)
if disp and disp != PN_ACCEPTED:
print("Warning: message was not accepted by the remote!")
- if disp or pn_remote_settled(d):
- pn_settle(d)
+ if disp or pn_delivery_settled(d):
+ pn_delivery_settle(d)
d = _next
@@ -223,27 +224,27 @@ def main():
pendingSends = list(options.messages)
while pendingSends:
# wait until the server grants us some send credit
- if pn_credit(sender.link) == 0:
+ if pn_link_credit(sender.link) == 0:
sender.log("wait for credit")
sender.wait()
- while pn_credit(sender.link) > 0 and not sender.closed():
+ while pn_link_credit(sender.link) > 0 and not sender.closed():
msg = pendingSends.pop(0)
sender.log("sending %s" % msg)
d = pn_delivery(sender.link, "post-delivery-%s" %
len(pendingSends))
- rc = pn_send(sender.link, msg)
+ rc = pn_link_send(sender.link, msg)
if (rc < 0):
print("Error: sending message: %s" % rc)
return -2
assert rc == len(msg)
- pn_advance(sender.link) # deliver the message
+ pn_link_advance(sender.link) # deliver the message
# settle any deliveries that the server has accepted
sender.settle()
# done sending, now block until any pending deliveries are settled
sender.log("Done sending messages, waiting for deliveries to settle...");
- while pn_unsettled(sender.link) > 0 and not sender.closed():
+ while pn_link_unsettled(sender.link) > 0 and not sender.closed():
sender.wait()
sender.settle()
Modified: qpid/proton/trunk/proton-c/examples/mailbox/server
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/examples/mailbox/server?rev=1408886&r1=1408885&r2=1408886&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/examples/mailbox/server (original)
+++ qpid/proton/trunk/proton-c/examples/mailbox/server Tue Nov 13 18:51:29 2012
@@ -155,7 +155,7 @@ class MailboxServer(object):
# TODO: client authentication incomplete, for now skip peer
verification
rc = pn_ssl_set_peer_authentication(ssl_server,
- PN_SSL_NO_VERIFY_PEER,
+ PN_SSL_ANONYMOUS_PEER,
None)
assert(rc == 0)
@@ -238,10 +238,10 @@ class MailboxServer(object):
def setupLink(self, link):
""" Configure a link coming from a client.
"""
- r_tgt = pn_remote_target(link)
- r_src = pn_remote_source(link)
+ r_tgt = pn_link_remote_target(link)
+ r_src = pn_link_remote_source(link)
- if pn_is_sender(link):
+ if pn_link_is_sender(link):
self.log("Opening Link to read from mailbox: %s" % r_src)
if r_src not in self.mailboxes:
print("Error: mailbox %s does not exist!" % r_src)
@@ -251,17 +251,17 @@ class MailboxServer(object):
if r_tgt not in self.mailboxes:
self.mailboxes[r_tgt] = [] # create a new mailbox
- pn_set_target(link, r_tgt)
- pn_set_source(link, r_src)
+ #pn_set_target(link, r_tgt)
+ #pn_set_source(link, r_src)
- if pn_is_sender(link):
+ if pn_link_is_sender(link):
# grant a delivery to the link - it will become "writable" when the
# driver can accept messages for the sender.
pn_delivery(link, "server-delivery-%d" % self.counter)
self.counter += 1
else:
# Grant enough credit to the receiver to allow one inbound message
- pn_flow(link, 1)
+ pn_link_flow(link, 1)
pn_link_open(link)
@@ -303,19 +303,19 @@ class MailboxServer(object):
while delivery:
self.log("Process delivery %s." % pn_delivery_tag(delivery))
- if pn_readable(delivery): # inbound data available
+ if pn_delivery_readable(delivery): # inbound data available
self.processReceive(delivery)
- elif pn_writable(delivery): # can send a message
+ elif pn_delivery_writable(delivery): # can send a message
self.sendMessage(delivery)
- if pn_updated(delivery):
+ if pn_delivery_updated(delivery):
# check to see if the remote has accepted message we sent
self.log("remote disposition for %s: %s " %
(str(pn_delivery_tag(delivery)),
-
str(pn_remote_disposition(delivery))))
- if pn_remote_disposition(delivery):
+
str(pn_delivery_remote_state(delivery))))
+ if pn_delivery_remote_state(delivery):
# once we know the remote has seen the message, we can
# release the delivery.
- pn_settle(delivery)
+ pn_delivery_settle(delivery)
delivery = pn_work_next(delivery)
@@ -347,9 +347,10 @@ class MailboxServer(object):
""" A delivery has indicated that message data is available. Read the
message data, process it, then accept the message.
"""
- link = pn_link(delivery)
- mbox = pn_remote_target(link)
- rc, msg = pn_recv(link, 1024);
+ link = pn_delivery_link(delivery)
+ tgt = pn_link_remote_target(link)
+ mbox = pn_terminus_get_address(tgt)
+ rc, msg = pn_link_recv(link, 1024);
self.log("Msg Received %d" % rc);
while rc >= 0:
if mbox not in self.mailboxes:
@@ -357,21 +358,21 @@ class MailboxServer(object):
else:
self.mailboxes[mbox].append(msg)
self.log("Mailbox %s contains: %s" % (mbox,
str(self.mailboxes[mbox])))
- rc, msg = pn_recv(link, 1024);
+ rc, msg = pn_link_recv(link, 1024);
# now that we hit the end of the message, update the
# disposition to let the remote know we accepted it.
self.log("Msg Accepted.");
- pn_disposition(delivery, PN_ACCEPTED)
+ pn_delivery_update(delivery, PN_ACCEPTED)
# since we no longer have any more work to do on this delivery, finish
# it and move to the next.
- pn_settle(delivery)
- pn_advance(link)
+ pn_delivery_settle(delivery)
+ pn_link_advance(link)
# if more credit is needed, grant it
- if pn_credit(link) == 0:
- pn_flow(link, 1)
+ if pn_link_credit(link) == 0:
+ pn_link_flow(link, 1)
def sendMessage(self, delivery):
@@ -379,8 +380,8 @@ class MailboxServer(object):
message. Send a message over the link, but do not settle it until the
remote accepts it (and updates the delivery's disposition).
"""
- link = pn_link(delivery)
- mbox = pn_remote_source(link)
+ link = pn_delivery_link(delivery)
+ mbox = pn_link_remote_source(link)
self.log("Request for Mailbox=%s" % str(mbox))
if mbox in self.mailboxes and self.mailboxes[mbox]:
msg = self.mailboxes[mbox].pop(0)
@@ -388,13 +389,13 @@ class MailboxServer(object):
else:
print("Warning: mailbox %s is empty, sending empty message." %
mbox)
msg = ""
- sent = pn_send(link, msg)
+ sent = pn_link_send(link, msg)
assert(sent == len(msg))
self.log("Msg Sent %d" % sent);
# if the link can accept more ???RAFI, is that correct????, grant
# another delivery
- if pn_advance(link):
+ if pn_link_advance(link):
pn_delivery(link, "server-delivery-%d" % self.counter)
self.counter += 1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
