- for (cpt=0; cpt< GRAS_MAX_CHANNEL; cpt++)
- if (r_pid == remote_hd->proc[cpt])
- sockdata->to_chan = cpt;
-
- gras_assert0(sockdata->to_chan>0,
+ (*dst)->peer_port = -10;
+ for (cursor=0; cursor<GRAS_MAX_CHANNEL; cursor++) {
+ if (remote_hd->proc[cursor] == r_pid) {
+ sockdata->to_chan = cursor;
+ DEBUG2("Chan %d on %s is for my pal",
+ cursor,(*dst)->peer_name);
+
+ gras_dynar_foreach(remote_hd->ports, cpt, pr) {
+ if (sockdata->to_chan == pr.tochan) {
+ if (pr.raw) {
+ DEBUG0("Damn, it's raw");
+ continue;
+ }
+
+ (*dst)->peer_port = pr.port;
+ DEBUG1("Cool, it points to port %d", pr.port);
+ break;
+ } else {
+ DEBUG2("Wrong port (tochan=%d, looking for %d)\n",
+ pr.tochan,sockdata->to_chan);
+ }
+ }
+ if ((*dst)->peer_port == -10) {
+ /* was raw */
+ sockdata->to_chan = -1;
+ } else {
+ /* found it, don't let it override by raw */
+ break;
+ }
+ }
+ }
+ gras_assert0(sockdata->to_chan != -1,